diff --git a/.gitattributes b/.gitattributes
index 57afaf19553d1f87a7c00a26e05986c5dbc93217..9ee81e29a6cdd98f1c1ebbf482506174240c0a62 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11,6 +11,6 @@
*.dot !diff
# Allowing gSoap generated files to be committed.
-/Code/Mantid/Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/ICat3H.h hooks.MaxObjectKiB131025=2048
+/Code/Mantid/Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/ICat3H.h hooks.MaxObjectKiB131025=2048
/Code/Mantid/Framework/ICat/src/ICat3/GSoapGenerated/ICat3C.cpp hooks.MaxObjectKiB131025=5120
/Code/Mantid/Framework/ICat/src/ICat4/GSoapGenerated/ICat4C.cpp hooks.MaxObjectKiB131025=2048
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 9a0d3e154deec8c7101f05af5bbb1b3607cda665..9137b046f4c32d7a6af3045528b83e3bb28fb81f 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -4,7 +4,7 @@ The [developer documentation](http://developer.mantidproject.org/) has informati
2. Clone the repository with the remotes `origin` pointing at your fork as `origin` and `mantidproject/mantid` as `upstream`. This is a [common setup](https://help.github.com/articles/configuring-a-remote-for-a-fork/).
3. Make changes as you see fit. Please still follow the guidelines for [running the unit tests](http://developer.mantidproject.org/RunningTheUnitTests.html) and the [build servers](http://developer.mantidproject.org/AutomatedBuildProcess.html).
4. Submit a [pull request](https://help.github.com/articles/using-pull-requests) to this branch. This is a start to the conversation.
-
+
If you need help, you can go to the [forum](https://forum.mantidproject.org/).
Hints to make the integration of your changes easy (and happen faster):
diff --git a/.github/stale.yml b/.github/stale.yml
index 9a8e94e104772719ab90316c1b76140e5fb8c385..412cebe0dc880816536652bc189914564e819042 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -10,10 +10,10 @@ staleLabel: Stale
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
- recent activity. It will be closed in 7 days if no further activity occurs.
+ recent activity. It will be closed in 7 days if no further activity occurs.
If you feel this is incorrect please comment to keep it alive, with a reason
- why.
-
+ why.
+
To prevent closure, e.g. for long-term planning issues,
add the "Never Stale" label.
# Comment to post when closing a stale issue. Set to `false` to disable
diff --git a/Framework/Algorithms/test/MultiplyDivideTest.in.h b/Framework/Algorithms/test/MultiplyDivideTest.in.h
index b70991814cd92087b00b03437c8fd8ec9d879c8c..0f57e0bce6bc953b57966a954c20079a42ca735c 100644
--- a/Framework/Algorithms/test/MultiplyDivideTest.in.h
+++ b/Framework/Algorithms/test/MultiplyDivideTest.in.h
@@ -136,7 +136,7 @@ public:
performTest(work_in1,work_in2, false /*not event*/,
DO_DIVIDE ? 1.0 : 4.0, DO_DIVIDE ? 1.0 : 4.0, false, false, true /*in place*/);
}
-
+
void test_2D_1D_different_spectrum_number()
{
if(DO_DIVIDE)
diff --git a/Framework/Algorithms/test/PlusMinusTest.in.h b/Framework/Algorithms/test/PlusMinusTest.in.h
index 01f33727b698d8cf83aa409b0c7ebbfcccefb85b..b8fafe536071e646af146672328210839711b85b 100644
--- a/Framework/Algorithms/test/PlusMinusTest.in.h
+++ b/Framework/Algorithms/test/PlusMinusTest.in.h
@@ -837,7 +837,7 @@ public:
{
std::ostringstream mess;
mess << message << ", evaluated at wi " << wi << ", i " << i;
-
+
TS_ASSERT_DELTA(xIn[i], xOut[i], 0.0001);
double sig3 = yOut[i];
double err3 = eOut[i];
@@ -916,7 +916,7 @@ public:
case 2: wsNameOut = "MinusTest_rhs"; break;
}
- // Sanity check, the inputs were set to have 2.0 in each bin (2 events)
+ // Sanity check, the inputs were set to have 2.0 in each bin (2 events)
TS_ASSERT_DELTA( rhs->readY(0)[0], 2.00, 1e-5);
TS_ASSERT_DELTA( rhs->readE(0)[0], sqrt(2.00), 1e-5);
@@ -1103,7 +1103,7 @@ public:
m_ws2D_1 = WorkspaceCreationHelper::create2DWorkspace(histograms, bins);
m_ws2D_2 = WorkspaceCreationHelper::create2DWorkspace(histograms, bins);
}
-
+
void test_large_2D()
{
constexpr bool doPlus{@PLUSMINUSTEST_DO_PLUS@};
diff --git a/Framework/DataHandling/CMakeLists.txt b/Framework/DataHandling/CMakeLists.txt
index 6d9e1ac3ff178a979d927dcad03bc885a886037c..b0ce8cf67d0929c1b87b24f5d5cc1db4c583badb 100644
--- a/Framework/DataHandling/CMakeLists.txt
+++ b/Framework/DataHandling/CMakeLists.txt
@@ -684,7 +684,7 @@ target_link_libraries(DataHandling
Catalog)
if(ENABLE_LIB3MF)
- target_link_libraries(DataHandling LINK_PRIVATE
+ target_link_libraries(DataHandling LINK_PRIVATE
${LIB3MF_LIBRARIES})
endif()
diff --git a/Framework/DataHandling/src/LoadRaw/vms_convert.cpp b/Framework/DataHandling/src/LoadRaw/vms_convert.cpp
index 80fc6dc7a17c01a9519f15bf766a4076bfcf3b64..d81bbe9315daa123fa2764581772b85996540886 100644
--- a/Framework/DataHandling/src/LoadRaw/vms_convert.cpp
+++ b/Framework/DataHandling/src/LoadRaw/vms_convert.cpp
@@ -24,8 +24,8 @@ inline unsigned swap_int(unsigned a)
union { unsigned u; unsigned char c[4]; } temp;
unsigned char ctemp;
temp.u = a;
- ctemp = temp.c[0]; temp.c[0] = temp.c[3]; temp.c[3] = ctemp;
- ctemp = temp.c[1]; temp.c[1] = temp.c[2]; temp.c[2] = ctemp;
+ ctemp = temp.c[0]; temp.c[0] = temp.c[3]; temp.c[3] = ctemp;
+ ctemp = temp.c[1]; temp.c[1] = temp.c[2]; temp.c[2] = ctemp;
return temp.u;
}
#endif
diff --git a/Framework/DataHandling/test/CMakeLists.txt b/Framework/DataHandling/test/CMakeLists.txt
index 58293ccbad9def96433edbe41827bc45daee01f1..1ae282fcad2e9d2123a847a7d637227f464f45e5 100644
--- a/Framework/DataHandling/test/CMakeLists.txt
+++ b/Framework/DataHandling/test/CMakeLists.txt
@@ -1,5 +1,5 @@
if(CXXTEST_FOUND)
- include_directories(SYSTEM
+ include_directories(SYSTEM
${CXXTEST_INCLUDE_DIR})
include_directories(../../TestHelpers/inc)
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MortonIndex/WideIntImpl.h b/Framework/DataObjects/inc/MantidDataObjects/MortonIndex/WideIntImpl.h
index f466dcc728b9bcc0046e637a96d6686542b45745..a086a24334c762a142bda20937fa7ea97b580ace 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MortonIndex/WideIntImpl.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MortonIndex/WideIntImpl.h
@@ -522,7 +522,7 @@ public:
// The __need_increase_size variants are currently disabled due to a suspected bug in the MSVC
// compiler producing warnings such as:
// warning C4717: 'operator_amp<128, ?? :: ?? >': recursive on all control paths, function will cause runtime stack overflow
- // `class = __need_increase_size<Bits2, Signed2>>` should fail substitution when Bits2 == Bits - the arguments have the same width, but it doesn't.
+ // `class = __need_increase_size<Bits2, Signed2>>` should fail substitution when Bits2 == Bits - the arguments have the same width, but it doesn't.
// Mantid only uses a single type of wide integer so these functions are not currently required.
// clang-format on
diff --git a/Framework/DataObjects/src/generate_mdevent_declarations.py b/Framework/DataObjects/src/generate_mdevent_declarations.py
index 55dc858f0c84be594841cfa6b5a40a9fd5719894..0a12ddad8a7b3dac0ebda79895c0564fa80455fa 100644
--- a/Framework/DataObjects/src/generate_mdevent_declarations.py
+++ b/Framework/DataObjects/src/generate_mdevent_declarations.py
@@ -203,7 +203,7 @@ def generate():
for nd in dimensions:
lines.append("%s/// Typedef for a %s with %d dimension%s " % (padding,c, nd, ['','s'][nd>1]) )
lines.append("%stypedef %s<%s<%d>, %d> %s%d;" % (padding,c, mdevent_type, nd, nd, c, nd) )
-
+
lines.append("\n");
lines += footer_lines + lines_after
diff --git a/Framework/ICat/README.md b/Framework/ICat/README.md
index 3521039478b7f93765a6f6a05361b03a46fccdfd..30f8e21e5571c63c45c995624f4f778eaf3a51de 100644
--- a/Framework/ICat/README.md
+++ b/Framework/ICat/README.md
@@ -14,7 +14,7 @@ To generate the source declartion file needed by `soapcpp2` you need to run `wsd
The following command will generate classes and headers based on the source file generated above:
$ soapcpp2 -i -x -C -qICat4 -I</path/to/gsoap/import> ICat4Service.h
-
+
### Possible issues
#### *OSX warnings*
@@ -27,7 +27,7 @@ When running your code on OSX locally or on test servers you *will* come across
---------------------------------------
-To prevent OSX errors when trying to compile (due to already included files) comment out the following two lines of code inside the second `#ifdef __APPLE__` macro:
+To prevent OSX errors when trying to compile (due to already included files) comment out the following two lines of code inside the second `#ifdef __APPLE__` macro:
extern "C" int isnan(double);
extern "C" int isinf(double);
@@ -39,5 +39,5 @@ For namespaces to work correctly three new files were generated from an empty fi
touch soapserializers.h
soapcpp2 -psoapserializers soapserializers.h
-
+
The generated files contained the default SOAP Header and Fault serialization codes. This was needed as the GSoap library could not access these methods from inside ICat3/4 namespaces.
diff --git a/Framework/LiveData/src/Kafka/private/Schema/flatbuffers/flatbuffers.h b/Framework/LiveData/src/Kafka/private/Schema/flatbuffers/flatbuffers.h
index ca05b405e0b42a29447edf20409d4df43f15984c..a7a14b525a8221a813b33820179fe7a7fd487e8d 100644
--- a/Framework/LiveData/src/Kafka/private/Schema/flatbuffers/flatbuffers.h
+++ b/Framework/LiveData/src/Kafka/private/Schema/flatbuffers/flatbuffers.h
@@ -507,7 +507,7 @@ public:
return flatbuffers::GetRoot<T>(data());
}
#endif
-
+
// These may change access mode, leave these at end of public section
FLATBUFFERS_DELETE_FUNC(DetachedBuffer(const DetachedBuffer &other))
diff --git a/Framework/MPIAlgorithms/scripts/EnsembleSamples.sh b/Framework/MPIAlgorithms/scripts/EnsembleSamples.sh
index 259c1f9149b16043657ca2ac387a843600340669..52c832cc58431e0fca64baed2ca02e544654c9c6 100755
--- a/Framework/MPIAlgorithms/scripts/EnsembleSamples.sh
+++ b/Framework/MPIAlgorithms/scripts/EnsembleSamples.sh
@@ -11,7 +11,7 @@ let van=5428
let total_tasks=$(wc -l $PBS_NODEFILE | awk '{print $1}')
export OMP_NUM_THREADS=192/$total_tasks
cd $PBS_O_WORKDIR
-export LD_LIBRARY_PATH=/shared/openmpi/gcc/lib:/home/vel/Mantid/Code/mpi-build/lib:/home/tr9/mantid-deps
+export LD_LIBRARY_PATH=/shared/openmpi/gcc/lib:/home/vel/Mantid/Code/mpi-build/lib:/home/tr9/mantid-deps
export PYTHONPATH=/home/vel/Mantid/Code/mpi-build/bin:/home/tr9/mantid-deps/site-packages:/home/vel/Mantid/Code/Mantid/Framework/PythonInterface/plugins/algorithms
let tasks_per_job=$total_tasks/2
diff --git a/Framework/MPIAlgorithms/scripts/cncs_script.pbs b/Framework/MPIAlgorithms/scripts/cncs_script.pbs
index 12e7861cf86fd8c739c3c8202bfe4ac8b96bdf82..0902d7e846f0750e23a813d532f6369235f9a130 100644
--- a/Framework/MPIAlgorithms/scripts/cncs_script.pbs
+++ b/Framework/MPIAlgorithms/scripts/cncs_script.pbs
@@ -8,6 +8,6 @@
# Make sure your .bash_profile file is set and loads modules esp. gcc/4.4.4
cd /ccs/home/8oz/Code/Mantid/Code/Mantid/Framework/MPIAlgorithms/scripts
-export MANTIDPATH=$HOME/Code/Mantid/framework/bin
-export PYTHONPATH=$MANTIDPATH
+export MANTIDPATH=$HOME/Code/Mantid/framework/bin
+export PYTHONPATH=$MANTIDPATH
mpirun ~/bin/python2.7 CNCS_mpi_example.py
diff --git a/Framework/Muon/CMakeLists.txt b/Framework/Muon/CMakeLists.txt
index 3d2566cb06ee670a91d54c1c2bce725b01f19e82..18766e0d4e82eac1bd6800d502a75e817ee797e0 100644
--- a/Framework/Muon/CMakeLists.txt
+++ b/Framework/Muon/CMakeLists.txt
@@ -80,7 +80,7 @@ if(COVERALLS)
endforeach(loop_var)
endif()
-# Add a precompiled header where they are supported
+# Add a precompiled header where they are supported
# enable_precompiled_headers (inc/MantidAlgorithms/PrecompiledHeader.h SRC_FILES )
# Add the target for this directory
add_library(Muon ${SRC_FILES} ${C_SRC_FILES} ${INC_FILES})
diff --git a/Framework/Properties/Readme.txt b/Framework/Properties/Readme.txt
index da2274abc873532312d34a58d431182e1667882c..7a911333dd9487f0bd47f64781c2a2169ab91d49 100644
--- a/Framework/Properties/Readme.txt
+++ b/Framework/Properties/Readme.txt
@@ -8,5 +8,5 @@ these are
Properties files for use in automated and development testing are in the build\tests directory.
-Note: While there is a user.properties file defined here this will only be userd for the first
+Note: While there is a user.properties file defined here this will only be userd for the first
installation to a client, subsequent installs will not overwrite the clients copy.
\ No newline at end of file
diff --git a/Framework/PythonInterface/core/CMakeLists.txt b/Framework/PythonInterface/core/CMakeLists.txt
index 92babb43afa5964a83157695ef3df30de1b78a7a..103d020a62a53645a6dce20026fb66e0140326b4 100644
--- a/Framework/PythonInterface/core/CMakeLists.txt
+++ b/Framework/PythonInterface/core/CMakeLists.txt
@@ -82,12 +82,12 @@ set_target_properties(
set(PUBLIC_TARGETS Python::NumPy ${BoostPython_LIBRARIES})
if(USE_PYTHON_DYNAMIC_LIB)
- list(APPEND PUBLIC_TARGETS Python::Python)
+ list(APPEND PUBLIC_TARGETS Python::Python)
endif()
# Dependencies
target_link_libraries(
${_target_name}
- PUBLIC ${PUBLIC_TARGETS}
+ PUBLIC ${PUBLIC_TARGETS}
PRIVATE Types Kernel ${Boost_LIBRARIES} ${POCO_LIBRARIES}
)
diff --git a/Framework/PythonInterface/mantid/api/src/api.cpp.in b/Framework/PythonInterface/mantid/api/src/api.cpp.in
index faee580dfed5831ccad5387aa08add358de67ee5..feccfefbc94711c73f972b9f50a78e1c945fc99d 100644
--- a/Framework/PythonInterface/mantid/api/src/api.cpp.in
+++ b/Framework/PythonInterface/mantid/api/src/api.cpp.in
@@ -27,7 +27,7 @@ namespace
/**
* Checks if two workspace shared pointers point to the same workspace
*/
- bool isSameWorkspaceObject(Mantid::API::Workspace_sptr workspace1,
+ bool isSameWorkspaceObject(Mantid::API::Workspace_sptr workspace1,
Mantid::API::Workspace_sptr workspace2) {
return workspace1 == workspace2;
}
@@ -46,7 +46,7 @@ BOOST_PYTHON_MODULE(_api)
// Workspace address comparison
boost::python::def("isSameWorkspaceObject",
- &isSameWorkspaceObject,
+ &isSameWorkspaceObject,
boost::python::args("workspace1", "workspace2"));
try {
diff --git a/Framework/PythonInterface/test/python/mantid/FitFunctionsTest.py b/Framework/PythonInterface/test/python/mantid/FitFunctionsTest.py
index 07f1326de009c5d54590680581b4e14130f23d81..bef657180e9dcd4c0f071c092119a90cf25c7b6c 100644
--- a/Framework/PythonInterface/test/python/mantid/FitFunctionsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/FitFunctionsTest.py
@@ -11,7 +11,7 @@ import unittest
import testhelpers
import platform
from mantid.simpleapi import CreateWorkspace, EvaluateFunction, Fit
-from mantid.simpleapi import FunctionWrapper, CompositeFunctionWrapper, ProductFunctionWrapper, ConvolutionWrapper, MultiDomainFunctionWrapper
+from mantid.simpleapi import FunctionWrapper, CompositeFunctionWrapper, ProductFunctionWrapper, ConvolutionWrapper, MultiDomainFunctionWrapper
from mantid.simpleapi import Gaussian, LinearBackground, Polynomial, MultiDomainFunction, Convolution, ProductFunction,\
CompositeFunction, IFunction1D, FunctionFactory, Fit
from mantid.api import mtd, MatrixWorkspace, ITableWorkspace
@@ -25,34 +25,34 @@ class FitFunctionsTest(unittest.TestCase):
def setUp(self):
pass
-
+
def test_creation(self):
testhelpers.assertRaisesNothing(self, FunctionWrapper, "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
-
+
def test_name(self):
g = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
self.assertEqual(g.name,"Gaussian")
-
+
def test_read_array_elements(self):
- g = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
+ g = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
self.assertAlmostEqual(g["Height"],7.5,10)
-
+
def test_write_array_elements(self):
- g = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
+ g = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
g["Height"] = 8
self.assertAlmostEqual(g["Height"],8,10)
-
+
def test_dot_operator(self):
- g = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
+ g = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
self.assertAlmostEqual(g.Height,7.5,10)
g.Height = 8
- self.assertAlmostEqual(g.Height,8,10)
-
+ self.assertAlmostEqual(g.Height,8,10)
+
def test_compositefunction_creation(self):
g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.2, PeakCentre=11)
- testhelpers.assertRaisesNothing(self, CompositeFunctionWrapper, g0, g1)
-
+ testhelpers.assertRaisesNothing(self, CompositeFunctionWrapper, g0, g1)
+
def test_copy_on_compositefunction_creation(self):
g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.2, PeakCentre=11)
@@ -62,7 +62,7 @@ class FitFunctionsTest(unittest.TestCase):
# Check that the composite function remains unmodified.
self.assertAlmostEqual( c["f0.Height"],7.5)
self.assertAlmostEqual( c["f1.Height"],8.5)
-
+
def test_getindexoffunction_in_compositefunction(self):
lb = FunctionWrapper("LinearBackground", A0=0.5, A1=1.5)
g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
@@ -74,18 +74,18 @@ class FitFunctionsTest(unittest.TestCase):
self.assertEqual( index_g0, 1)
index_g1 = c.getIndexOfFunction("Gaussian 1")
self.assertEqual( index_g1, 2)
-
+
def test_compositefunction_f (self):
lb = FunctionWrapper("LinearBackground", A0=0.5, A1=1.5)
g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.2, PeakCentre=11)
c = CompositeFunctionWrapper( lb, g0, g1 )
-
+
lbx = c.f("LinearBackground")
lbx_str = str(lbx)
lb_str = str(lb)
self.assertEqual(lbx_str, lb_str)
-
+
g1x = c.f("Gaussian 1")
g1x_str = str(g1x)
g1_str = str(g1)
@@ -96,35 +96,35 @@ class FitFunctionsTest(unittest.TestCase):
g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.2, PeakCentre=11)
c = CompositeFunctionWrapper( lb, g0, g1 )
-
- self.assertAlmostEqual(c["f0.A1"], 1.5,10)
+
+ self.assertAlmostEqual(c["f0.A1"], 1.5,10)
self.assertAlmostEqual(c["f1.Height"], 7.5,10)
self.assertAlmostEqual(c["f2.Height"], 8.5,10)
- self.assertAlmostEqual(c[0]["A1"], 1.5,10)
+ self.assertAlmostEqual(c[0]["A1"], 1.5,10)
self.assertAlmostEqual(c[1]["Height"], 7.5,10)
self.assertAlmostEqual(c[2]["Height"], 8.5,10)
-
+
def test_compositefunction_write_array_elements(self):
lb = FunctionWrapper("LinearBackground", A0=0.5, A1=1.5)
g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.2, PeakCentre=11)
c = CompositeFunctionWrapper( lb, g0, g1 )
-
+
c["f0.A1"] = 0.0
- self.assertAlmostEqual(c["f0.A1"], 0.0,10)
+ self.assertAlmostEqual(c["f0.A1"], 0.0,10)
c[0]["A1"] = 1.0
self.assertAlmostEqual(c["f0.A1"], 1.0,10)
-
+
c["f1.Height"] = 10.0
- self.assertAlmostEqual(c[1]["Height"], 10.0,10)
+ self.assertAlmostEqual(c[1]["Height"], 10.0,10)
c[1]["Height"] = 11.0
self.assertAlmostEqual(c[1]["Height"], 11.0,10)
-
+
g0a = FunctionWrapper( "Gaussian", Height=7.0, Sigma=1.2, PeakCentre=9)
c[1] = g0a
self.assertAlmostEqual(c[1]["Height"], 7.0,10)
-
+
def test_attributes(self):
testhelpers.assertRaisesNothing(self, FunctionWrapper, "Polynomial", attributes={'n': 3}, A0=4, A1=3, A2=2, A3=1)
testhelpers.assertRaisesNothing(self, FunctionWrapper, "Polynomial", n=3, A0=4, A1=3, A2=2, A3=1)
@@ -132,64 +132,64 @@ class FitFunctionsTest(unittest.TestCase):
self.assertEqual(p['n'],3)
p['n'] = 4
self.assertEqual(p['n'],4)
-
+
def test_fix(self):
g = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.2, PeakCentre=15)
-
+
g.fix("Sigma")
g_str = str(g)
self.assertEqual(g_str.count("ties="),1)
self.assertEqual(g_str.count("ties=(Sigma=1.2)"),1)
-
+
g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.2, PeakCentre=11)
c = CompositeFunctionWrapper(g0, g1)
-
+
c.fix("f1.Sigma")
c_str = str(c)
self.assertEqual(c_str.count("ties="),1)
self.assertEqual(c_str.count("ties=(Sigma=1.2"),1)
-
+
# remove non-existent tie and test it has no effect
c.untie("f1.Height")
cu_str = str(c)
self.assertEqual(c_str, cu_str)
-
+
# remove actual tie
c.untie("f1.Sigma")
cz_str = str(c)
self.assertEqual(cz_str.count("ties="),0)
-
+
def test_fix_all(self):
g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.2, PeakCentre=11)
c = CompositeFunctionWrapper(g0, g1)
-
+
c.fixAll("Sigma")
c_str = str(c)
self.assertEqual(c_str.count("ties="),2)
self.assertEqual(c_str.count("ties=(Sigma="),2)
-
+
# remove non-existent ties and test it has no effect
c.untieAll("Height")
cu_str = str(c)
self.assertEqual(c_str, cu_str)
-
+
# remove actual ties
c.untieAll("Sigma")
cz_str = str(c)
self.assertEqual(cz_str.count("ties="),0)
-
+
def test_fix_all_parameters(self):
g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
g1 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
c = CompositeFunctionWrapper(g0, g1)
-
+
c.fixAllParameters()
c_str = str(c)
self.assertEqual(c_str.count("ties="),2)
self.assertEqual(c_str.count("ties=(Height=7.5,PeakCentre=10,Sigma=1.2)"),2)
-
+
c.untieAllParameters()
cz_str = str(c)
self.assertEqual(cz_str.count("ties="),0)
@@ -214,74 +214,74 @@ class FitFunctionsTest(unittest.TestCase):
def test_tie(self):
g = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.2, PeakCentre=15)
-
+
g.tie(Sigma="0.1*Height")
g_str = str(g)
self.assertEqual(g_str.count("ties="),1)
self.assertEqual(g_str.count("ties=(Sigma=0.1*Height)"),1)
-
+
g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.2, PeakCentre=11)
c = CompositeFunctionWrapper(g0, g1)
-
+
c.tie({"f1.Sigma":"f0.Sigma"})
c_str = str(c)
self.assertEqual(c_str.count("ties="),1)
self.assertEqual(c_str.count("ties=(f1.Sigma=f0.Sigma)"),1)
-
+
c.untie("f1.Sigma")
cz_str = str(c)
self.assertEqual(cz_str.count("ties="),0)
-
+
def test_tie_all(self):
-
+
g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.2, PeakCentre=11)
c = CompositeFunctionWrapper(g0, g1)
-
+
c.tieAll("Sigma")
c_str = str(c)
self.assertEqual(c_str.count("ties="),1)
self.assertEqual(c_str.count("ties=(f1.Sigma=f0.Sigma)"),1)
-
+
c.untieAll("Sigma")
cz_str = str(c)
self.assertEqual(cz_str.count("ties="),0)
-
+
def test_constrain(self):
g = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.2, PeakCentre=15)
-
+
g.constrain("Sigma < 2.0, Height > 7.0")
g_str = str(g)
self.assertEqual(g_str.count("constraints="),1)
self.assertEqual(g_str.count("Sigma<2"),1)
self.assertEqual(g_str.count("7<Height"),1)
-
+
g.unconstrain("Height")
g1_str = str(g)
self.assertEqual(g1_str.count("constraints="),1)
self.assertEqual(g1_str.count("constraints=(Sigma<2)"),1)
-
+
g.unconstrain("Sigma")
gz_str = str(g)
self.assertEqual(gz_str.count("constraints="),0)
-
+
def test_constrain_composite(self):
g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.2, PeakCentre=11)
c = CompositeFunctionWrapper(g0, g1)
-
+
c.constrain("f1.Sigma < 2, f0.Height > 7")
c_str = str(c)
self.assertEqual(c_str.count("f1.Sigma<2"),1)
self.assertEqual(c_str.count("7<f0.Height"),1)
-
+
c.unconstrain("f1.Sigma")
c.unconstrain("f0.Height")
cz_str = str(c)
self.assertEqual(cz_str.count("Constraints="),0)
-
+
def test_constrainall(self):
lb = FunctionWrapper("LinearBackground", A0=0.5, A1=1.5)
g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
@@ -290,102 +290,102 @@ class FitFunctionsTest(unittest.TestCase):
c0 = CompositeFunctionWrapper( g1, g2 )
c = CompositeFunctionWrapper( lb, g0, c0)
c.constrainAll("Sigma < 1.8")
-
+
c_str = str(c)
self.assertEqual(c_str.count("constraints="),3)
self.assertEqual(c_str.count("Sigma<1.8"),3)
-
+
lb_str = str(c[0])
self.assertEqual(lb_str.count("constraints="),0)
-
+
g0_str = str(c[1])
self.assertEqual(g0_str.count("constraints="),1)
self.assertEqual(g0_str.count("Sigma<1.8"),1)
-
+
g1_str = str(c[2][0])
self.assertEqual(g1_str.count("constraints="),1)
self.assertEqual(g1_str.count("Sigma<1.8"),1)
-
+
g2_str = str(c[2][1])
self.assertEqual(g2_str.count("constraints="),1)
self.assertEqual(g2_str.count("Sigma<1.8"),1)
-
+
c.unconstrainAll("Sigma")
-
+
cz_str = str(c)
self.assertEqual(cz_str.count("constraints="),0)
-
+
def test_free(self):
g = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.2, PeakCentre=15)
-
+
g.constrain("Sigma < 2.0, Height > 7.0")
g.tie({"PeakCentre":"2*Height"})
-
+
g.free("Height")
g1_str = str(g)
self.assertEqual(g1_str.count("ties="),1)
self.assertEqual(g1_str.count("constraints="),1)
self.assertEqual(g1_str.count("constraints=(Sigma<2)"),1)
-
+
g.free("PeakCentre")
g2_str = str(g)
self.assertEqual(g2_str.count("ties="),0)
self.assertEqual(g2_str.count("constraints="),1)
-
+
g.free("Sigma")
gz_str = str(g)
self.assertEqual(gz_str.count("constraints="),0)
-
+
def test_pureaddition_and_puremultiplication(self):
- g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
+ g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.25, PeakCentre=12)
-
+
sum = CompositeFunctionWrapper(g0, g1)
self.assertEqual(sum.pureAddition, True)
self.assertEqual(sum.pureMultiplication, False)
-
+
product = ProductFunctionWrapper(g0, g1)
self.assertEqual(product.pureAddition, False)
self.assertEqual(product.pureMultiplication, True)
-
+
sum2 = CompositeFunctionWrapper(sum, g1)
self.assertEqual(sum2.pureAddition, True)
self.assertEqual(sum2.pureMultiplication, False)
-
+
product2 = ProductFunctionWrapper(product, g1)
self.assertEqual(product2.pureAddition, False)
self.assertEqual(product2.pureMultiplication, True)
-
+
mixed1 = CompositeFunctionWrapper(product, g1)
self.assertEqual(mixed1.pureAddition, False)
self.assertEqual(mixed1.pureMultiplication, False)
-
+
mixed2 = CompositeFunctionWrapper(g1, product)
self.assertEqual(mixed2.pureAddition, False)
self.assertEqual(mixed2.pureMultiplication, False)
-
+
mixed3 = ProductFunctionWrapper(sum, g1)
self.assertEqual(mixed3.pureAddition, False)
self.assertEqual(mixed3.pureMultiplication, False)
-
+
mixed4 = ProductFunctionWrapper(g1, sum)
self.assertEqual(mixed4.pureAddition, False)
self.assertEqual(mixed4.pureMultiplication, False)
-
+
def test_flatten(self):
- g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
- g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.25, PeakCentre=12)
+ g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
+ g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.25, PeakCentre=12)
g2 = FunctionWrapper( "Gaussian", Height=9.5, Sigma=1.3, PeakCentre=14)
l = FunctionWrapper("Lorentzian",PeakCentre=9, Amplitude=2.4, FWHM=3)
lb = FunctionWrapper("LinearBackground")
-
+
# Test already flat composite function, no change should occur
c1 = CompositeFunctionWrapper(lb, g0, g1 )
fc1 = c1.flatten()
c1_str = str(c1)
fc1_str = str(fc1)
self.assertEqual(fc1_str,c1_str)
-
+
# Test composite function of depth 1
c2 = CompositeFunctionWrapper(c1, l)
fc2 = c2.flatten()
@@ -394,7 +394,7 @@ class FitFunctionsTest(unittest.TestCase):
self.assertEqual(fc2_str.count("PeakCentre"),3)
self.assertEqual(fc2_str.count("Sigma="),2)
self.assertEqual(fc2_str.count("Sigma=1.25"),1)
-
+
# Test composite function of depth 2
c3 = CompositeFunctionWrapper( g2, c2)
fc3 = c3.flatten()
@@ -404,7 +404,7 @@ class FitFunctionsTest(unittest.TestCase):
self.assertEqual(fc3_str.count("Sigma="),3)
self.assertEqual(fc3_str.count("Sigma=1.25"),1)
self.assertEqual(fc3_str.count("Sigma=1.3"),1)
-
+
# Test product function of depth 1
p1 = ProductFunctionWrapper(lb, g0, g1 )
p2 = ProductFunctionWrapper(p1, l)
@@ -415,83 +415,83 @@ class FitFunctionsTest(unittest.TestCase):
self.assertEqual(fp2_str.count("PeakCentre"),3)
self.assertEqual(fp2_str.count("Sigma="),2)
self.assertEqual(fp2_str.count("Sigma=1.25"),1)
-
+
def test_add(self):
- g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
- g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.25, PeakCentre=12)
+ g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
+ g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.25, PeakCentre=12)
lb = FunctionWrapper("LinearBackground")
-
+
c = lb + g0 + g1
-
+
self.assertTrue( isinstance( c, CompositeFunctionWrapper) )
c_str = str(c)
self.assertEqual(c_str.count("("),0)
self.assertEqual(c_str.count("LinearBackground"),1)
self.assertEqual(c_str.count("Gaussian"),2)
-
+
lb_str = str(lb)
c0_str = str(c[0])
self.assertEqual(c0_str, lb_str)
-
+
g0_str = str(g0)
c1_str = str(c[1])
self.assertEqual(c1_str, g0_str)
-
+
g1_str = str(g1)
c2_str = str(c[2])
self.assertEqual(c2_str, g1_str)
-
+
def test_incremental_add(self):
- g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
- g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.25, PeakCentre=12)
+ g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
+ g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.25, PeakCentre=12)
lb = FunctionWrapper("LinearBackground")
-
+
c = CompositeFunctionWrapper( lb, g0)
c += g1
c_str = str(c)
self.assertEqual(c_str.count("("),0)
self.assertEqual(c_str.count("LinearBackground"),1)
self.assertEqual(c_str.count("Gaussian"),2)
-
+
lb_str = str(lb)
c0_str = str(c[0])
self.assertEqual(c0_str, lb_str)
-
+
g0_str = str(g0)
c1_str = str(c[1])
self.assertEqual(c1_str, g0_str)
-
+
g1_str = str(g1)
c2_str = str(c[2])
self.assertEqual(c2_str, g1_str)
def test_del(self):
- g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
- g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.25, PeakCentre=12)
+ g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
+ g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.25, PeakCentre=12)
lb = FunctionWrapper("LinearBackground")
-
+
c = CompositeFunctionWrapper( lb, g0, g1)
del c[1]
-
+
c_str = str(c)
self.assertEqual(c_str.count("("),0)
self.assertEqual(c_str.count("LinearBackground"),1)
self.assertEqual(c_str.count("Gaussian"),1)
self.assertEqual(c_str.count("Height=8.5"),1)
-
+
def test_len(self):
- g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
- g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.25, PeakCentre=12)
+ g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
+ g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.25, PeakCentre=12)
lb = FunctionWrapper("LinearBackground")
-
+
c = CompositeFunctionWrapper( lb, g0, g1)
self.assertEqual( len(c), 3)
-
+
def test_iteration(self):
- g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
- g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.25, PeakCentre=12)
+ g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
+ g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.25, PeakCentre=12)
lb = FunctionWrapper("LinearBackground")
-
+
c = CompositeFunctionWrapper( lb, g0, g1)
count = 0
for f in c:
@@ -509,26 +509,26 @@ class FitFunctionsTest(unittest.TestCase):
testhelpers.assertRaisesNothing(self, ProductFunction, g0, g1)
def test_mul(self):
- g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
- g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.25, PeakCentre=12)
+ g0 = FunctionWrapper( "Gaussian", Height=7.5, Sigma=1.2, PeakCentre=10)
+ g1 = FunctionWrapper( "Gaussian", Height=8.5, Sigma=1.25, PeakCentre=12)
lb = FunctionWrapper("LinearBackground")
-
+
p = lb * g0 * g1
-
+
self.assertTrue( isinstance( p, ProductFunctionWrapper) )
p_str = str(p)
self.assertEqual(p_str.count("("),0)
self.assertEqual(p_str.count("LinearBackground"),1)
self.assertEqual(p_str.count("Gaussian"),2)
-
+
lb_str = str(lb)
p0_str = str(p[0])
self.assertEqual(p0_str, lb_str)
-
+
g0_str = str(g0)
p1_str = str(p[1])
self.assertEqual(p1_str, g0_str)
-
+
g1_str = str(g1)
p2_str = str(p[2])
self.assertEqual(p2_str, g1_str)
@@ -568,13 +568,13 @@ class FitFunctionsTest(unittest.TestCase):
g = Gaussian(Height=7.5, Sigma=1.2, PeakCentre=10)
s = lb + g
self.assertTrue( isinstance( s, CompositeFunctionWrapper) )
-
+
def test_direct_evaluation(self):
l0 = FunctionWrapper( "LinearBackground", A0=0, A1=2)
l1 = FunctionWrapper( "LinearBackground", A0=5, A1=-1)
ws = CreateWorkspace(DataX=[0,1,2,3,4], DataY=[5,5,5,5])
-
+
c = CompositeFunctionWrapper(l0, l1)
cws = EvaluateFunction(c,"ws", OutputWorkspace='out')
cvals = cws.readY(1)
@@ -582,7 +582,7 @@ class FitFunctionsTest(unittest.TestCase):
self.assertAlmostEqual(cvals[1], 6.5)
self.assertAlmostEqual(cvals[2], 7.5)
self.assertAlmostEqual(cvals[3], 8.5)
-
+
p = ProductFunctionWrapper(l0, l1)
pws = EvaluateFunction(p,"ws", OutputWorkspace='out')
pvals = pws.readY(1)
@@ -590,14 +590,14 @@ class FitFunctionsTest(unittest.TestCase):
self.assertAlmostEqual(pvals[1], 10.5)
self.assertAlmostEqual(pvals[2], 12.5)
self.assertAlmostEqual(pvals[3], 10.5)
-
+
sq = Polynomial(attributes={'n': 2}, A0=0, A1=0.0, A2=1.0)
sqws = EvaluateFunction(sq,"ws", OutputWorkspace='out')
sqvals = sqws.readY(1)
self.assertAlmostEqual(sqvals[0], 0.25)
self.assertAlmostEqual(sqvals[1], 2.25)
self.assertAlmostEqual(sqvals[2], 6.25)
-
+
def test_arithmetic(self):
l0 = FunctionWrapper( "LinearBackground", A0=0, A1=2)
l1 = FunctionWrapper( "LinearBackground", A0=5, A1=-1)
@@ -606,38 +606,38 @@ class FitFunctionsTest(unittest.TestCase):
c = CompositeFunctionWrapper(l0, l1)
p = ProductFunctionWrapper(l0, l1)
-
+
s1 = c + p
s1ws = EvaluateFunction(s1,"ws", OutputWorkspace='out')
s1vals = s1ws.readY(1)
self.assertAlmostEqual(s1vals[0], 10.0)
-
+
s2 = p + c
s2ws = EvaluateFunction(s2,"ws", OutputWorkspace='out')
s2vals = s2ws.readY(1)
self.assertAlmostEqual(s2vals[0], 10.0)
-
+
def test_evaluation_by_single_value(self):
p = Polynomial(n=4, A0=1, A1=1, A2=1, A3=1, A4=1)
self.assertAlmostEqual(p(0),1.0)
self.assertAlmostEqual(p(1),5.0)
self.assertAlmostEqual(p(2),31.0)
-
+
def test_evaluation_by_list_of_values(self):
p = Polynomial(n=4, A0=1, A1=1, A2=1, A3=1, A4=1)
- result = p([0,1,3])
+ result = p([0,1,3])
self.assertAlmostEqual(result[0],1.0)
self.assertAlmostEqual(result[1],5.0)
- self.assertAlmostEqual(result[2],121.0)
+ self.assertAlmostEqual(result[2],121.0)
- def test_evaluation_by_workspace(self):
+ def test_evaluation_by_workspace(self):
ws = CreateWorkspace(DataX=[0,1,2,3], DataY=[5,5,5])
sq = Polynomial(n=2, A0=0, A1=0, A2=1)
outWs = sq(ws)
- sqvals = outWs.readY(1)
+ sqvals = outWs.readY(1)
self.assertAlmostEqual(sqvals[0], 0.25)
self.assertAlmostEqual(sqvals[1], 2.25)
- self.assertAlmostEqual(sqvals[2], 6.25)
+ self.assertAlmostEqual(sqvals[2], 6.25)
def test_evaluation_by_1D_numpy_array(self):
import numpy as np
@@ -646,7 +646,7 @@ class FitFunctionsTest(unittest.TestCase):
result = p(a)
self.assertAlmostEqual(result[0],1.0)
self.assertAlmostEqual(result[1],5.0)
- self.assertAlmostEqual(result[2],121.0)
+ self.assertAlmostEqual(result[2],121.0)
def test_evaluation_by_2D_numpy_array(self):
import numpy as np
@@ -656,7 +656,7 @@ class FitFunctionsTest(unittest.TestCase):
self.assertAlmostEqual(result[0][0],1.0)
self.assertAlmostEqual(result[0][1],5.0)
self.assertAlmostEqual(result[1][0],31.0)
- self.assertAlmostEqual(result[1][1],121.0)
+ self.assertAlmostEqual(result[1][1],121.0)
def test_evaluation_with_parameters_set(self):
p = Polynomial(n=2)
diff --git a/Framework/PythonInterface/test/python/mantid/SimpleAPIFitTest.py b/Framework/PythonInterface/test/python/mantid/SimpleAPIFitTest.py
index 1f9ed1874f7e47ba4cde3967c247673ad6f48edf..b5edd9de6be308ab4517b0ee48c34080715e4ce4 100644
--- a/Framework/PythonInterface/test/python/mantid/SimpleAPIFitTest.py
+++ b/Framework/PythonInterface/test/python/mantid/SimpleAPIFitTest.py
@@ -34,7 +34,7 @@ class SimpleAPIFitTest(unittest.TestCase):
if platform.system() == 'Darwin': # crashes
return
testhelpers.assertRaisesNothing(self, Fit, "name=FlatBackground", self._raw_ws)
-
+
def test_minimal_positional_arguments_with_functionwrapper_work(self):
if platform.system() == 'Darwin': # crashes
return
diff --git a/Framework/PythonInterface/test/python/mantid/api/MDEventWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/MDEventWorkspaceTest.py
index e62584c56aac24e83e14497e422e11930d227c9b..810b656ea67804f8ae97ef0dccf085c96b42a6f4 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MDEventWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MDEventWorkspaceTest.py
@@ -19,7 +19,7 @@ class MDEventWorkspaceTest(unittest.TestCase):
run_algorithm('CreateMDWorkspace', Dimensions='3',Extents='0,10,0,10,0,10',Names='x,y,z',Units='m,m,m',SplitInto='5',
MaxRecursionDepth='20',OutputWorkspace='mdw')
run_algorithm('FakeMDEventData', InputWorkspace="mdw", UniformParams="1e4")
-
+
def tearDown(self):
mtd.remove('mdw')
diff --git a/Framework/PythonInterface/test/python/mantid/api/ProjectionTest.py b/Framework/PythonInterface/test/python/mantid/api/ProjectionTest.py
index 63c0c8dff746247c0f36563c374f2108ddf00bda..3b0e31075bda757d6144ad78221ac3ffc80e8de3 100644
--- a/Framework/PythonInterface/test/python/mantid/api/ProjectionTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/ProjectionTest.py
@@ -57,7 +57,7 @@ class ProjectionTest(unittest.TestCase):
def test_setaxis_with_numpy_int64(self):
p = Projection();
-
+
p.setAxis(0, np.array([1,2,3], dtype='int64'))
p.setAxis(1, np.array([3,4,5], dtype='int64'))
p.setAxis(2, np.array([6,7,8], dtype='int64'))
diff --git a/Framework/PythonInterface/test/python/mantid/api/SampleTest.py b/Framework/PythonInterface/test/python/mantid/api/SampleTest.py
index f3f7244902d721d2c1488bcc47e429a8e5f4eea6..1e3edf798c9a95d1be820038124b95634a30669d 100644
--- a/Framework/PythonInterface/test/python/mantid/api/SampleTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/SampleTest.py
@@ -96,7 +96,7 @@ class SampleTest(unittest.TestCase):
self.assertEqual(type(xml), str)
def do_test_copyable(self, copy_op):
- original = Sample()
+ original = Sample()
width = 1.0
height = 2.0
thickness = 3.0
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspacePropertiesTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspacePropertiesTest.py
index 29f03aa73da8ee9766c67ec1fd3fca13fde70b8c..2b783c9f80cd67dee25f6fbb70c839d01c71ed5d 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspacePropertiesTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspacePropertiesTest.py
@@ -10,7 +10,7 @@ property types
import unittest
import testhelpers
from mantid.api import (WorkspaceProperty, WorkspaceGroupProperty, MatrixWorkspaceProperty,
- IEventWorkspaceProperty, ITableWorkspaceProperty,
+ IEventWorkspaceProperty, ITableWorkspaceProperty,
IMDWorkspaceProperty, IMDHistoWorkspaceProperty, IMDEventWorkspaceProperty,
PropertyMode, LockMode)
from mantid.kernel import Direction, Property
@@ -64,10 +64,10 @@ class WorkspacePropertiesTest(unittest.TestCase):
def test_IMDHistoWorkspaceProperty_can_be_instantiated(self):
self._do_test(IMDHistoWorkspaceProperty)
-
+
def test_IMDEventWorkspaceProperty_can_be_instantiated(self):
self._do_test(IMDEventWorkspaceProperty)
-
+
def test_IMDWorkspaceProperty_can_be_instantiated(self):
self._do_test(IMDWorkspaceProperty)
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/ComponentInfoTest.py b/Framework/PythonInterface/test/python/mantid/geometry/ComponentInfoTest.py
index d8c5cb1a8d092d4f3c41e53075d4118357695d8c..d592dd42261b40de1f1bbfb3c42a890cdf77dbbb 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/ComponentInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/ComponentInfoTest.py
@@ -208,7 +208,7 @@ class ComponentInfoTest(unittest.TestCase):
index = info.indexOfAny(info.name(info.root()))
# Root index and the discovered index should be the same
self.assertEqual(index, info.root())
-
+
def test_indexOfAny_throws(self):
info = self._ws.componentInfo()
with self.assertRaises(ValueError):
@@ -503,13 +503,13 @@ class ComponentInfoTest(unittest.TestCase):
def test_basic_iterator(self):
info = self._ws.componentInfo()
- expected_iterations = len(info)
+ expected_iterations = len(info)
actual_iterations = len(list(iter(info)))
self.assertEqual(expected_iterations, actual_iterations)
it = iter(info)
self.assertEqual(next(it).index, 0)
self.assertEqual(next(it).index, 1)
-
+
def test_isDetector_via_iterator(self):
comp_info = self._ws.componentInfo()
n_detectors = len(self._ws.detectorInfo())
@@ -525,11 +525,11 @@ class ComponentInfoTest(unittest.TestCase):
it = iter(comp_info)
# basic check on first detector position
self.assertGreater(next(it).position.distance(source_pos), 0)
-
+
def test_children_via_iterator(self):
info = self._ws.componentInfo()
it = iter(info)
- first_det = next(it)
+ first_det = next(it)
self.assertEqual(type(first_det.children), np.ndarray)
self.assertEqual(len(first_det.children), 0)
root = next(it)
@@ -541,7 +541,7 @@ class ComponentInfoTest(unittest.TestCase):
def test_detectorsInSubtree_via_iterator(self):
info = self._ws.componentInfo()
it = iter(info)
- first_det = next(it)
+ first_det = next(it)
self.assertEqual(type(first_det.detectorsInSubtree), np.ndarray)
# For detectors, only contain own index
self.assertTrue(np.array_equal(first_det.detectorsInSubtree,np.array([0], dtype='uint64')))
@@ -553,7 +553,7 @@ class ComponentInfoTest(unittest.TestCase):
def test_componentsInSubtree_via_iterator(self):
info = self._ws.componentInfo()
it = iter(info)
- first_det = next(it)
+ first_det = next(it)
self.assertEqual(type(first_det.detectorsInSubtree), np.ndarray)
# For detectors, only contain own index
self.assertTrue(np.array_equal(first_det.componentsInSubtree,np.array([0], dtype='uint64')))
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/GoniometerTest.py b/Framework/PythonInterface/test/python/mantid/geometry/GoniometerTest.py
index 9ee6ccc306f8e050d3972d06a388f21b85a6a43c..79b34decec4def20cf986ae5a6fb87ded19a67b1 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/GoniometerTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/GoniometerTest.py
@@ -13,7 +13,7 @@ import numpy as np
class GoniometerTest(unittest.TestCase):
-
+
def test_Goniometer_can_be_instantiated(self):
self.assertTrue(can_be_instantiated(Goniometer))
@@ -22,13 +22,13 @@ class GoniometerTest(unittest.TestCase):
self.assertEqual(g.getEulerAngles()[0], 0)
self.assertEqual(g.getEulerAngles()[1], 0)
self.assertEqual(g.getEulerAngles()[2], 0)
-
+
def test_setR_getR(self):
g = Goniometer()
r = np.array([(1., 0., 0.), (0., 0., 1.), (0., -1., 0.)])
g.setR(r)
self.assertTrue((g.getR() == r).all())
-
+
def test_default_goniometer(self):
"""
Default goniometer is the identity matrix
@@ -39,7 +39,7 @@ class GoniometerTest(unittest.TestCase):
g = run.getGoniometer()
self.assertTrue(isinstance(g, Goniometer))
self.assertTrue((g.getR() == np.identity(3)).all())
-
+
def test_change_default_goniometer(self):
"""
Get the default gonimoter
@@ -53,7 +53,7 @@ class GoniometerTest(unittest.TestCase):
r = np.array([(1., 0., 0.), (0., 0., 1.), (0., -1., 0.)])
g.setR(r)
self.assertTrue((g.getR() == r).all())
-
+
if __name__ == '__main__':
unittest.main()
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/PeakShapeTest.py b/Framework/PythonInterface/test/python/mantid/geometry/PeakShapeTest.py
index 8beaea9efd91d15377665172c97d0ff274e02e01..07b8fca7203c48bf81b24b5f20c1404e96e9c3e8 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/PeakShapeTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/PeakShapeTest.py
@@ -18,7 +18,7 @@ class PeakShapeTest(unittest.TestCase):
peak_shape = peak.getPeakShape()
self.assertTrue(isinstance(peak_shape, PeakShape))
self.assertEqual(peak_shape.shapeName(), "none")
-
+
if __name__ == '__main__':
unittest.main()
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/CompositeValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/CompositeValidatorTest.py
index 9369302d9c61b20b4738231f37fcd006614b70d0..bbee19c07f7849c59c678fb93d0d72c51dc5cfc2 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/CompositeValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/CompositeValidatorTest.py
@@ -29,8 +29,8 @@ class CompositeValidatorTest(unittest.TestCase):
self._do_validation_test(validation)
def test_composite_validator_with_or_relation(self):
- validation = CompositeValidator([FloatBoundedValidator(lower=5, upper=10),
- FloatBoundedValidator(lower=15, upper=20)],
+ validation = CompositeValidator([FloatBoundedValidator(lower=5, upper=10),
+ FloatBoundedValidator(lower=15, upper=20)],
relation=CompositeRelation.OR)
test_alg = self._create_test_algorithm(validation)
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerPropertyTest.py b/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerPropertyTest.py
index 99404299d89c9af98e444ae0e6821baca3497200..4c03d47b8283305f503f630485972c9bdf10a73b 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerPropertyTest.py
@@ -40,11 +40,11 @@ class PropertyManagerPropertyTest(unittest.TestCase):
def test_set_property_on_algorithm_from_dictionary(self):
fake = FakeAlgorithm()
fake.initialize()
- fake.setProperty("Args", {'A': 1,
- 'B':10.5,
- 'C':'String arg',
- 'D': [0.0,11.3],
- 'E':{'F':10.4,
+ fake.setProperty("Args", {'A': 1,
+ 'B':10.5,
+ 'C':'String arg',
+ 'D': [0.0,11.3],
+ 'E':{'F':10.4,
'G': [1.0,2.0, 3.0],
'H':{'I': "test",
'J': 120.6}}})
@@ -64,7 +64,7 @@ class PropertyManagerPropertyTest(unittest.TestCase):
self.assertEqual(11.3,array_value[1])
# Check the level-1 nested property manager property
- # Get the level1-nested property manager
+ # Get the level1-nested property manager
nested_l1_pmgr = pmgr['E'].value
self.assertEqual(3, len(nested_l1_pmgr))
self.assertTrue('F' in nested_l1_pmgr)
@@ -76,7 +76,7 @@ class PropertyManagerPropertyTest(unittest.TestCase):
self.assertTrue('H' in nested_l1_pmgr)
self.assertTrue(isinstance(nested_l1_pmgr['H'].value, PropertyManager))
- # Get the level2-nested property manager
+ # Get the level2-nested property manager
nested_l2_pmgr = nested_l1_pmgr['H'].value
self.assertTrue('I' in nested_l2_pmgr)
self.assertEqual("test", nested_l2_pmgr['I'].value)
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/StringContainsValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/StringContainsValidatorTest.py
index 279c9eb4f37b019b8f4a796719e79869721ba180..d7403d9f29a5cfd20f524b61a15950eded609188 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/StringContainsValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/StringContainsValidatorTest.py
@@ -57,7 +57,7 @@ class StringContainsValidatorTest(unittest.TestCase):
self.assertRaises(ValueError, alg.setProperty, "Input", "Homeowner")
testhelpers.assertRaisesNothing(self, alg.setProperty, "Input", "HomeOwner")
testhelpers.assertRaisesNothing(self, alg.setProperty, "Input", "cat, meOws")
-
+
def test_StringContainsValidator_with_multiple_required_strings(self):
"""
Test that a string-contains validator that requires
@@ -80,10 +80,10 @@ class StringContainsValidatorTest(unittest.TestCase):
self.assertRaises(ValueError, alg.setProperty, "Input", "HomeRenter")
self.assertRaises(ValueError, alg.setProperty, "Input", "catmeOw")
testhelpers.assertRaisesNothing(self, alg.setProperty, "Input", "HomeOwner")
-
+
def test_StringContainsValidator_with_multiple_required_strings_constructor(self):
"""
- Test that a string-contains validator made from constructor that
+ Test that a string-contains validator made from constructor that
supplies multiple strings required to all be contained in the input string
"""
diff --git a/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_imshow.py b/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_imshow.py
index d087c00db418e058618c69e04c8bc19c3c4c5404..a41060b4b16426d2f411a9fa6e33c862ef563a5c 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_imshow.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_imshow.py
@@ -51,7 +51,7 @@ class ImshowTest(unittest.TestCase):
'interpolation', 'rasterized',
'resample', 'snap', 'url', 'visible', 'zorder']
self.check_props(art1, art2, props)
-
+
def test_imshow_creates_modest_image(self):
"""returns a modestImage"""
data = default_data()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceForMDNormTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceForMDNormTest.py
index f0535ac98869e8dae08cdae7633c6759e6a51c9e..7cc17f83cef688ff0c25730a4cef8cee71e67811 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceForMDNormTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceForMDNormTest.py
@@ -18,7 +18,7 @@ class CropWorkspaceForMDNormTest(unittest.TestCase):
ws_out = CropWorkspaceForMDNorm(InputWorkspace=ws_in,
XMin=1,
XMax=6)
- self.assertEqual(ws_out.getNumberEvents(), ws_in.getNumberEvents()/2)
+ self.assertEqual(ws_out.getNumberEvents(), ws_in.getNumberEvents()/2)
self.assertLessEqual(ws_out.getSpectrum(1).getTofs().max(), 6.)
self.assertGreaterEqual(ws_out.getSpectrum(1).getTofs().min(), 1.)
self.assertTrue(ws_out.run().hasProperty('MDNorm_low'))
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py
index 120605c129acf9e11b7d2a2ccbf4f433906dbd35..06c4f77657ff4b50727996c87d15b29d391fe084 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py
@@ -428,7 +428,7 @@ class ExportExperimentLogTest(unittest.TestCase):
FileMode = "new",
FileFormat = "tab",
OverrideLogValue = ["Duration", "12345", "ProtonCharge-Avg", "32.921"],
- RemoveDuplicateRecord = True,
+ RemoveDuplicateRecord = True,
OrderByTitle = 'RUN')
# Record 0B
@@ -441,7 +441,7 @@ class ExportExperimentLogTest(unittest.TestCase):
FileMode = "fastappend",
FileFormat = "tab",
OverrideLogValue = ["Duration", "12345", "ProtonCharge-Avg", "32.921"],
- RemoveDuplicateRecord = True,
+ RemoveDuplicateRecord = True,
OrderByTitle = 'RUN')
# Record 1
@@ -457,7 +457,7 @@ class ExportExperimentLogTest(unittest.TestCase):
FileMode = "fastappend",
FileFormat = "tab",
OverrideLogValue = ["Duration", "23456", "ProtonCharge-Avg", "22.921"],
- RemoveDuplicateRecord = True,
+ RemoveDuplicateRecord = True,
OrderByTitle = 'RUN')
# Record 2
@@ -473,7 +473,7 @@ class ExportExperimentLogTest(unittest.TestCase):
FileMode = "fastappend",
FileFormat = "tab",
OverrideLogValue = ["Duration", "34567", "ProtonCharge-Avg", "12.921"],
- RemoveDuplicateRecord = True,
+ RemoveDuplicateRecord = True,
OrderByTitle = 'RUN')
# Record 2B
@@ -486,7 +486,7 @@ class ExportExperimentLogTest(unittest.TestCase):
FileMode = "fastappend",
FileFormat = "tab",
OverrideLogValue = ["Duration", "34567", "ProtonCharge-Avg", "12.921"],
- RemoveDuplicateRecord = True,
+ RemoveDuplicateRecord = True,
OrderByTitle = 'RUN')
# Verify
@@ -724,7 +724,7 @@ class ExportExperimentLogTest(unittest.TestCase):
tsp_b=kernel.FloatTimeSeriesProperty("SensorA")
for i in arange(25):
tmptime = strftime("%Y-%m-%d %H:%M:%S", gmtime(mktime(gmtime())+i))
- if run == 23456:
+ if run == 23456:
shift = 0
else:
shift = int(run)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LRDirectBeamSortTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LRDirectBeamSortTest.py
index f9cc72cccd8c16ea475e3ccc682b0d150d12976f..3acbee9f912de49606f40931e7b7b102c2631433 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LRDirectBeamSortTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LRDirectBeamSortTest.py
@@ -10,14 +10,14 @@ import unittest
class LRDirectBeamSortTest(unittest.TestCase):
medium = 'air'
-
+
def __init__(self, *args):
LoadEventNexus(Filename='REF_L_179926.nxs.h5',
OutputWorkspace='REF_L_179926')
LoadEventNexus(Filename='REF_L_179927.nxs.h5',
OutputWorkspace='REF_L_179927')
unittest.TestCase.__init__(self, *args)
-
+
def test_RunsSuccessfully(self):
LRDirectBeamSort(WorkspaceList=['REF_L_179926','REF_L_179927'],
ComputeScalingFactors=True,
@@ -28,6 +28,6 @@ class LRDirectBeamSortTest(unittest.TestCase):
def __del__(self):
DeleteWorkspace('REF_L_179926')
DeleteWorkspace('REF_L_179927')
-
+
if __name__ == '__main__':
unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4Ascii1DTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4Ascii1DTest.py
index 7f63c04302c54370de6621ac89a87abc28eea93b..919050bd0a8b5ec2be80b57e03e7a0bd74f6c35f 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4Ascii1DTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4Ascii1DTest.py
@@ -23,7 +23,7 @@ class LoadNMoldyn4Ascii1DTest(unittest.TestCase):
self.assertTrue(isinstance(workspace, MatrixWorkspace))
self.assertEqual(workspace.getNumberHistograms(), 1)
self.assertEqual(workspace.blocksize(), 999)
- self.assertEqual(str(workspace.getAxis(0).getUnit().unitID()),
+ self.assertEqual(str(workspace.getAxis(0).getUnit().unitID()),
'Energy_inWavenumber')
def _validate_dos_total_convolution(self, workspace):
@@ -41,8 +41,8 @@ class LoadNMoldyn4Ascii1DTest(unittest.TestCase):
# ================================ Test cases ======================================#
def test_load_single_dos_function(self):
- function_wsg = LoadNMoldyn4Ascii1D(Directory=self._data_directory,
- Functions='dos_total',
+ function_wsg = LoadNMoldyn4Ascii1D(Directory=self._data_directory,
+ Functions='dos_total',
OutputWorkspace='__LoadNMoldyn4Ascii1D_test')
self.assertTrue(isinstance(function_wsg, WorkspaceGroup))
self.assertEqual(len(function_wsg), 1)
@@ -50,8 +50,8 @@ class LoadNMoldyn4Ascii1DTest(unittest.TestCase):
self._validate_dos_ws(mtd['__LoadNMoldyn4Ascii1D_test(dos_total)'])
def test_load_single_vacf_function(self):
- function_wsg = LoadNMoldyn4Ascii1D(Directory=self._data_directory,
- Functions='vacf_total',
+ function_wsg = LoadNMoldyn4Ascii1D(Directory=self._data_directory,
+ Functions='vacf_total',
OutputWorkspace='__LoadNMoldyn4Ascii1D_test')
self.assertTrue(isinstance(function_wsg, WorkspaceGroup))
self.assertEqual(len(function_wsg), 1)
@@ -59,8 +59,8 @@ class LoadNMoldyn4Ascii1DTest(unittest.TestCase):
self._validate_vacf_ws(mtd['__LoadNMoldyn4Ascii1D_test(vacf_total)'])
def test_load_multiple_functions(self):
- function_wsg = LoadNMoldyn4Ascii1D(Directory=self._data_directory,
- Functions='vacf_total, dos_total',
+ function_wsg = LoadNMoldyn4Ascii1D(Directory=self._data_directory,
+ Functions='vacf_total, dos_total',
OutputWorkspace='__LoadNMoldyn4Ascii1D_test')
self.assertTrue(isinstance(function_wsg, WorkspaceGroup))
self.assertEqual(len(function_wsg), 2)
@@ -70,7 +70,7 @@ class LoadNMoldyn4Ascii1DTest(unittest.TestCase):
self._validate_dos_ws(mtd['__LoadNMoldyn4Ascii1D_test(dos_total)'])
def test_load_dos_function_and_convolute(self):
- function_wsg = LoadNMoldyn4Ascii1D(Directory=self._data_directory,
+ function_wsg = LoadNMoldyn4Ascii1D(Directory=self._data_directory,
Functions='dos_total',
ResolutionConvolution='TOSCA',
OutputWorkspace='__LoadNMoldyn4Ascii1D_test')
@@ -81,8 +81,8 @@ class LoadNMoldyn4Ascii1DTest(unittest.TestCase):
self._validate_dos_total_convolution(mtd['__LoadNMoldyn4Ascii1D_test(dos_total)'])
def test_load_multiple_functions_some_skipped(self):
- function_wsg = LoadNMoldyn4Ascii1D(Directory=self._data_directory,
- Functions='vacf_total, dos_total, something',
+ function_wsg = LoadNMoldyn4Ascii1D(Directory=self._data_directory,
+ Functions='vacf_total, dos_total, something',
OutputWorkspace='__LoadNMoldyn4Ascii1D_test')
self.assertTrue(isinstance(function_wsg, WorkspaceGroup))
self.assertEqual(len(function_wsg), 2)
@@ -90,9 +90,9 @@ class LoadNMoldyn4Ascii1DTest(unittest.TestCase):
self._validate_vacf_ws(mtd['__LoadNMoldyn4Ascii1D_test(vacf_total)'])
self.assertTrue(function_wsg.contains('__LoadNMoldyn4Ascii1D_test(dos_total)'))
self._validate_dos_ws(mtd['__LoadNMoldyn4Ascii1D_test(dos_total)'])
-
+
def test_load_multiple_functions_some_convoluted(self):
- function_wsg = LoadNMoldyn4Ascii1D(Directory=self._data_directory,
+ function_wsg = LoadNMoldyn4Ascii1D(Directory=self._data_directory,
Functions='dos_total, vacf_total',
ResolutionConvolution='TOSCA',
OutputWorkspace='__LoadNMoldyn4Ascii1D_test')
@@ -102,7 +102,7 @@ class LoadNMoldyn4Ascii1DTest(unittest.TestCase):
self._validate_vacf_ws(mtd['__LoadNMoldyn4Ascii1D_test(vacf_total)'])
self.assertTrue(function_wsg.contains('__LoadNMoldyn4Ascii1D_test(dos_total)'))
self._validate_dos_ws(mtd['__LoadNMoldyn4Ascii1D_test(dos_total)'])
- self._validate_dos_total_convolution(mtd['__LoadNMoldyn4Ascii1D_test(dos_total)'])
+ self._validate_dos_total_convolution(mtd['__LoadNMoldyn4Ascii1D_test(dos_total)'])
# ============================= Test failure cases =========================================#
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MaskWorkspaceToCalFileTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MaskWorkspaceToCalFileTest.py
index 82caa0f6013587d0333f6eb5984f1b4c9ab1a0b0..a8dcab69d785d9a86dfaff94a0e9953e2a52d9eb 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MaskWorkspaceToCalFileTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MaskWorkspaceToCalFileTest.py
@@ -56,7 +56,7 @@ class MaskWorkspaceToCalFileTest(unittest.TestCase):
masking_identifier = 0
not_masking_identifier = 1
self.do_test_cal_file(masked_workspace, should_invert, masking_identifier, not_masking_identifier, 100)
-
+
# Test creating a cal file from a masked MatrixWorkspace with grouping
def test_calfile_from_grouped_masked_workspace(self):
run_algorithm('CreateSampleWorkspace', OutputWorkspace='wsMaskWSToCalFileTest', rethrow=True)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SaveP2DTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SaveP2DTest.py
index 1630193a115e82a548f0b2855ac447d2e4e8d63d..d8c545fb1d063cf17725fea443e016cca772158d 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SaveP2DTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SaveP2DTest.py
@@ -25,7 +25,7 @@ class SaveP2DTest(unittest.TestCase):
def setUp(self):
self._workspace = self._create_workspace()
-
+
def tearDown(self):
DeleteWorkspace(self._workspace)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SetDetScaleTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SetDetScaleTest.py
index ed984813e6ecc3a57dfe4a9df05bed4648a1cce4..f66832855c427227344bf0883ec56dc6f289aea7 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SetDetScaleTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SetDetScaleTest.py
@@ -36,7 +36,7 @@ class SetDetScaleTest(unittest.TestCase):
y = w.getInstrument().getNumberParameter("detScale49")[0]
self.assertEqual(x, 0.5)
self.assertEqual(y, 1.5)
-
+
# test both input
SetDetScale(Workspace=w, DetScaleList='17:1.0,49:2.0', DetScaleFile=filename)
x = w.getInstrument().getNumberParameter("detScale17")[0]
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioAnalysisTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioAnalysisTest.py
index 776d3089af393e9ed80aabee74113b0b56d0dcf5..d0fe1741dc920c54c9bb9f2c4302c2768e2f370c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioAnalysisTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioAnalysisTest.py
@@ -100,7 +100,7 @@ class VesuvioAnalysisTest(unittest.TestCase):
alg.setProperty('TOFRangeVector', [1,2])
alg.setProperty('ComptonProfile', table)
alg.setProperty('Spectra', [135, 182])
-
+
errors = alg.validateInputs()
self.assertEquals(len(errors),1)
self.assertTrue("TOFRangeVector" in errors)
@@ -111,7 +111,7 @@ class VesuvioAnalysisTest(unittest.TestCase):
alg.setProperty('TOFRangeVector', [1,2,3,4])
alg.setProperty('ComptonProfile', table)
alg.setProperty('Spectra', [135, 182])
-
+
errors = alg.validateInputs()
self.assertEquals(len(errors),1)
self.assertTrue("TOFRangeVector" in errors)
@@ -122,7 +122,7 @@ class VesuvioAnalysisTest(unittest.TestCase):
alg.setProperty('ConstraintsProfileNumbers', [1])
alg.setProperty('ComptonProfile', table)
alg.setProperty('Spectra', [135, 182])
-
+
errors = alg.validateInputs()
self.assertEquals(len(errors),1)
self.assertTrue("ConstraintsProfileNumbers" in errors)
@@ -133,7 +133,7 @@ class VesuvioAnalysisTest(unittest.TestCase):
alg.setProperty('ConstraintsProfileNumbers', [1,2,3])
alg.setProperty('ComptonProfile', table)
alg.setProperty('Spectra', [135, 182])
-
+
errors = alg.validateInputs()
self.assertEquals(len(errors),1)
self.assertTrue("ConstraintsProfileNumbers" in errors)
@@ -179,10 +179,10 @@ class VesuvioAnalysisTest(unittest.TestCase):
alg = self.set_up_alg()
alg.setProperty('ComptonProfile', table)
alg.setProperty('Spectra', [135, 182])
- alg.setProperty("Runs",run)
+ alg.setProperty("Runs",run)
errors = alg.validateInputs()
self.assertEquals(len(errors),1)
- self.assertTrue("Runs" in errors)
+ self.assertTrue("Runs" in errors)
def test_masked_sapectra_correct(self):
table = self.generate_table()
@@ -203,7 +203,7 @@ class VesuvioAnalysisTest(unittest.TestCase):
alg.setProperty('SpectraToBeMasked', spec)
errors = alg.validateInputs()
self.assertEquals(len(errors),1)
- self.assertTrue("SpectraToBeMasked" in errors)
+ self.assertTrue("SpectraToBeMasked" in errors)
if __name__ == '__main__':
unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultipleTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultipleTest.py
index fcd8dd014df06ca17cae6fb9f5e4cbaf7bf11d93..1547d50c1d57102923ea1a799ef1ec119ca8f558 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultipleTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultipleTest.py
@@ -69,7 +69,7 @@ class AddSampleLogMultipleTest(unittest.TestCase):
LogValues=values)
self._validate_sample_logs(names, values, types)
-
+
def test_strings_with_types(self):
"""
@@ -149,7 +149,7 @@ class AddSampleLogMultipleTest(unittest.TestCase):
Workspace=self._workspace,
LogNames=names,
LogValues=values,
- LogUnits=units)
+ LogUnits=units)
def test_validation_no_names(self):
"""
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/BayesStretchTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/BayesStretchTest.py
index d00a4118d5525ba28844523f722af20389355311..4523c3ff26baa500fc6531cbe1e2f4506074b82b 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/BayesStretchTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/BayesStretchTest.py
@@ -120,7 +120,7 @@ if platform.system() == "Windows":
self.assertAlmostEqual(fit_ws_beta.dataY(0)[12], 0., places=tol_places)
self.assertAlmostEqual(fit_ws_beta.dataY(0)[21], 0., places=tol_places)
self.assertAlmostEqual(fit_ws_beta.dataY(0)[22], 0., places=tol_places)
-
+
if __name__=="__main__":
unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeightingTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeightingTest.py
index 6b0f3df608ff9f43e5689991d2a525f94b5a3a63..f77469ef2b520047dc2f33d5cd01affd8ee41a3d 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeightingTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeightingTest.py
@@ -75,7 +75,7 @@ class DetectorFloodWeightingTest(unittest.TestCase):
self.assertEqual(x_axis[0], bands[0])
self.assertEqual(x_axis[-1], bands[-1])
self.assertEqual(out_ws.readY(0)[0], 1.0)
-
+
def test_execute_multiple_bands_no_solid_angle(self):
alg = AlgorithmManager.create("DetectorFloodWeighting")
alg.setChild(True)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/Elastic_angles.txt b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/Elastic_angles.txt
index 78a2b999907747799658112b853b07250cdac0c7..c324a9f7ded078dcd66ce17f98160edbcabec6b2 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/Elastic_angles.txt
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/Elastic_angles.txt
@@ -1,4 +1,4 @@
-spectrum,theta
+spectrum,theta
1 13.1636095801
2 19.8228943569
3 26.482164442
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCalibrationTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCalibrationTest.py
index ce9388e5131dfa1c955a68c4e40b818b8878f874..58a9e6efe52b419486fd7d928590b02f27ff24bb 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCalibrationTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCalibrationTest.py
@@ -20,7 +20,7 @@ class IndirectCalibrationTest(unittest.TestCase):
self.assertEqual(cal_ws.getNumberHistograms(), 51)
self.assertEqual(cal_ws.blocksize(), 1)
-
+
def test_logs(self):
cal_ws = IndirectCalibration(InputFiles='IRS38633.raw',
DetectorRange=[3,53],
@@ -30,8 +30,8 @@ class IndirectCalibrationTest(unittest.TestCase):
self.assertEqual(cal_ws.getNumberHistograms(), 51)
self.assertEqual(cal_ws.blocksize(), 1)
-
+
self.assertEqual(cal_ws.run().getProperty('current_period').value, 1)
-
+
if __name__ == "__main__":
unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/PolDiffILLReductionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/PolDiffILLReductionTest.py
index e3e3ebae31ad1a852d06b0e2f7bc9d33e8841b43..60008d2ea9b9a0d6916afe0b55afe481693a2548 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/PolDiffILLReductionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/PolDiffILLReductionTest.py
@@ -71,7 +71,7 @@ class PolDiffILLReductionTest(unittest.TestCase):
OutputTreatment='Average', OutputWorkspace='quartz')
self._check_output(mtd['quartz'], 1, 132, 6, 'Wavelength', 'Wavelength', 'Spectrum', 'Label')
self._check_process_flag(mtd['quartz'], 'Quartz')
-
+
def test_vanadium(self):
sampleProperties = {'FormulaUnits': 1, 'SampleMass': 8.54, 'FormulaUnitMass': 50.94}
PolDiffILLReduction(Run='396993', ProcessAs='Vanadium', OutputWorkspace='vanadium',
@@ -103,7 +103,7 @@ class PolDiffILLReductionTest(unittest.TestCase):
OutputTreatment='Individual')
self._check_output(mtd['sample'], 1, 132, 6, 'Wavelength', 'Wavelength', 'Spectrum', 'Label')
self._check_process_flag(mtd['sample'], 'Sample')
-
+
def _check_process_flag(self, ws, value):
self.assertTrue(ws[0].getRun().getLogData('ProcessedAs').value, value)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSStitchTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSStitchTest.py
index 9dc6e56a07905b81a4a1d84dfbaca730163a9154..73bfc18a773c716aedb71888648f04084b5ff382 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSStitchTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSStitchTest.py
@@ -272,7 +272,7 @@ class SANSStitchTest(unittest.TestCase):
y_array = out_ws.readY(0)
expected_y_array = [0.5] * 9
-
+
np.testing.assert_equal(y_array, expected_y_array)
def test_scale_both_without_can(self):
@@ -319,7 +319,7 @@ class SANSStitchTest(unittest.TestCase):
y_array = out_ws.readY(0)
expected_y_array = lab_workspace.readY(0) # We scale and shift to the back (lab) detectors
-
+
np.testing.assert_equal(y_array, expected_y_array)
def test_scale_both_without_can_with_q_fit_range(self):
@@ -372,7 +372,7 @@ class SANSStitchTest(unittest.TestCase):
y_array = out_ws.readY(0)
expected_y_array = [7497.5, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 7502, 10.0] # We scale and shift to the back (lab) detectors
-
+
np.testing.assert_equal(y_array, expected_y_array)
def test_shift_only_without_can(self):
@@ -507,7 +507,7 @@ class SANSStitchTest(unittest.TestCase):
y_array = out_ws.readY(0)
expected_y_array = [0.5] * 5 + [1.5] * 4
-
+
np.testing.assert_equal(y_array, expected_y_array)
def test_scale_none_with_can_and_q_merge_range(self):
@@ -555,7 +555,7 @@ class SANSStitchTest(unittest.TestCase):
y_array = out_ws.readY(0)
expected_y_array = [0.5] * 2 + [1.0] * 5 + [1.5] * 2
-
+
np.testing.assert_equal(y_array, expected_y_array)
def test_that_merge_range_greater_than_overlap_bounds_set_to_upper_bound(self):
@@ -654,7 +654,7 @@ class SANSStitchTest(unittest.TestCase):
y_array = out_ws.readY(0)
expected_y_array = [1.0] + [1.5] * 8
-
+
np.testing.assert_equal(y_array, expected_y_array)
def test_that_zero_merge_range_has_discrete_transition(self):
@@ -704,7 +704,7 @@ class SANSStitchTest(unittest.TestCase):
y_array = out_ws.readY(0)
expected_y_array = [0.5] * 5 + [1.5] * 4
-
+
np.testing.assert_equal(y_array, expected_y_array)
def test_that_can_merge_2D_reduction_when_fitting_set_to_none(self):
diff --git a/Framework/PythonInterface/test/python/plugins/functions/AttributeTest.py b/Framework/PythonInterface/test/python/plugins/functions/AttributeTest.py
index 470690b168fd24fa99185af61228f093f63e77df..ddf40425cd82be72af25520a55b6c81618a65ba4 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/AttributeTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/AttributeTest.py
@@ -13,7 +13,7 @@ import numpy
class AttributeExample(IFunction1D):
-
+
def init(self):
self.declareParameter("Amplitude",0.2)
self.declareParameter("Baseline",0.1)
@@ -66,6 +66,6 @@ class AttributeTest(unittest.TestCase):
self.assertEqual(fun.getAttributeValue('Frequency'), 0.26)
fun.setAttributeValue('Frequency', 6.2)
self.assertEqual(fun.getAttributeValue('Frequency'), 6.2)
-
+
if __name__ == '__main__':
unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTestHelper.py b/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTestHelper.py
index dcfe97a4ed35482aab5b29b98b3be2f628dc1015..6ec9fc7580c19400c487481b04878d75102de5e7 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTestHelper.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTestHelper.py
@@ -38,10 +38,10 @@ def cleanFit():
def assertFit(workspace, tg):
"""
-
+
:param workspace: data MatrixHistogram
:param tg: dictionary of target fitting parameters
- :return:
+ :return:
"""
unacceptable_chi_square = 1.0
msg = ""
@@ -84,7 +84,7 @@ def do_fit(tg, fString, shape):
Given a target shape and initial fit function guess, carry out the fit
:param tg: dictionary of target fitting parameters
:param fString: initial guess of the fit function
- :param shape: Gaussian or Lorentzian, either integrated or not
+ :param shape: Gaussian or Lorentzian, either integrated or not
:return: success or failure of the fit
"""
if 'Gaussian' in shape:
@@ -109,7 +109,7 @@ def do_fit(tg, fString, shape):
bb = np.insert(bb, 0, 2 * E[0] - bb[0]) # external lower bin boundary
bb = np.append(bb, 2 * E[-1] - bb[-1]) # external upper bin boundary
# return the integral over each energy bin
- return np.interp(bb[1:], efine, primitive) - np.interp(bb[:-1], efine, primitive)
+ return np.interp(bb[1:], efine, primitive) - np.interp(bb[:-1], efine, primitive)
createData(ifunctor)
else:
# when testing function StretchedExpFT
diff --git a/Framework/Reflectometry/CMakeLists.txt b/Framework/Reflectometry/CMakeLists.txt
index a22c0ced9a6a5d2e7f111f1ef5a13a2dfd8e6339..8c0fc2ebd898cae80183cbf672b299504adbc14e 100644
--- a/Framework/Reflectometry/CMakeLists.txt
+++ b/Framework/Reflectometry/CMakeLists.txt
@@ -81,7 +81,7 @@ if(COVERALLS)
endforeach(loop_var)
endif()
-# Add a precompiled header where they are supported
+# Add a precompiled header where they are supported
enable_precompiled_headers (inc/MantidReflectometry/PrecompiledHeader.h SRC_FILES )
# Add the target for this directory
add_library(Reflectometry ${SRC_FILES} ${INC_FILES})
diff --git a/Testing/Data/UnitTest/CORELLI/calibration/README.txt b/Testing/Data/UnitTest/CORELLI/calibration/README.txt
index 648dee96fe447985908ef8eea031bf8f5aeb9745..e11a06685c378dfc8627562124511030d66f9efd 100644
--- a/Testing/Data/UnitTest/CORELLI/calibration/README.txt
+++ b/Testing/Data/UnitTest/CORELLI/calibration/README.txt
@@ -1,5 +1,5 @@
-CORELLI_123455_bank20
- control bank, it has no problems
+CORELLI_123455_bank20
+ control bank, it has no problems
CORELLI_123454_bank58
beam center intensity spills over adjacent tubes, tube15 and tube16
diff --git a/Testing/PerformanceTests/README.txt b/Testing/PerformanceTests/README.txt
index 366c22d389e89e18b189ec9a21b2a7e52358609d..cac14c012318f72aca80d07daffe6f8d953188e8 100644
--- a/Testing/PerformanceTests/README.txt
+++ b/Testing/PerformanceTests/README.txt
@@ -8,16 +8,16 @@ The main scripts of interest are:
- xunit_to_sql.py : interprets XUnit .xml files and places them in a SQL
performance history database.
-- make_report.py : generate a HTML report with figures, using a
+- make_report.py : generate a HTML report with figures, using a
SQL database.
- check_performance.py : compare the performance of the latest test runs
to their historical averages and generates warnings
as needed.
-
+
See each script's help (script.py --help) for details.
The other scripts are support modules.
-
+
@author Janik Zikovsky
@date October 6th, 2011
\ No newline at end of file
diff --git a/Testing/PerformanceTests/check_performance.py b/Testing/PerformanceTests/check_performance.py
index b27cab549044774c5eecb4ea6e571c1cb1a3bd6d..bd4548be0725002597206e6bbdee100e9481e64a 100755
--- a/Testing/PerformanceTests/check_performance.py
+++ b/Testing/PerformanceTests/check_performance.py
@@ -73,7 +73,7 @@ def run(args):
# up the tolerance for those taking less time than 10ms.
timer_resolution_hi = 0.01
timer_resolution_lo = 0.0011
-
+
regression_names = []
speedup_names = []
@@ -111,7 +111,7 @@ def run(args):
regression_names.append(name)
elif pct > tolerance:
speedup_names.append(name)
-
+
regLinks = ["http://builds.mantidproject.org/job/master_performancetests2/Master_branch_performance_tests/{}.htm".format(name) for name in regression_names]
speedLinks = ["http://builds.mantidproject.org/job/master_performancetests2/Master_branch_performance_tests/{}.htm".format(name) for name in speedup_names]
email = secureemail.SendEmailSecure(args.sender, args.pwd, args.recipient, regLinks, speedLinks)
@@ -125,7 +125,7 @@ if __name__ == "__main__":
parser.add_argument('db', metavar='DBFILE', type=str, nargs=1,
default="./MantidSystemTests.db",
help='Full path to the SQLite database holding the results (default "./MantidSystemTests.db"). ')
-
+
parser.add_argument('sender', type=str, default="mantidproject@gmail.com",
help='Gmail email address')
diff --git a/Testing/PerformanceTests/secureemail.py b/Testing/PerformanceTests/secureemail.py
index e58f3d80e92decd36ba7f8af2cbd951038062d1b..75cc8054c1b96b605885d7df09ee453bef35fa9f 100644
--- a/Testing/PerformanceTests/secureemail.py
+++ b/Testing/PerformanceTests/secureemail.py
@@ -15,7 +15,7 @@ class SendEmailSecure:
self.recipient = recipient
self.regLinks = regLinks
self.speedLinks = speedLinks
-
+
def send(self):
msg = MIMEText("The following tests may have performance regressions:\n"+"\n\n - ".join(self.regLinks)+"\n This following tests may have spedup:\n"+"\n\n - ".join(self.speedLinks))
@@ -46,5 +46,4 @@ if __name__ == "__main__":
args = parser.parse_args()
email = SendEmailSecure(args.sender, args.pwd, args.recipient, args.regLinks.split(";"), args.speedLinks.split(";"))
email.send()
-
-
\ No newline at end of file
+
diff --git a/Testing/SystemTests/lib/systemtests/algorithm_decorator.py b/Testing/SystemTests/lib/systemtests/algorithm_decorator.py
index 0d16aa02ddba6c3071db511121600fe6439675cd..c58a4930b5d80a93402625e05c40ac03d2a5f2aa 100644
--- a/Testing/SystemTests/lib/systemtests/algorithm_decorator.py
+++ b/Testing/SystemTests/lib/systemtests/algorithm_decorator.py
@@ -11,45 +11,45 @@ def make_decorator(algorithm_to_decorate):
"""
Dynamically create a builder pattern style decorator around a Mantid algorithm.
This allows you to separate out setting algorithm parameters from the actual method execution. Parameters may be reset multiple times.
-
+
Usage:
rebin = make_decorator(Rebin)
rebin.set_Params([0, 0.1, 1])
....
rebin.execute()
-
+
Arguments:
algorithm_to_decorate: The mantid.simpleapi algorithm to decorate.
-
-
-
+
+
+
"""
-
+
class Decorator(object):
-
+
def __init__(self, alg_subject):
self.__alg_subject = alg_subject
self.__parameters__ = dict()
-
+
def execute(self, additional=None, verbose=False):
if verbose:
print "Algorithm Parameters:"
print self.__parameters__
- print
+ print
out = self.__alg_subject(**self.__parameters__)
return out
-
+
def set_additional(self, additional):
self.__parameters__.update(**additional)
def add_getter_setter(type, name):
-
+
def setter(self, x):
self.__parameters__[name] = x
-
+
def getter(self):
return self.__parameters__[name]
-
+
setattr(type, "set_" + name, setter)
setattr(type, "get_" + name, getter)
@@ -64,4 +64,4 @@ def make_decorator(algorithm_to_decorate):
parameter = m.group(0).strip()
add_getter_setter(Decorator, m.group(0).strip())
- return Decorator(algorithm_to_decorate)
+ return Decorator(algorithm_to_decorate)
diff --git a/Testing/SystemTests/lib/systemtests/systemtesting.py b/Testing/SystemTests/lib/systemtests/systemtesting.py
index 4d4a0b3b73c50f217c7ef17cc2eb1fa187b9a360..c5ca1fc2fd810400f3f071588ac8a20669875804 100644
--- a/Testing/SystemTests/lib/systemtests/systemtesting.py
+++ b/Testing/SystemTests/lib/systemtests/systemtesting.py
@@ -680,7 +680,7 @@ class TestScript(object):
import sys
for p in ('{TESTING_FRAMEWORK_DIR}', '{FRAMEWORK_PYTHONINTERFACE_TEST_DIR}', '{self._test_dir}'):
sys.path.append(p)
-
+
# Ensure sys path matches current to avoid weird import errors
sys.path.extend({sys.path})
from {self._modname} import {self._test_cls_name}
diff --git a/Testing/SystemTests/lib/systemtests/xmlreporter.py b/Testing/SystemTests/lib/systemtests/xmlreporter.py
index 2d2d911ed51012552caab20b83cb1468f187fc93..6b2147d99f1ce13a178266de30366a8149072745 100644
--- a/Testing/SystemTests/lib/systemtests/xmlreporter.py
+++ b/Testing/SystemTests/lib/systemtests/xmlreporter.py
@@ -15,7 +15,7 @@ class XmlResultReporter(systemtesting.ResultReporter):
_time_taken = 0.0
_failures = []
_skipped = []
-
+
def __init__(self, showSkipped=True, total_number_of_tests=0, maximum_name_length=0):
self._doc = getDOMImplementation().createDocument(None,'testsuite',None)
self._show_skipped = showSkipped
diff --git a/Testing/SystemTests/scripts/CMakeLists.txt b/Testing/SystemTests/scripts/CMakeLists.txt
index 9920264ebb6e37b991b1f9670ed9b98bac634632..83e929fa979e0ced12a06b36f887e39160f05d8c 100644
--- a/Testing/SystemTests/scripts/CMakeLists.txt
+++ b/Testing/SystemTests/scripts/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Write out a files containing
+# Write out a files containing
# - the data search directories
# - the default save directory
# These will be read by the MantidConfig class to configure the properties file
@@ -19,7 +19,7 @@ list(APPEND DATA_DIRS ${ExternalData_BINARY_ROOT}/Testing/Data/UnitTest)
# Doc tests
list(APPEND DATA_DIRS ${ExternalData_BINARY_ROOT}/Testing/Data/DocTest)
-# Output to file
+# Output to file
# If this is changed, make sure to update the .gitignore in this directory
set(DATA_DIRS_FILE ${CMAKE_CURRENT_LIST_DIR}/datasearch-directories.txt)
# The quotes are important as CMake translates the list to a semicolon-separated
diff --git a/Testing/SystemTests/scripts/performance/make_report.py b/Testing/SystemTests/scripts/performance/make_report.py
index 22692208835df8917735cb7fa90c9a8ccc99762e..290296a6bf13d0691e47790f4ad1e5128931edb2 100755
--- a/Testing/SystemTests/scripts/performance/make_report.py
+++ b/Testing/SystemTests/scripts/performance/make_report.py
@@ -24,14 +24,14 @@ def getSourceDir():
def join_databases(dbfiles):
- """Create a single DB joining several ones
+ """Create a single DB joining several ones
Returns: filename created
"""
outfile = os.path.join(os.path.dirname(dbfiles[0]), "JoinedDatabases.db")
all_results = []
# Get the results of each file
for dbfile in dbfiles:
- print "Reading", dbfile
+ print "Reading", dbfile
sqlresults.set_database_filename(dbfile)
these_results = sqlresults.get_results("")
all_results += these_results
@@ -43,47 +43,47 @@ def join_databases(dbfiles):
reporter.dispatchResults(res)
# Done!
return outfile
-
-
+
+
#====================================================================================
if __name__ == "__main__":
# Parse the command line
parser = argparse.ArgumentParser(description='Generates a HTML report using the Mantid System Tests results database')
- parser.add_argument('--path', dest='path',
+ parser.add_argument('--path', dest='path',
default="./Report",
help='Path to the output HTML. Default "./Report".' )
- parser.add_argument('--x_field', dest='x_field',
+ parser.add_argument('--x_field', dest='x_field',
default="revision",
help="Field to use as the x-axis. Default: 'revision'. Other possibilities: 'date'.")
parser.add_argument('dbfile', metavar='DBFILE', type=str, nargs='+',
- default=["./MantidSystemTests.db"],
+ default=["./MantidSystemTests.db"],
help='Required: Path to the SQL database file(s).')
-
-
+
+
args = parser.parse_args()
-
+
# Import the manager definition
import analysis
import sqlresults
-
+
if len(args.dbfile) > 1:
# Several files - join them into one big .db
dbfile = join_databases(args.dbfile)
else:
# Only one file - use it
dbfile = args.dbfile[0]
-
-
+
+
if not os.path.exists(dbfile):
print "Error! Could not find", dbfile
sys.exit(1)
-
+
# This is where we look for the DB file
sqlresults.set_database_filename(dbfile)
-
+
# Make the report
analysis.generate_html_report(args.path, 100, args.x_field)
\ No newline at end of file
diff --git a/Testing/SystemTests/scripts/performance/reporters.py b/Testing/SystemTests/scripts/performance/reporters.py
index 9fdfa73fae65028241a89fbc292cf9947de0be89..493d9769929f97f0d45cd46722a783a3e0c02ed8 100644
--- a/Testing/SystemTests/scripts/performance/reporters.py
+++ b/Testing/SystemTests/scripts/performance/reporters.py
@@ -13,7 +13,7 @@ import sys
class ResultReporter(object):
'''
A base class for results reporting. In order to get the results in an
- appropriate form, subclass this class and implement the dispatchResults
+ appropriate form, subclass this class and implement the dispatchResults
method.
'''
@@ -22,7 +22,7 @@ class ResultReporter(object):
pass
def dispatchResults(self, result):
- """
+ """
Parameters
result: a TestResult object """
raise NotImplementedError('"dispatchResults(self, result)" should be overridden in a derived class')
@@ -35,7 +35,7 @@ class TextResultReporter(ResultReporter):
'''
Report the results of a test using standard out
'''
-
+
def dispatchResults(self, result):
'''
Print the results to standard out
@@ -63,7 +63,7 @@ class LogArchivingReporter(ResultReporter):
self.logarchive = os.path.abspath(logarchive)
if not os.path.exists(self.logarchive):
os.mkdir(self.logarchive)
-
+
def dispatchResults(self, result):
'''
Print the results to standard out
@@ -81,29 +81,29 @@ class JUnitXMLReporter(ResultReporter):
Report the results of a test to a JUnit style XML format
that can be read by Hudson/Jenkins
'''
-
+
def __init__(self, path):
# Path to .xml files
self._path = path
-
+
def dispatchResults(self, result):
'''
Make a junit .xml file
'''
fullpath = os.path.join(self._path, "%s.xml" % result["name"])
f = open(fullpath, 'w')
-
+
names = result["name"].split(".")
- suitename = names[0]
+ suitename = names[0]
testname = ".".join(names[1:])
-
+
failure = ""
num_failures = 0
if not result["success"]:
failure = """\n <failure type="failedAssert">%s</failure>
<system-out ><![CDATA[%s]]></system-out>""" % (result["status"], result["log_contents"])
num_failures = 1
-
+
f.write("""<?xml version="1.0" encoding="UTF-8"?>
<testsuite name="%s" tests="1" failures="%d" disabled="0" errors="0" time="0.0">
<testcase name="%s" time="%f" classname="%s">%s
@@ -116,14 +116,14 @@ class JUnitXMLReporter(ResultReporter):
if __name__=="__main__":
import testresult
rep = JUnitXMLReporter(".")
-
+
res = testresult.TestResult()
res["name"] = "MyTestTest.Test"
res["status"] = "success maybe?"
res["success"] = True
res["runtime"] = 1.234
rep.dispatchResults(res)
-
+
res = testresult.TestResult()
res["name"] = "MyTestTest.OtherTest"
res["status"] = "failure"
diff --git a/Testing/SystemTests/scripts/performance/testresult.py b/Testing/SystemTests/scripts/performance/testresult.py
index 04c2abacf3f767531ee6e1c8fa52869e0b42370e..f993967ca26dfeabebce1e8ebd7dcc9c28828012 100644
--- a/Testing/SystemTests/scripts/performance/testresult.py
+++ b/Testing/SystemTests/scripts/performance/testresult.py
@@ -45,17 +45,17 @@ def envAsString():
# assume linux
env = linux_distro_description()
return env
-
-
+
+
#########################################################################
-# A class to store the results of a test
+# A class to store the results of a test
#########################################################################
class TestResult(object):
'''
Stores the results of each test so that they can be reported later.
'''
-
- def __init__(self,
+
+ def __init__(self,
date = datetime.datetime.now(),
name="",
type="system",
@@ -67,7 +67,7 @@ class TestResult(object):
runtime=0.0,
speed_up=0.0,
cpu_fraction=0.0,
- memory_change=0,
+ memory_change=0,
iterations=1,
success=False,
status="",
@@ -90,27 +90,27 @@ class TestResult(object):
self.data["status"] = status
self.data["log_contents"] = log_contents
self.data["variables"] = variables
-
-
+
+
def get_logarchive_filename(self):
"Return a bare filename that will hold the archived log contents"
s = str(self.data["date"])
s = s.replace(" ", "_")
s = s.replace(":", "-")
return "%s.%s.log" % (s, self.data["name"])
-
+
def __getitem__(self, key):
return self.data[key]
-
+
def __setitem__(self, key, value):
self.data.__setitem__(key, value)
-
+
def getData(self):
''' Get the map storing the results '''
return self.data
-
+
def __str__(self):
return str(self.data)
-
+
diff --git a/Testing/SystemTests/scripts/performance/xunit_to_sql.py b/Testing/SystemTests/scripts/performance/xunit_to_sql.py
index 536e4378ae1e39715f1e9ae4f78daab5cbb22d56..79397ceba1d40d820bb698e21b1715266819aea4 100755
--- a/Testing/SystemTests/scripts/performance/xunit_to_sql.py
+++ b/Testing/SystemTests/scripts/performance/xunit_to_sql.py
@@ -24,7 +24,7 @@ import sqlresults
import numpy as np
import glob
-# Global SQL result reporter
+# Global SQL result reporter
sql_reporter = None
# Variables string for all tests
variables = ""
@@ -51,8 +51,8 @@ def handle_testcase(case, suite_name):
memory_change = int(case.getElementsByTagName("memory").item(0).firstChild.nodeValue)
except:
memory_change = 0
-
-
+
+
tr = TestResult(date = datetime.datetime.now(),
name=name,
type="performance",
@@ -67,7 +67,7 @@ def handle_testcase(case, suite_name):
success=True,
status="",
log_contents="",
- variables=variables)
+ variables=variables)
#print tr.data
# Now report it to SQL
sql_reporter.dispatchResults(tr)
@@ -78,7 +78,7 @@ def handle_suite(suite):
cases = suite.getElementsByTagName("testcase")
for case in cases:
handle_testcase(case, suite_name)
-
+
def convert_xml(filename):
"""Convert a single XML file to SQL db"""
@@ -95,32 +95,32 @@ if __name__ == "__main__":
# Parse the command line
parser = argparse.ArgumentParser(description='Add the contents of Xunit-style XML test result files to a SQL database.')
- parser.add_argument('--db', dest='db',
+ parser.add_argument('--db', dest='db',
default="./MantidPerformanceTests.db",
help='Full path to the SQLite database holding the results (default "./MantidPerformanceTests.db"). The database will be created if it does not exist.')
-
- parser.add_argument('--variables', dest='variables',
+
+ parser.add_argument('--variables', dest='variables',
default="",
help='Optional string of comma-separated "VAR1NAME=VALUE,VAR2NAME=VALUE2" giving some parameters used, e.g. while building.')
-
- parser.add_argument('--commit', dest='commitid',
+
+ parser.add_argument('--commit', dest='commitid',
default="",
help='Commit ID of the current build (a 40-character SHA string).')
-
+
parser.add_argument('xmlpath', metavar='XMLPATH', type=str, nargs='+',
- default="",
+ default="",
help='Required: Path to the Xunit XML files.')
-
+
args = parser.parse_args()
-
+
# Setup the SQL database but only if it does not exist
sqlresults.set_database_filename(args.db)
if not os.path.exists(args.db):
sqlresults.setup_database()
- # Set up the reporter
+ # Set up the reporter
sql_reporter = sqlresults.SQLResultReporter()
-
- variables = args.variables
+
+ variables = args.variables
# Add a new revision and get the "revision" number
revision = sqlresults.add_revision()
# Save the commitid
@@ -134,10 +134,10 @@ if __name__ == "__main__":
xmlfiles = glob.glob(os.path.join(xmldir, '*.xml'))
else:
xmlfiles = args.xmlpath
-
+
# Convert each file
for file in xmlfiles:
convert_xml(file)
-
-
-
+
+
+
diff --git a/Testing/Tools/cxxtest/COPYING b/Testing/Tools/cxxtest/COPYING
index b1e3f5a2638797271cbc9b91b856c05ed6942c8f..0d3dec198dc02750c220ad110fee355b96dc9430 100644
--- a/Testing/Tools/cxxtest/COPYING
+++ b/Testing/Tools/cxxtest/COPYING
@@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
-
+
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
@@ -111,7 +111,7 @@ modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
-
+
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
-
+
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
@@ -158,7 +158,7 @@ Library.
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
-
+
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
@@ -216,7 +216,7 @@ instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
-
+
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
@@ -267,7 +267,7 @@ Library will still fall under Section 6.)
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
-
+
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
@@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
-
+
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
@@ -370,7 +370,7 @@ subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
-
+
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
@@ -422,7 +422,7 @@ conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
-
+
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
@@ -456,7 +456,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
-
+
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
diff --git a/Testing/Tools/cxxtest/README b/Testing/Tools/cxxtest/README
index 90ef0d000512b124b1b37b20fb7ed17989303df2..b595e2eeee23972b1e99e8eb83d88c2a5a791e63 100644
--- a/Testing/Tools/cxxtest/README
+++ b/Testing/Tools/cxxtest/README
@@ -7,7 +7,7 @@ Its advantages over existing alternatives are that it:
- Doesn't require RTTI
- Doesn't require member template functions
- Doesn't require exception handling
- - Doesn't require any external libraries (including memory management,
+ - Doesn't require any external libraries (including memory management,
file/console I/O, graphics libraries)
This makes it extremely portable and usable.
@@ -23,7 +23,7 @@ Simple user's guide
MyTest.h:
#include <cxxtest/TestSuite.h>
- class MyTestSuite : public CxxTest::TestSuite
+ class MyTestSuite : public CxxTest::TestSuite
{
public:
void testAddition( void )
diff --git a/Testing/Tools/cxxtest/build_tools/SCons/cxxtest.py b/Testing/Tools/cxxtest/build_tools/SCons/cxxtest.py
index 0c374d567aed0e62635d3be33b431a8f887a3ce9..1038e093f5dfa8a9c006ed42fdf641a1b54a2924 100644
--- a/Testing/Tools/cxxtest/build_tools/SCons/cxxtest.py
+++ b/Testing/Tools/cxxtest/build_tools/SCons/cxxtest.py
@@ -14,7 +14,7 @@
# gasper.azman at gmail.com or the cxxtest mailing list (dev at cxxtest.tigris.org)
#
# This file is maintained as a part of the CxxTest test suite.
-#
+#
# == About ==
#
# This builder correctly tracks dependencies and supports just about every
@@ -127,14 +127,14 @@ def UnitTest(env, target, source = [], **kwargs):
def isValidScriptPath(cxxtestgen):
"""check keyword arg or environment variable locating cxxtestgen script"""
-
+
if cxxtestgen and os.path.exists(cxxtestgen):
return True
else:
SCons.Warnings.warn(ToolCxxTestWarning,
"Invalid CXXTEST environment variable specified!")
return False
-
+
def defaultCxxTestGenLocation(env):
return os.path.join(
envget(env, 'CXXTEST_CXXTESTGEN_DEFAULT_LOCATION'),
@@ -143,7 +143,7 @@ def defaultCxxTestGenLocation(env):
def findCxxTestGen(env):
"""locate the cxxtestgen script by checking environment, path and project"""
-
+
# check the SCons environment...
# Then, check the OS environment...
cxxtest = envget(env, 'CXXTEST', None)
@@ -173,16 +173,16 @@ def findCxxTestGen(env):
# make sure it was correct
if isValidScriptPath(cxxtest):
return os.path.realpath(cxxtest)
-
+
# No valid environment variable found, so...
# Next, check the path...
# Next, check the project
check_path = os.path.join(
envget(env, 'CXXTEST_INSTALL_DIR'),
envget(env, 'CXXTEST_CXXTESTGEN_DEFAULT_LOCATION'))
- cxxtest = (env.WhereIs('cxxtestgen') or
+ cxxtest = (env.WhereIs('cxxtestgen') or
env.WhereIs('cxxtestgen', path=[Dir(check_path).abspath]))
-
+
if cxxtest:
return cxxtest
else:
@@ -244,7 +244,7 @@ def generate(env, **kwargs):
#
# Expected behaviour: keyword arguments override environment variables;
# environment variables override default settings.
- #
+ #
env.SetDefault( CXXTEST_RUNNER = 'ErrorPrinter' )
env.SetDefault( CXXTEST_OPTS = '' )
env.SetDefault( CXXTEST_SUFFIX = '.t.h' )
@@ -275,7 +275,7 @@ def generate(env, **kwargs):
# find and add the CxxTest headers to the path.
env.AppendUnique( CXXTEST_CPPPATH = [findCxxTestHeaders(env)] )
-
+
cxxtest = env['CXXTEST']
if cxxtest:
#
@@ -332,7 +332,7 @@ def generate(env, **kwargs):
else:
deps.append(env.CxxTestCpp(headers.pop(0), **kwargs))
deps.extend(
- [env.CxxTestCpp(header, CXXTEST_RUNNER = 'none',
+ [env.CxxTestCpp(header, CXXTEST_RUNNER = 'none',
CXXTEST_ROOT_PART = '--part', **kwargs)
for header in headers]
)
diff --git a/Testing/Tools/cxxtest/build_tools/SCons/test/eprouvette.py b/Testing/Tools/cxxtest/build_tools/SCons/test/eprouvette.py
index cafee1e0a86888af6af7d5dedc3132d863c92d63..5373cd15993cc2dee5a493b2b70353dece253b23 100755
--- a/Testing/Tools/cxxtest/build_tools/SCons/test/eprouvette.py
+++ b/Testing/Tools/cxxtest/build_tools/SCons/test/eprouvette.py
@@ -26,16 +26,16 @@ def main():
"""Parse the options and execute the program."""
usage = \
"""Usage: %prog [options] [test1 [test2 [...]]]
-
+
If you provide one or more tests, this will run the provided tests.
Otherwise, it will look for tests in the current directory and run them all.
"""
# option parsing
- parser = OptionParser(usage)
+ parser = OptionParser(usage)
parser.set_defaults(
action='run',
- verbose=True)
+ verbose=True)
parser.add_option("-c", "--clean",
action='store_const', const='clean', dest='action',
@@ -57,7 +57,7 @@ def main():
help='turn on debug output.')
(options, args) = parser.parse_args()
-
+
if options.debug or options.verbose:
tool_stdout = None
# gather the tests
@@ -75,7 +75,7 @@ def main():
elif options.action == 'clean':
for t in tests:
clean_test(t)
-
+
def crawl_tests(target):
"""Gather the directories in the test directory."""
@@ -153,7 +153,7 @@ def read_opts(t):
'links' : {}
}
exec(open(join(t, "TestDef.py")), opts)
- return opts
+ return opts
def setup_env(t, opts):
@@ -214,7 +214,7 @@ def run_scons(t, opts):
os.chdir(cwd) # clean up
raise e
os.chdir(cwd)
-
+
if __name__ == "__main__":
main()
diff --git a/Testing/Tools/cxxtest/build_tools/SCons/test/globbing_edmundo/hellotest.t.h b/Testing/Tools/cxxtest/build_tools/SCons/test/globbing_edmundo/hellotest.t.h
index a14d9fa31fbddc470f44a4559dabfc959852cd64..6638dbac9f53b01fc595439dc033c0634b587320 100644
--- a/Testing/Tools/cxxtest/build_tools/SCons/test/globbing_edmundo/hellotest.t.h
+++ b/Testing/Tools/cxxtest/build_tools/SCons/test/globbing_edmundo/hellotest.t.h
@@ -16,9 +16,9 @@
#include <cxxtest/TestSuite.h>
#include <hello.hh>
-
-class helloTestSuite : public CxxTest::TestSuite
+
+class helloTestSuite : public CxxTest::TestSuite
{
public:
void testFoo()
diff --git a/Testing/Tools/cxxtest/cxxtest.spec b/Testing/Tools/cxxtest/cxxtest.spec
index 1c9bd421e410b391aaf9d39854f5c60465b6d9a7..91bc4a346a115953a5eb6254b940a88e39653139 100644
--- a/Testing/Tools/cxxtest/cxxtest.spec
+++ b/Testing/Tools/cxxtest/cxxtest.spec
@@ -15,7 +15,7 @@ Its advantages over existing alternatives are that it:
- Doesn't require RTTI
- Doesn't require member template functions
- Doesn't require exception handling
- - Doesn't require any external libraries (including memory management,
+ - Doesn't require any external libraries (including memory management,
file/console I/O, graphics libraries)
%prep
diff --git a/Testing/Tools/cxxtest/cxxtest/Descriptions.cpp b/Testing/Tools/cxxtest/cxxtest/Descriptions.cpp
index 0a11f0b0f02e40c17ce9587533930943d5f85548..09b139c2831b6c6ebc08c2d20291c6e93cb6f31c 100644
--- a/Testing/Tools/cxxtest/cxxtest/Descriptions.cpp
+++ b/Testing/Tools/cxxtest/cxxtest/Descriptions.cpp
@@ -14,7 +14,7 @@ namespace CxxTest
TestDescription::~TestDescription() {}
SuiteDescription::~SuiteDescription() {}
WorldDescription::~WorldDescription() {}
-
+
//
// Convert total tests to string
//
diff --git a/Testing/Tools/cxxtest/cxxtest/Descriptions.h b/Testing/Tools/cxxtest/cxxtest/Descriptions.h
index 3de60f4091046c414446a096778c2abfca1c5dc0..65aaadd012111418f00eac7688e3a04ef47197b5 100644
--- a/Testing/Tools/cxxtest/cxxtest/Descriptions.h
+++ b/Testing/Tools/cxxtest/cxxtest/Descriptions.h
@@ -13,7 +13,7 @@
#include <cxxtest/LinkedList.h>
-namespace CxxTest
+namespace CxxTest
{
class TestSuite;
@@ -21,30 +21,30 @@ namespace CxxTest
{
public:
virtual ~TestDescription();
-
+
virtual const char *file() const = 0;
virtual unsigned line() const = 0;
virtual const char *testName() const = 0;
virtual const char *suiteName() const = 0;
-
+
virtual void run() = 0;
virtual bool setUp() = 0;
virtual bool tearDown() = 0;
virtual const TestDescription *next() const = 0;
- virtual TestDescription *next() = 0;
+ virtual TestDescription *next() = 0;
};
class SuiteDescription : public Link
{
public:
virtual ~SuiteDescription();
-
+
virtual const char *file() const = 0;
virtual unsigned line() const = 0;
virtual const char *suiteName() const = 0;
virtual TestSuite *suite() const = 0;
-
+
virtual unsigned numTests() const = 0;
virtual const TestDescription &testDescription( unsigned /*i*/ ) const = 0;
@@ -64,7 +64,7 @@ namespace CxxTest
{
public:
virtual ~WorldDescription();
-
+
virtual const char *worldName() const { return "cxxtest"; }
virtual unsigned numSuites( void ) const = 0;
virtual unsigned numTotalTests( void ) const = 0;
diff --git a/Testing/Tools/cxxtest/cxxtest/DummyDescriptions.cpp b/Testing/Tools/cxxtest/cxxtest/DummyDescriptions.cpp
index cd0dde1cc0cc888fc18117b05dfe93536da1c964..a607ca7e1545ebaf54a7d095bd6a16cd6372cbfb 100644
--- a/Testing/Tools/cxxtest/cxxtest/DummyDescriptions.cpp
+++ b/Testing/Tools/cxxtest/cxxtest/DummyDescriptions.cpp
@@ -6,10 +6,10 @@
// SPDX - License - Identifier: GPL - 3.0 +
#include <cxxtest/DummyDescriptions.h>
-namespace CxxTest
+namespace CxxTest
{
DummyTestDescription::DummyTestDescription() {}
-
+
const char *DummyTestDescription::file() const { return "<no file>"; }
unsigned DummyTestDescription::line() const { return 0; }
const char *DummyTestDescription::testName() const { return "<no test>"; }
@@ -20,9 +20,9 @@ namespace CxxTest
TestDescription *DummyTestDescription::next() { return 0; }
const TestDescription *DummyTestDescription::next() const { return 0; }
-
+
DummySuiteDescription::DummySuiteDescription() : _test() {}
-
+
const char *DummySuiteDescription::file() const { return "<no file>"; }
unsigned DummySuiteDescription::line() const { return 0; }
const char *DummySuiteDescription::suiteName() const { return "<no suite>"; }
@@ -35,12 +35,12 @@ namespace CxxTest
const TestDescription *DummySuiteDescription::firstTest() const { return 0; }
void DummySuiteDescription::activateAllTests() {}
bool DummySuiteDescription::leaveOnly( const char * /*testName*/ ) { return false; }
-
+
bool DummySuiteDescription::setUp() { return true;}
bool DummySuiteDescription::tearDown() { return true;}
DummyWorldDescription::DummyWorldDescription() : _suite() {}
-
+
unsigned DummyWorldDescription::numSuites( void ) const { return 0; }
unsigned DummyWorldDescription::numTotalTests( void ) const { return 0; }
const SuiteDescription &DummyWorldDescription::suiteDescription( unsigned ) const { return _suite; }
@@ -48,7 +48,7 @@ namespace CxxTest
const SuiteDescription *DummyWorldDescription::firstSuite() const { return 0; }
void DummyWorldDescription::activateAllTests() {}
bool DummyWorldDescription::leaveOnly( const char * /*suiteName*/, const char * /*testName*/ ) { return false; }
-
+
bool DummyWorldDescription::setUp() { return true;}
bool DummyWorldDescription::tearDown() { return true;}
}
diff --git a/Testing/Tools/cxxtest/cxxtest/DummyDescriptions.h b/Testing/Tools/cxxtest/cxxtest/DummyDescriptions.h
index d4f4a39df5ac73d57d93576da7d7a4bbdb35b21d..41ad6da8f69f2894b3d12a4e2c90be71bc36c3be 100644
--- a/Testing/Tools/cxxtest/cxxtest/DummyDescriptions.h
+++ b/Testing/Tools/cxxtest/cxxtest/DummyDescriptions.h
@@ -12,13 +12,13 @@
#include <cxxtest/Descriptions.h>
-namespace CxxTest
+namespace CxxTest
{
class DummyTestDescription : public TestDescription
{
public:
DummyTestDescription();
-
+
const char *file() const;
unsigned line() const;
const char *testName() const;
@@ -32,10 +32,10 @@ namespace CxxTest
};
class DummySuiteDescription : public SuiteDescription
- {
+ {
public:
DummySuiteDescription();
-
+
const char *file() const;
unsigned line() const;
const char *suiteName() const;
@@ -48,7 +48,7 @@ namespace CxxTest
const TestDescription *firstTest() const;
void activateAllTests();
bool leaveOnly( const char * /*testName*/ );
-
+
bool setUp();
bool tearDown();
@@ -60,7 +60,7 @@ namespace CxxTest
{
public:
DummyWorldDescription();
-
+
unsigned numSuites( void ) const;
unsigned numTotalTests( void ) const;
const SuiteDescription &suiteDescription( unsigned ) const;
@@ -68,7 +68,7 @@ namespace CxxTest
const SuiteDescription *firstSuite() const;
void activateAllTests();
bool leaveOnly( const char * /*suiteName*/, const char * /*testName*/ = 0 );
-
+
bool setUp();
bool tearDown();
diff --git a/Testing/Tools/cxxtest/cxxtest/ErrorFormatter.h b/Testing/Tools/cxxtest/cxxtest/ErrorFormatter.h
index ed6301217bcd977a2f21a82a78c508c142ac8bdd..817d166e58a96d245fb643bdbe51795e5d8c9fed 100644
--- a/Testing/Tools/cxxtest/cxxtest/ErrorFormatter.h
+++ b/Testing/Tools/cxxtest/cxxtest/ErrorFormatter.h
@@ -24,7 +24,7 @@ namespace CxxTest
virtual OutputStream &operator<<( const char * /*string*/ ) { return *this; }
typedef void (*Manipulator)( OutputStream & );
-
+
virtual OutputStream &operator<<( Manipulator m ) { m( *this ); return *this; }
static void endl( OutputStream &o ) { (o << "\n").flush(); }
};
@@ -220,7 +220,7 @@ namespace CxxTest
private:
ErrorFormatter( const ErrorFormatter & );
ErrorFormatter &operator=( const ErrorFormatter & );
-
+
OutputStream &stop( const char *file, unsigned line )
{
newLine();
@@ -256,7 +256,7 @@ namespace CxxTest
{
(*_o) << " (null)" << endl;
}
-
+
void dumpBuffer( const void *buffer, unsigned size )
{
unsigned dumpSize = size;
diff --git a/Testing/Tools/cxxtest/cxxtest/ErrorPrinter.h b/Testing/Tools/cxxtest/cxxtest/ErrorPrinter.h
index 289290747fa0da3e711550a6c9af53003f9b75e0..8f097c28e087bc167945b22402239d9c10097561 100644
--- a/Testing/Tools/cxxtest/cxxtest/ErrorPrinter.h
+++ b/Testing/Tools/cxxtest/cxxtest/ErrorPrinter.h
@@ -28,7 +28,7 @@
# include <iostream>
#endif // _CXXTEST_OLD_STD
-namespace CxxTest
+namespace CxxTest
{
class ErrorPrinter : public ErrorFormatter
{
diff --git a/Testing/Tools/cxxtest/cxxtest/GlobalFixture.cpp b/Testing/Tools/cxxtest/cxxtest/GlobalFixture.cpp
index 686039311146612628a158a83fc7194ca3b82b74..b3c6612783c1d0e61bf8d72ada9f85b52aba1d75 100644
--- a/Testing/Tools/cxxtest/cxxtest/GlobalFixture.cpp
+++ b/Testing/Tools/cxxtest/cxxtest/GlobalFixture.cpp
@@ -9,16 +9,16 @@
#include <cxxtest/GlobalFixture.h>
-namespace CxxTest
+namespace CxxTest
{
bool GlobalFixture::setUpWorld() { return true; }
bool GlobalFixture::tearDownWorld() { return true; }
bool GlobalFixture::setUp() { return true; }
bool GlobalFixture::tearDown() { return true; }
-
+
GlobalFixture::GlobalFixture() { attach( _list ); }
GlobalFixture::~GlobalFixture() { detach( _list ); }
-
+
GlobalFixture *GlobalFixture::firstGlobalFixture() { return (GlobalFixture *)_list.head(); }
GlobalFixture *GlobalFixture::lastGlobalFixture() { return (GlobalFixture *)_list.tail(); }
GlobalFixture *GlobalFixture::nextGlobalFixture() { return (GlobalFixture *)next(); }
diff --git a/Testing/Tools/cxxtest/cxxtest/GlobalFixture.h b/Testing/Tools/cxxtest/cxxtest/GlobalFixture.h
index cc5bf5dcdd37e9cb2548c9afad6ae0548dba769b..5f357fdde12ff583a069439ccfb419edd64e5916 100644
--- a/Testing/Tools/cxxtest/cxxtest/GlobalFixture.h
+++ b/Testing/Tools/cxxtest/cxxtest/GlobalFixture.h
@@ -8,7 +8,7 @@
#include <cxxtest/LinkedList.h>
-namespace CxxTest
+namespace CxxTest
{
class GlobalFixture : public Link
{
@@ -17,10 +17,10 @@ namespace CxxTest
virtual bool tearDownWorld();
virtual bool setUp();
virtual bool tearDown();
-
+
GlobalFixture();
~GlobalFixture();
-
+
static GlobalFixture *firstGlobalFixture();
static GlobalFixture *lastGlobalFixture();
GlobalFixture *nextGlobalFixture();
diff --git a/Testing/Tools/cxxtest/cxxtest/LinkedList.cpp b/Testing/Tools/cxxtest/cxxtest/LinkedList.cpp
index cd73cd2289ed4f4633daa5d56f020da38c6d75b7..57ade4af93b9b728c83666f68f0adfe757b998f1 100644
--- a/Testing/Tools/cxxtest/cxxtest/LinkedList.cpp
+++ b/Testing/Tools/cxxtest/cxxtest/LinkedList.cpp
@@ -18,7 +18,7 @@ namespace CxxTest
{
_head = _tail = 0;
}
-
+
Link *List::head()
{
Link *l = _head;
@@ -95,12 +95,12 @@ namespace CxxTest
Link::~Link()
{
}
-
+
bool Link::active() const
{
return _active;
}
-
+
void Link::setActive( bool value )
{
_active = value;
@@ -110,12 +110,12 @@ namespace CxxTest
{
return _next;
}
-
+
Link * Link::justPrev()
{
return _prev;
}
-
+
Link * Link::next()
{
Link *l = _next;
@@ -123,7 +123,7 @@ namespace CxxTest
l = l->_next;
return l;
}
-
+
Link * Link::prev()
{
Link *l = _prev;
@@ -131,7 +131,7 @@ namespace CxxTest
l = l->_prev;
return l;
}
-
+
const Link * Link::next() const
{
Link *l = _next;
@@ -139,7 +139,7 @@ namespace CxxTest
l = l->_next;
return l;
}
-
+
const Link * Link::prev() const
{
Link *l = _prev;
@@ -147,7 +147,7 @@ namespace CxxTest
l = l->_prev;
return l;
}
-
+
void Link::attach( List &l )
{
if ( l._tail )
@@ -155,7 +155,7 @@ namespace CxxTest
_prev = l._tail;
_next = 0;
-
+
if ( l._head == 0 )
l._head = this;
l._tail = this;
@@ -167,7 +167,7 @@ namespace CxxTest
_prev->_next = _next;
else
l._head = _next;
-
+
if ( _next )
_next->_prev = _prev;
else
diff --git a/Testing/Tools/cxxtest/cxxtest/LinkedList.h b/Testing/Tools/cxxtest/cxxtest/LinkedList.h
index a126db44a15036ec1441c55614983b5386c49b8f..c23937ac7ed489a9ce65e4a01fc387a90d98be94 100644
--- a/Testing/Tools/cxxtest/cxxtest/LinkedList.h
+++ b/Testing/Tools/cxxtest/cxxtest/LinkedList.h
@@ -8,7 +8,7 @@
#include <cxxtest/Flags.h>
-namespace CxxTest
+namespace CxxTest
{
struct List;
class Link;
@@ -34,7 +34,7 @@ namespace CxxTest
};
class Link
- {
+ {
public:
Link();
virtual ~Link();
@@ -44,7 +44,7 @@ namespace CxxTest
Link *justNext();
Link *justPrev();
-
+
Link *next();
Link *prev();
const Link *next() const;
diff --git a/Testing/Tools/cxxtest/cxxtest/MantidFormatter.h b/Testing/Tools/cxxtest/cxxtest/MantidFormatter.h
index 00389cbc6cc7fbcd3a0ee727992a136a03748922..d2edb0bce44e3083b759f1ab968ecf7774166d89 100644
--- a/Testing/Tools/cxxtest/cxxtest/MantidFormatter.h
+++ b/Testing/Tools/cxxtest/cxxtest/MantidFormatter.h
@@ -34,7 +34,7 @@ namespace CxxTest
virtual OutputStream &operator<<( const char * /*string*/ ) { return *this; }
typedef void (*Manipulator)( OutputStream & );
-
+
virtual OutputStream &operator<<( Manipulator m ) { m( *this ); return *this; }
static void endl( OutputStream &o ) { (o << "\n").flush(); }
};
@@ -90,8 +90,8 @@ namespace CxxTest
(*_o).flush();
_reported = false;
}
-
- void leaveSuite( const SuiteDescription & sd )
+
+ void leaveSuite( const SuiteDescription & sd )
{
if ( !tracker().suiteFailed() ) {
(*_o) << "OK!" << endl;
@@ -246,7 +246,7 @@ namespace CxxTest
private:
MantidFormatter( const MantidFormatter & );
MantidFormatter &operator=( const MantidFormatter & );
-
+
OutputStream &stop( const char *file, unsigned line )
{
newLine();
@@ -282,7 +282,7 @@ namespace CxxTest
{
(*_o) << " (null)" << endl;
}
-
+
void dumpBuffer( const void *buffer, unsigned size )
{
unsigned dumpSize = size;
diff --git a/Testing/Tools/cxxtest/cxxtest/MantidPrinter.h b/Testing/Tools/cxxtest/cxxtest/MantidPrinter.h
index e4fdfed17e7bb39aa550d5883ed3d8f4bfdb9b00..8a3a41c59d36ac61696982929da93d28f4143260 100644
--- a/Testing/Tools/cxxtest/cxxtest/MantidPrinter.h
+++ b/Testing/Tools/cxxtest/cxxtest/MantidPrinter.h
@@ -28,7 +28,7 @@
# include <iostream>
#endif // _CXXTEST_OLD_STD
-namespace CxxTest
+namespace CxxTest
{
class MantidPrinter : public MantidFormatter
{
diff --git a/Testing/Tools/cxxtest/cxxtest/ParenPrinter.h b/Testing/Tools/cxxtest/cxxtest/ParenPrinter.h
index b7f5c543a06a6ef4ab01337756d498575b4d9358..d774bb5fee908509e7be6cd53549972241bf238b 100644
--- a/Testing/Tools/cxxtest/cxxtest/ParenPrinter.h
+++ b/Testing/Tools/cxxtest/cxxtest/ParenPrinter.h
@@ -14,7 +14,7 @@
#include <cxxtest/ErrorPrinter.h>
-namespace CxxTest
+namespace CxxTest
{
class ParenPrinter : public ErrorPrinter
{
diff --git a/Testing/Tools/cxxtest/cxxtest/QtGui.h b/Testing/Tools/cxxtest/cxxtest/QtGui.h
index c8b0acba3b4e97acf504dab74757c8214825adaf..116b82e5d819c1bcf274e3a905a218b44fc41060 100644
--- a/Testing/Tools/cxxtest/cxxtest/QtGui.h
+++ b/Testing/Tools/cxxtest/cxxtest/QtGui.h
@@ -9,7 +9,7 @@
//
// The QtGui displays a simple progress bar using the Qt Toolkit. It
// has been tested with versions 2.x and 3.x.
-//
+//
// Apart from normal Qt command-line arguments, it accepts the following options:
// -minimized Start minimized, pop up on error
// -keep Don't close the window at the end
@@ -68,7 +68,7 @@ namespace CxxTest
getTotalTests();
processEvents();
}
-
+
void redBar()
{
if ( _startMinimized && _mainWindow->isMinimized() )
@@ -105,7 +105,7 @@ namespace CxxTest
{
_startMinimized = _keep = false;
_title = argv[0];
-
+
for ( int i = 1; i < argc; ++ i ) {
QString arg( argv[i] );
if ( arg == "-minimized" )
@@ -120,11 +120,11 @@ namespace CxxTest
void createApplication( int &argc, char **argv )
{
_application = new QApplication( argc, argv );
- }
-
+ }
+
void createWindow( const WorldDescription &wd )
{
- getTotalTests( wd );
+ getTotalTests( wd );
createMainWindow();
createProgressBar();
createStatusBar();
@@ -241,7 +241,7 @@ namespace CxxTest
QWidget *desktop = QApplication::desktop();
int xCenter = desktop->x() + (desktop->width() / 2);
int yCenter = desktop->y() + (desktop->height() / 2);
-
+
int windowWidth = (desktop->width() * 4) / 5;
int windowHeight = _mainWindow->height();
_mainWindow->setGeometry( xCenter - (windowWidth / 2), yCenter - (windowHeight / 2), windowWidth, windowHeight );
diff --git a/Testing/Tools/cxxtest/cxxtest/RealDescriptions.cpp b/Testing/Tools/cxxtest/cxxtest/RealDescriptions.cpp
index 0b89b4d0eaed995aab68f2e7655a527c914189d1..3e04fc82355c482ba5d379b28a1e94b33030ed35 100644
--- a/Testing/Tools/cxxtest/cxxtest/RealDescriptions.cpp
+++ b/Testing/Tools/cxxtest/cxxtest/RealDescriptions.cpp
@@ -14,12 +14,12 @@
#include <cxxtest/RealDescriptions.h>
-namespace CxxTest
+namespace CxxTest
{
RealTestDescription::RealTestDescription()
{
}
-
+
RealTestDescription::RealTestDescription( List &argList,
SuiteDescription &argSuite,
unsigned argLine,
@@ -38,7 +38,7 @@ namespace CxxTest
_testName = argTestName;
attach( argList );
}
-
+
bool RealTestDescription::setUp()
{
if ( !suite() )
@@ -103,7 +103,7 @@ namespace CxxTest
_TS_CATCH_ABORT( {} )
___TSM_CATCH( file(), line(), "Exception thrown from test" );
}
-
+
RealSuiteDescription::RealSuiteDescription() {}
RealSuiteDescription::RealSuiteDescription( const char *argFile,
unsigned argLine,
@@ -122,7 +122,7 @@ namespace CxxTest
_line = argLine;
_suiteName = argSuiteName;
_tests = &argTests;
-
+
attach( _suites );
}
@@ -134,9 +134,9 @@ namespace CxxTest
const TestDescription *RealSuiteDescription::firstTest() const { return (const RealTestDescription *)_tests->head(); }
SuiteDescription *RealSuiteDescription::next() { return (RealSuiteDescription *)Link::next(); }
const SuiteDescription *RealSuiteDescription::next() const { return (const RealSuiteDescription *)Link::next(); }
-
+
unsigned RealSuiteDescription::numTests() const { return _tests->size(); }
-
+
const TestDescription &RealSuiteDescription::testDescription( unsigned i ) const
{
return *(RealTestDescription *)_tests->nth( i );
@@ -146,7 +146,7 @@ namespace CxxTest
{
_tests->activateAll();
}
-
+
bool RealSuiteDescription::leaveOnly( const char *testName )
{
for ( TestDescription *td = firstTest(); td != 0; td = td->next() ) {
@@ -155,9 +155,9 @@ namespace CxxTest
return true;
}
}
- return false;
+ return false;
}
-
+
StaticSuiteDescription::StaticSuiteDescription() {}
StaticSuiteDescription::StaticSuiteDescription( const char *argFile, unsigned argLine,
const char *argSuiteName, TestSuite &argSuite,
@@ -174,7 +174,7 @@ namespace CxxTest
RealSuiteDescription::initialize( argFile, argLine, argSuiteName, argTests );
doInitialize( argSuite );
}
-
+
void StaticSuiteDescription::doInitialize( TestSuite &argSuite )
{
_suite = &argSuite;
@@ -218,17 +218,17 @@ namespace CxxTest
_createLine = argCreateLine;
_destroyLine = argDestroyLine;
}
-
+
List &RealWorldDescription::suites()
{
return RealSuiteDescription::_suites;
}
-
+
unsigned RealWorldDescription::numSuites( void ) const
{
return suites().size();
}
-
+
unsigned RealWorldDescription::numTotalTests( void ) const
{
unsigned count = 0;
@@ -236,7 +236,7 @@ namespace CxxTest
count += sd->numTests();
return count;
}
-
+
SuiteDescription *RealWorldDescription::firstSuite()
{
return (RealSuiteDescription *)suites().head();
@@ -274,7 +274,7 @@ namespace CxxTest
}
return false;
}
-
+
bool RealWorldDescription::setUp()
{
for ( GlobalFixture *gf = GlobalFixture::firstGlobalFixture(); gf != 0; gf = gf->nextGlobalFixture() ) {
diff --git a/Testing/Tools/cxxtest/cxxtest/RealDescriptions.h b/Testing/Tools/cxxtest/cxxtest/RealDescriptions.h
index 460488037b163eb57b59ed9ed9301044efc8c22a..59c38eccb46b9053a91524e28ecb983352f99fdd 100644
--- a/Testing/Tools/cxxtest/cxxtest/RealDescriptions.h
+++ b/Testing/Tools/cxxtest/cxxtest/RealDescriptions.h
@@ -14,7 +14,7 @@
#include <cxxtest/TestSuite.h>
#include <cxxtest/GlobalFixture.h>
-namespace CxxTest
+namespace CxxTest
{
class RealTestDescription : public TestDescription
{
@@ -22,7 +22,7 @@ namespace CxxTest
RealTestDescription();
RealTestDescription( List &argList, SuiteDescription &argSuite, unsigned argLine, const char *argTestName );
void initialize( List &argList, SuiteDescription &argSuite, unsigned argLine, const char *argTestName );
-
+
const char *file() const;
unsigned line() const;
const char *testName() const;
@@ -34,15 +34,15 @@ namespace CxxTest
TestSuite *suite() const;
bool setUp();
- void run();
+ void run();
bool tearDown();
-
+
private:
RealTestDescription( const RealTestDescription & );
RealTestDescription &operator=( const RealTestDescription & );
virtual void runTest() = 0;
-
+
SuiteDescription *_suite;
unsigned _line;
const char *_testName;
@@ -53,7 +53,7 @@ namespace CxxTest
public:
RealSuiteDescription();
RealSuiteDescription( const char *argFile, unsigned argLine, const char *argSuiteName, List &argTests );
-
+
void initialize( const char *argFile, unsigned argLine, const char *argSuiteName, List &argTests );
const char *file() const;
@@ -64,17 +64,17 @@ namespace CxxTest
const TestDescription *firstTest() const;
SuiteDescription *next();
const SuiteDescription *next() const;
-
+
unsigned numTests() const;
const TestDescription &testDescription( unsigned i ) const;
void activateAllTests();
bool leaveOnly( const char *testName );
-
+
private:
RealSuiteDescription( const RealSuiteDescription & );
RealSuiteDescription &operator=( const RealSuiteDescription & );
-
+
const char *_file;
unsigned _line;
const char *_suiteName;
@@ -96,16 +96,16 @@ namespace CxxTest
const char *argSuiteName, TestSuite &argSuite,
List &argTests );
TestSuite *suite() const;
-
+
bool setUp();
bool tearDown();
-
+
private:
StaticSuiteDescription( const StaticSuiteDescription & );
StaticSuiteDescription &operator=( const StaticSuiteDescription & );
void doInitialize( TestSuite &argSuite );
-
+
TestSuite *_suite;
};
@@ -127,7 +127,7 @@ namespace CxxTest
private:
void doInitialize( unsigned argCreateLine, unsigned argDestroyLine );
};
-
+
template<class S>
class DynamicSuiteDescription : public CommonDynamicSuiteDescription
{
@@ -157,7 +157,7 @@ namespace CxxTest
bool setUp();
bool tearDown();
-
+
private:
S *realSuite() const { return *_suite; }
void setSuite( S *s ) { *_suite = s; }
@@ -166,7 +166,7 @@ namespace CxxTest
{
setSuite( S::createSuite() );
}
-
+
void destroySuite()
{
S *s = realSuite();
@@ -194,7 +194,7 @@ namespace CxxTest
{
if ( !_suite )
return true;
-
+
_TS_TRY {
_TSM_ASSERT_THROWS_NOTHING( file(), _destroyLine, "destroySuite() failed", destroySuite() );
}
@@ -202,7 +202,7 @@ namespace CxxTest
return true;
}
-
+
class RealWorldDescription : public WorldDescription
{
public:
@@ -215,7 +215,7 @@ namespace CxxTest
const SuiteDescription &suiteDescription( unsigned i ) const;
void activateAllTests();
bool leaveOnly( const char *suiteName, const char *testName = 0 );
-
+
bool setUp();
bool tearDown();
static void reportError( const char *message );
diff --git a/Testing/Tools/cxxtest/cxxtest/StdValueTraits.h b/Testing/Tools/cxxtest/cxxtest/StdValueTraits.h
index d0909608415be06df7169b29caf74868dbfa956e..24245afc31ca12d28b5098a2af8ee0fea207bb0a 100644
--- a/Testing/Tools/cxxtest/cxxtest/StdValueTraits.h
+++ b/Testing/Tools/cxxtest/cxxtest/StdValueTraits.h
@@ -44,7 +44,7 @@ namespace CxxTest
private:
CXXTEST_STD(string) _s;
};
-
+
//
// std::string
//
@@ -100,7 +100,7 @@ namespace CxxTest
s << "{}";
return;
}
-
+
s << "{ ";
while ( first != last ) {
s << TS_AS_STRING(*first);
@@ -118,7 +118,7 @@ namespace CxxTest
class ValueTraits< CXXTEST_STD(pair)<First, Second> > : public StdTraitsBase
{
public:
- ValueTraits( const CXXTEST_STD(pair)<First, Second> &p )
+ ValueTraits( const CXXTEST_STD(pair)<First, Second> &p )
{
*this << "<" << TS_AS_STRING( p.first ) << ", " << TS_AS_STRING( p.second ) << ">";
}
@@ -174,7 +174,7 @@ namespace CxxTest
{
dumpRange( *this, m.begin(), m.end() );
}
- };
+ };
//
// std::deque
diff --git a/Testing/Tools/cxxtest/cxxtest/StdioFilePrinter.h b/Testing/Tools/cxxtest/cxxtest/StdioFilePrinter.h
index 11eef1a19b4144021866cdacc387d6e44194263f..c82c6fa8c0f99017be6972ff7f0fb93debc64757 100644
--- a/Testing/Tools/cxxtest/cxxtest/StdioFilePrinter.h
+++ b/Testing/Tools/cxxtest/cxxtest/StdioFilePrinter.h
@@ -16,7 +16,7 @@
#include <cxxtest/ErrorFormatter.h>
#include <stdio.h>
-namespace CxxTest
+namespace CxxTest
{
class StdioFilePrinter : public ErrorFormatter
{
@@ -30,9 +30,9 @@ namespace CxxTest
{
Adapter( const Adapter & );
Adapter &operator=( const Adapter & );
-
+
FILE *_o;
-
+
public:
Adapter( FILE *o ) : _o(o) {}
void flush() { fflush( _o ); }
diff --git a/Testing/Tools/cxxtest/cxxtest/StdioPrinter.h b/Testing/Tools/cxxtest/cxxtest/StdioPrinter.h
index 5bf21e767b732daf3423ec56528553dc37f954b4..e1f9d09965026b666557f7b101ce2d96d3676b48 100644
--- a/Testing/Tools/cxxtest/cxxtest/StdioPrinter.h
+++ b/Testing/Tools/cxxtest/cxxtest/StdioPrinter.h
@@ -14,7 +14,7 @@
#include <cxxtest/StdioFilePrinter.h>
-namespace CxxTest
+namespace CxxTest
{
class StdioPrinter : public StdioFilePrinter
{
diff --git a/Testing/Tools/cxxtest/cxxtest/TeeListener.h b/Testing/Tools/cxxtest/cxxtest/TeeListener.h
index b8ff8641e34082ae38ce9c36874f88a1936d56a6..a0eddd363727db246b6ac0c572dda1b396d4bc61 100644
--- a/Testing/Tools/cxxtest/cxxtest/TeeListener.h
+++ b/Testing/Tools/cxxtest/cxxtest/TeeListener.h
@@ -49,7 +49,7 @@ namespace CxxTest
_first->enterSuite( d );
_second->enterSuite( d );
}
-
+
void enterTest( const TestDescription &d )
{
_first->enterTest( d );
@@ -61,31 +61,31 @@ namespace CxxTest
_first->enterRun( d );
_second->enterRun( d );
}
-
+
void trace( const char *file, unsigned line, const char *expression )
{
_first->trace( file, line, expression );
_second->trace( file, line, expression );
}
-
+
void warning( const char *file, unsigned line, const char *expression )
{
_first->warning( file, line, expression );
_second->warning( file, line, expression );
}
-
+
void failedTest( const char *file, unsigned line, const char *expression )
{
_first->failedTest( file, line, expression );
_second->failedTest( file, line, expression );
}
-
+
void failedAssert( const char *file, unsigned line, const char *expression )
{
_first->failedAssert( file, line, expression );
_second->failedAssert( file, line, expression );
}
-
+
void failedAssertEquals( const char *file, unsigned line,
const char *xStr, const char *yStr,
const char *x, const char *y )
@@ -102,7 +102,7 @@ namespace CxxTest
_first->failedAssertSameData( file, line, xStr, yStr, sizeStr, x, y, size );
_second->failedAssertSameData( file, line, xStr, yStr, sizeStr, x, y, size );
}
-
+
void failedAssertSameFiles( const char* file, unsigned line, const char* file1, const char* file2, const char* explanation)
{
_first->failedAssertSameFiles( file, line, file1, file2, explanation );
@@ -116,7 +116,7 @@ namespace CxxTest
_first->failedAssertDelta( file, line, xStr, yStr, dStr, x, y, d );
_second->failedAssertDelta( file, line, xStr, yStr, dStr, x, y, d );
}
-
+
void failedAssertDiffers( const char *file, unsigned line,
const char *xStr, const char *yStr,
const char *value )
@@ -124,7 +124,7 @@ namespace CxxTest
_first->failedAssertDiffers( file, line, xStr, yStr, value );
_second->failedAssertDiffers( file, line, xStr, yStr, value );
}
-
+
void failedAssertLessThan( const char *file, unsigned line,
const char *xStr, const char *yStr,
const char *x, const char *y )
@@ -132,7 +132,7 @@ namespace CxxTest
_first->failedAssertLessThan( file, line, xStr, yStr, x, y );
_second->failedAssertLessThan( file, line, xStr, yStr, x, y );
}
-
+
void failedAssertLessThanEquals( const char *file, unsigned line,
const char *xStr, const char *yStr,
const char *x, const char *y )
@@ -140,14 +140,14 @@ namespace CxxTest
_first->failedAssertLessThanEquals( file, line, xStr, yStr, x, y );
_second->failedAssertLessThanEquals( file, line, xStr, yStr, x, y );
}
-
+
void failedAssertPredicate( const char *file, unsigned line,
const char *predicate, const char *xStr, const char *x )
{
_first->failedAssertPredicate( file, line, predicate, xStr, x );
_second->failedAssertPredicate( file, line, predicate, xStr, x );
}
-
+
void failedAssertRelation( const char *file, unsigned line,
const char *relation, const char *xStr, const char *yStr,
const char *x, const char *y )
@@ -155,7 +155,7 @@ namespace CxxTest
_first->failedAssertRelation( file, line, relation, xStr, yStr, x, y );
_second->failedAssertRelation( file, line, relation, xStr, yStr, x, y );
}
-
+
void failedAssertThrows( const char *file, unsigned line,
const char *expression, const char *type,
bool otherThrown )
@@ -163,14 +163,14 @@ namespace CxxTest
_first->failedAssertThrows( file, line, expression, type, otherThrown );
_second->failedAssertThrows( file, line, expression, type, otherThrown );
}
-
+
void failedAssertThrowsNot( const char *file, unsigned line,
const char *expression )
{
_first->failedAssertThrowsNot( file, line, expression );
_second->failedAssertThrowsNot( file, line, expression );
}
-
+
void leaveRun( const TestDescription &d )
{
_first->leaveRun(d);
@@ -182,13 +182,13 @@ namespace CxxTest
_first->leaveTest(d);
_second->leaveTest(d);
}
-
+
void leaveSuite( const SuiteDescription &d )
{
_first->leaveSuite(d);
_second->leaveSuite(d);
}
-
+
void leaveWorld( const WorldDescription &d )
{
_first->leaveWorld(d);
diff --git a/Testing/Tools/cxxtest/cxxtest/TestListener.h b/Testing/Tools/cxxtest/cxxtest/TestListener.h
index 844f8bcd72d21ca8c7f0ad51c9cf8a9f12a7384e..bc04f93fc39dab03caf9e2ab7703f9ae5c72ef53 100644
--- a/Testing/Tools/cxxtest/cxxtest/TestListener.h
+++ b/Testing/Tools/cxxtest/cxxtest/TestListener.h
@@ -19,7 +19,7 @@ namespace CxxTest
TestListener() {}
virtual ~TestListener() {}
virtual void process_commandline(int& /*argc*/, char** /*argv*/) {}
-
+
virtual void enterWorld( const WorldDescription & /*desc*/ ) {}
virtual void enterSuite( const SuiteDescription & /*desc*/ ) {}
virtual void enterTest( const TestDescription & /*desc*/ ) {}
diff --git a/Testing/Tools/cxxtest/cxxtest/TestMain.h b/Testing/Tools/cxxtest/cxxtest/TestMain.h
index 42f50d24bac85983b224379afecba9d0dab46a77..2efad9f6168113255fcb86b8118d7204e02a104f 100644
--- a/Testing/Tools/cxxtest/cxxtest/TestMain.h
+++ b/Testing/Tools/cxxtest/cxxtest/TestMain.h
@@ -34,7 +34,7 @@ inline void print_help(const char* name)
template <class TesterT>
int Main(TesterT& tmp, int argc, char* argv[])
-{
+{
//
// Parse the command-line arguments. The default behavior is to run all tests
//
diff --git a/Testing/Tools/cxxtest/cxxtest/TestRunner.h b/Testing/Tools/cxxtest/cxxtest/TestRunner.h
index 7987c166a779b2dca17ec0cc8f22974baf8acfe1..49fe021e2a647785541bb81a8b920acb6e01156c 100644
--- a/Testing/Tools/cxxtest/cxxtest/TestRunner.h
+++ b/Testing/Tools/cxxtest/cxxtest/TestRunner.h
@@ -10,7 +10,7 @@
// TestRunner is the class that runs all the tests.
// To use it, create an object that implements the TestListener
// interface and call TestRunner::runAllTests( myListener );
-//
+//
#include <cxxtest/TestListener.h>
#include <cxxtest/RealDescriptions.h>
@@ -18,7 +18,7 @@
#include <cxxtest/TestTracker.h>
#include <string>
-namespace CxxTest
+namespace CxxTest
{
class TestRunner
{
@@ -37,14 +37,14 @@ namespace CxxTest
listener->warning( __FILE__, __LINE__, "Deprecated; Use runAllTests( TestListener & )" );
runAllTests( *listener );
}
- }
-
+ }
+
private:
void runWorld()
{
RealWorldDescription wd;
WorldGuard sg;
-
+
tracker().enterWorld( wd );
if ( wd.setUp() ) {
for ( SuiteDescription *sd = wd.firstSuite(); sd; sd = sd->next() )
@@ -67,16 +67,16 @@ namespace CxxTest
if (keepSuite)
runSuite( *sd );
}
-
+
wd.tearDown();
}
tracker().leaveWorld( wd );
}
-
+
void runSuite( SuiteDescription &sd )
{
StateGuard sg;
-
+
tracker().enterSuite( sd );
if ( sd.setUp() ) {
for ( TestDescription *td = sd.firstTest(); td; td = td->next() )
@@ -91,7 +91,7 @@ namespace CxxTest
void runTest( TestDescription &td )
{
StateGuard sg;
-
+
tracker().enterTest( td );
if ( td.setUp() )
{
@@ -102,14 +102,14 @@ namespace CxxTest
}
tracker().leaveTest( td );
}
-
+
class StateGuard
{
#ifdef _CXXTEST_HAVE_EH
bool _abortTestOnFail;
#endif // _CXXTEST_HAVE_EH
unsigned _maxDumpSize;
-
+
public:
StateGuard()
{
@@ -118,7 +118,7 @@ namespace CxxTest
#endif // _CXXTEST_HAVE_EH
_maxDumpSize = maxDumpSize();
}
-
+
~StateGuard()
{
#ifdef _CXXTEST_HAVE_EH
diff --git a/Testing/Tools/cxxtest/cxxtest/TestSuite.cpp b/Testing/Tools/cxxtest/cxxtest/TestSuite.cpp
index cf4d59d061a7029547f3d84433318275b9231d68..51eca238f083d90bc443faf6ae35c9d3a1d953aa 100644
--- a/Testing/Tools/cxxtest/cxxtest/TestSuite.cpp
+++ b/Testing/Tools/cxxtest/cxxtest/TestSuite.cpp
@@ -32,7 +32,7 @@ namespace CxxTest
{
currentAbortTestOnFail = value;
}
-
+
void doAbortTest()
{
# if defined(_CXXTEST_HAVE_EH)
@@ -50,7 +50,7 @@ namespace CxxTest
{
return currentMaxDumpSize;
}
-
+
void setMaxDumpSize( unsigned value )
{
currentMaxDumpSize = value;
@@ -89,7 +89,7 @@ namespace CxxTest
{
if ( size == 0 )
return true;
-
+
if ( x == y )
return true;
@@ -225,7 +225,7 @@ namespace CxxTest
tracker().failedTest( file, line, exception );
if ( message )
tracker().failedTest( file, line, message );
-
+
tracker().failedAssertThrows( file, line, expr, type, otherThrown );
TS_ABORT();
}
@@ -238,7 +238,7 @@ namespace CxxTest
tracker().failedTest( file, line, exception );
if ( message )
tracker().failedTest( file, line, message );
-
+
tracker().failedAssertThrowsNot( file, line, expression );
TS_ABORT();
}
diff --git a/Testing/Tools/cxxtest/cxxtest/TestSuite.h b/Testing/Tools/cxxtest/cxxtest/TestSuite.h
index 4dc749974efbe35441aeed49876e88a067cca605..598b95cda8b8e752bd51706968fbc0d2f5e5af09 100644
--- a/Testing/Tools/cxxtest/cxxtest/TestSuite.h
+++ b/Testing/Tools/cxxtest/cxxtest/TestSuite.h
@@ -25,11 +25,11 @@ namespace CxxTest
virtual void tearDown();
virtual bool skipTests();
};
-
+
class AbortTest {};
void doAbortTest();
# define TS_ABORT() CxxTest::doAbortTest()
-
+
bool abortTestOnFail();
void setAbortTestOnFail( bool value = CXXTEST_DEFAULT_ABORT );
@@ -151,7 +151,7 @@ namespace CxxTest
template<class X, class Y, class R>
void doAssertRelation( const char *file, unsigned line,
- const char *rExpr, const R &r,
+ const char *rExpr, const R &r,
const char *xExpr, X x,
const char *yExpr, Y y,
const char *message )
@@ -164,12 +164,12 @@ namespace CxxTest
}
}
- // An indirection template so the compiler can determine what type
+ // An indirection template so the compiler can determine what type
// "X +/- D" should be
template<class X, class Y>
bool delta_le_helper( X x, Y y )
- {
- return lessThanEquals<X,Y>::test(x,y);
+ {
+ return lessThanEquals<X,Y>::test(x,y);
}
template<class X, class Y, class D>
@@ -191,7 +191,7 @@ namespace CxxTest
if ( !delta<X,Y,D>::test( x, y, d ) ) {
if ( message )
tracker().failedTest( file, line, message );
-
+
tracker().failedAssertDelta( file, line, xExpr, yExpr, dExpr,
TS_AS_STRING(x), TS_AS_STRING(y), TS_AS_STRING(d) );
TS_ABORT();
@@ -203,7 +203,7 @@ namespace CxxTest
bool otherThrown,
const char *message,
const char *exception = 0 );
-
+
void doFailAssertThrowsNot( const char *file, unsigned line,
const char *expression, const char *message,
const char *exception = 0 );
@@ -258,23 +258,23 @@ namespace CxxTest
// TS_ASSERT
# define ___ETS_ASSERT(f,l,e,m) { if ( !(e) ) CxxTest::doFailAssert( (f), (l), #e, (m) ); }
# define ___TS_ASSERT(f,l,e,m) { _TS_TRY { ___ETS_ASSERT(f,l,e,m); } __TS_CATCH(f,l) }
-
+
# define _ETS_ASSERT(f,l,e) ___ETS_ASSERT(f,l,e,0)
# define _TS_ASSERT(f,l,e) ___TS_ASSERT(f,l,e,0)
-
+
# define ETS_ASSERT(e) _ETS_ASSERT(__FILE__,__LINE__,e)
# define TS_ASSERT(e) _TS_ASSERT(__FILE__,__LINE__,e)
-
+
# define _ETSM_ASSERT(f,l,m,e) ___ETS_ASSERT(f,l,e,TS_AS_STRING(m) )
# define _TSM_ASSERT(f,l,m,e) ___TS_ASSERT(f,l,e,TS_AS_STRING(m) )
# define ETSM_ASSERT(m,e) _ETSM_ASSERT(__FILE__,__LINE__,m,e)
# define TSM_ASSERT(m,e) _TSM_ASSERT(__FILE__,__LINE__,m,e)
-
+
// TS_ASSERT_EQUALS
# define ___ETS_ASSERT_EQUALS(f,l,x,y,m) CxxTest::doAssertEquals( (f), (l), #x, (x), #y, (y), (m) )
# define ___TS_ASSERT_EQUALS(f,l,x,y,m) { _TS_TRY { ___ETS_ASSERT_EQUALS(f,l,x,y,m); } __TS_CATCH(f,l) }
-
+
# define _ETS_ASSERT_EQUALS(f,l,x,y) ___ETS_ASSERT_EQUALS(f,l,x,y,0)
# define _TS_ASSERT_EQUALS(f,l,x,y) ___TS_ASSERT_EQUALS(f,l,x,y,0)
@@ -290,7 +290,7 @@ namespace CxxTest
// TS_ASSERT_SAME_DATA
# define ___ETS_ASSERT_SAME_DATA(f,l,x,y,s,m) CxxTest::doAssertSameData( (f), (l), #x, (x), #y, (y), #s, (s), (m) )
# define ___TS_ASSERT_SAME_DATA(f,l,x,y,s,m) { _TS_TRY { ___ETS_ASSERT_SAME_DATA(f,l,x,y,s,m); } __TS_CATCH(f,l) }
-
+
# define _ETS_ASSERT_SAME_DATA(f,l,x,y,s) ___ETS_ASSERT_SAME_DATA(f,l,x,y,s,0)
# define _TS_ASSERT_SAME_DATA(f,l,x,y,s) ___TS_ASSERT_SAME_DATA(f,l,x,y,s,0)
@@ -392,7 +392,7 @@ namespace CxxTest
// TS_ASSERT_DELTA
# define ___ETS_ASSERT_DELTA(f,l,x,y,d,m) CxxTest::doAssertDelta( (f), (l), #x, (x), #y, (y), #d, (d), (m) )
# define ___TS_ASSERT_DELTA(f,l,x,y,d,m) { _TS_TRY { ___ETS_ASSERT_DELTA(f,l,x,y,d,m); } __TS_CATCH(f,l) }
-
+
# define _ETS_ASSERT_DELTA(f,l,x,y,d) ___ETS_ASSERT_DELTA(f,l,x,y,d,0)
# define _TS_ASSERT_DELTA(f,l,x,y,d) ___TS_ASSERT_DELTA(f,l,x,y,d,0)
@@ -408,7 +408,7 @@ namespace CxxTest
// TS_ASSERT_SAME_FILES
# define ___ETS_ASSERT_SAME_FILES(f,l,x,y,m) CxxTest::doAssertSameFiles( (f), (l), (x), (y), (m) )
# define ___TS_ASSERT_SAME_FILES(f,l,x,y,m) { _TS_TRY { ___ETS_ASSERT_SAME_FILES(f,l,x,y,m); } __TS_CATCH(f,l) }
-
+
# define _ETS_ASSERT_SAME_FILES(f,l,x,y) ___ETS_ASSERT_SAME_FILES(f,l,x,y,0)
# define _TS_ASSERT_SAME_FILES(f,l,x,y) ___TS_ASSERT_SAME_FILES(f,l,x,y,0)
@@ -570,7 +570,7 @@ namespace CxxTest
CXXTEST_SMALL_BIG( char, long );
CXXTEST_SMALL_BIG( short, long );
CXXTEST_SMALL_BIG( int, long );
-
+
# ifdef _CXXTEST_LONGLONG
CXXTEST_SMALL_BIG( char, _CXXTEST_LONGLONG );
CXXTEST_SMALL_BIG( short, _CXXTEST_LONGLONG );
diff --git a/Testing/Tools/cxxtest/cxxtest/TestTracker.cpp b/Testing/Tools/cxxtest/cxxtest/TestTracker.cpp
index df794dc01ec79682566ba203133bd9063dec10d2..bbf4f75e59bda0f36fe09fa7ce5fd66f85209e7d 100644
--- a/Testing/Tools/cxxtest/cxxtest/TestTracker.cpp
+++ b/Testing/Tools/cxxtest/cxxtest/TestTracker.cpp
@@ -20,7 +20,7 @@ namespace CxxTest
TestTracker::~TestTracker()
{
}
-
+
TestTracker & TestTracker::tracker()
{
static TestTracker theTracker;
@@ -44,27 +44,27 @@ namespace CxxTest
{
return d ? d : &dummyTest();
}
-
+
const SuiteDescription *TestTracker::fixSuite( const SuiteDescription *d ) const
{
return d ? d : &dummySuite();
}
-
+
const WorldDescription *TestTracker::fixWorld( const WorldDescription *d ) const
{
return d ? d : &dummyWorld();
}
-
+
const TestDescription &TestTracker::dummyTest() const
{
return dummySuite().testDescription(0);
}
-
+
const SuiteDescription &TestTracker::dummySuite() const
{
return dummyWorld().suiteDescription(0);
}
-
+
const WorldDescription &TestTracker::dummyWorld() const
{
return _dummyWorld;
@@ -88,7 +88,7 @@ namespace CxxTest
_testFailedAsserts = _suiteFailedTests = 0;
_l->enterSuite(sd);
}
-
+
void TestTracker::enterTest( const TestDescription &td )
{
setTest( &td );
@@ -139,7 +139,7 @@ namespace CxxTest
countFailure();
_l->failedTest( file, line, expression );
}
-
+
void TestTracker::failedAssert( const char *file, unsigned line, const char *expression )
{
countFailure();
@@ -170,7 +170,7 @@ namespace CxxTest
countFailure();
_l->failedAssertDelta( file, line, xStr, yStr, dStr, x, y, d );
}
-
+
void TestTracker::failedAssertDiffers( const char *file, unsigned line,
const char *xStr, const char *yStr,
const char *value )
@@ -178,7 +178,7 @@ namespace CxxTest
countFailure();
_l->failedAssertDiffers( file, line, xStr, yStr, value );
}
-
+
void TestTracker::failedAssertLessThan( const char *file, unsigned line,
const char *xStr, const char *yStr,
const char *x, const char *y )
@@ -201,7 +201,7 @@ namespace CxxTest
countFailure();
_l->failedAssertPredicate( file, line, predicate, xStr, x );
}
-
+
void TestTracker::failedAssertRelation( const char *file, unsigned line,
const char *relation, const char *xStr, const char *yStr,
const char *x, const char *y )
@@ -209,7 +209,7 @@ namespace CxxTest
countFailure();
_l->failedAssertRelation( file, line, relation, xStr, yStr, x, y );
}
-
+
void TestTracker::failedAssertThrows( const char *file, unsigned line,
const char *expression, const char *type,
bool otherThrown )
@@ -217,7 +217,7 @@ namespace CxxTest
countFailure();
_l->failedAssertThrows( file, line, expression, type, otherThrown );
}
-
+
void TestTracker::failedAssertThrowsNot( const char *file, unsigned line, const char *expression )
{
countFailure();
diff --git a/Testing/Tools/cxxtest/cxxtest/TestTracker.h b/Testing/Tools/cxxtest/cxxtest/TestTracker.h
index 9e3304a3097d6b2ae2e9f67d15776be14a3eea9e..3040641849b83ce4dca77ff39676c717161d5eec 100644
--- a/Testing/Tools/cxxtest/cxxtest/TestTracker.h
+++ b/Testing/Tools/cxxtest/cxxtest/TestTracker.h
@@ -12,12 +12,12 @@
namespace CxxTest
{
class TestListener;
-
+
class TestTracker : public TestListener
{
public:
virtual ~TestTracker();
-
+
static TestTracker &tracker();
static bool print_tracing;
static bool include_performance;
@@ -29,11 +29,11 @@ namespace CxxTest
const TestDescription &test() const { return *_test; }
const SuiteDescription &suite() const { return *_suite; }
const WorldDescription &world() const { return *_world; }
-
+
bool testFailed() const { return (testFailedAsserts() > 0); }
bool suiteFailed() const { return (suiteFailedTests() > 0); }
bool worldFailed() const { return (failedSuites() > 0); }
-
+
unsigned warnings() const { return _warnings; }
unsigned failedTests() const { return _failedTests; }
unsigned testFailedAsserts() const { return _testFailedAsserts; }
@@ -81,7 +81,7 @@ namespace CxxTest
bool otherThrown );
void failedAssertThrowsNot( const char *file, unsigned line, const char *expression );
void failedAssertSameFiles( const char* file, unsigned line, const char* file1, const char* file2, const char* explanation);
-
+
private:
TestTracker( const TestTracker & );
TestTracker &operator=( const TestTracker & );
@@ -98,7 +98,7 @@ namespace CxxTest
const TestDescription &dummyTest() const;
const SuiteDescription &dummySuite() const;
const WorldDescription &dummyWorld() const;
-
+
void setWorld( const WorldDescription *w );
void setSuite( const SuiteDescription *s );
void setTest( const TestDescription *t );
@@ -106,7 +106,7 @@ namespace CxxTest
void countFailure();
friend class TestRunner;
-
+
TestTracker();
void initialize();
void setListener( TestListener *l );
diff --git a/Testing/Tools/cxxtest/cxxtest/ValueTraits.cpp b/Testing/Tools/cxxtest/cxxtest/ValueTraits.cpp
index 83793913a9a74989c6f9f26f6e87f1136ed60d19..78331409aad673bead8cd1c342eea5df10df703d 100644
--- a/Testing/Tools/cxxtest/cxxtest/ValueTraits.cpp
+++ b/Testing/Tools/cxxtest/cxxtest/ValueTraits.cpp
@@ -9,12 +9,12 @@
#include <cxxtest/ValueTraits.h>
-namespace CxxTest
+namespace CxxTest
{
//
// Non-inline functions from ValueTraits.h
//
-
+
char digitToChar( unsigned digit )
{
if ( digit < 10 )
@@ -32,7 +32,7 @@ namespace CxxTest
asHex[2] = '\0';
return asHex;
}
-
+
char *copyString( char *dst, const char *src )
{
while ( (*dst = *src) != '\0' ) {
@@ -84,13 +84,13 @@ namespace CxxTest
{
return charToString( (unsigned long)(unsigned char)c, s );
}
-
+
char *bytesToString( const unsigned char *bytes, unsigned numBytes, unsigned maxBytes, char *s )
{
bool truncate = (numBytes > maxBytes);
if ( truncate )
numBytes = maxBytes;
-
+
s = copyString( s, "{ " );
for ( unsigned i = 0; i < numBytes; ++ i, ++ bytes )
s = copyString( copyString( s, byteToHex( *bytes ) ), " " );
@@ -129,7 +129,7 @@ namespace CxxTest
s = copyString( s, "E" );
s = numberToString( requiredDigitsOnLeft( t ) - 1, s );
}
-
+
void ValueTraits<const double>::normalNumber( double t )
{
char *s = doNegative( t );
diff --git a/Testing/Tools/cxxtest/cxxtest/ValueTraits.h b/Testing/Tools/cxxtest/cxxtest/ValueTraits.h
index dcb24cb432b9d44e59368e770dbeef1e9b04b164..832630e2ba0723659e314409e275ef56d9c547a0 100644
--- a/Testing/Tools/cxxtest/cxxtest/ValueTraits.h
+++ b/Testing/Tools/cxxtest/cxxtest/ValueTraits.h
@@ -9,7 +9,7 @@
//
// ValueTraits are used by CxxTest to convert arbitrary
// values used in TS_ASSERT_EQUALS() to a string representation.
-//
+//
// This header file contains value traits for builtin integral types.
// To declare value traits for new types you should instantiate the class
// ValueTraits<YourClass>.
@@ -29,7 +29,7 @@
#pragma warning disable 191
#endif
-namespace CxxTest
+namespace CxxTest
{
//
// This is how we use the value traits
@@ -86,11 +86,11 @@ namespace CxxTest
{
enum { MAX_BYTES = 8 };
char _asString[sizeof("{ ") + sizeof("XX ") * MAX_BYTES + sizeof("... }")];
-
+
public:
ValueTraits( const T &t ) { bytesToString( (const unsigned char *)&t, sizeof(T), MAX_BYTES, _asString ); }
const char *asString( void ) const { return _asString; }
- };
+ };
//
// traits( T t )
@@ -123,7 +123,7 @@ namespace CxxTest
# else // !_CXXTEST_NO_COPY_CONST
# define CXXTEST_COPY_CONST_TRAITS(CXXTEST_CLASS) CXXTEST_COPY_TRAITS(CXXTEST_CLASS, const CXXTEST_CLASS)
# endif // _CXXTEST_NO_COPY_CONST
-
+
//
// Avoid compiler warnings about unsigned types always >= 0
//
@@ -160,7 +160,7 @@ namespace CxxTest
*s++ = '-';
n = abs(n);
}
-
+
N digit = 1;
int counter = 0; // Added to avoid infinite loops for N = infinity
while ( digit <= (n / base) && (counter++ < 100))
@@ -179,7 +179,7 @@ namespace CxxTest
// All the specific ValueTraits follow.
// You can #define CXXTEST_USER_VALUE_TRAITS if you don't want them
//
-
+
#ifndef CXXTEST_USER_VALUE_TRAITS
//
// ValueTraits: const char * const &
@@ -190,7 +190,7 @@ namespace CxxTest
{
ValueTraits &operator=( const ValueTraits & );
const char *_asString;
-
+
public:
ValueTraits( const char * const &value ) : _asString( value ) {}
ValueTraits( const ValueTraits &other ) : _asString( other._asString ) {}
@@ -202,12 +202,12 @@ namespace CxxTest
//
// ValueTraits: bool
- //
+ //
CXXTEST_TEMPLATE_INSTANTIATION
class ValueTraits<const bool>
{
bool _value;
-
+
public:
ValueTraits( const bool value ) : _value( value ) {}
const char *asString( void ) const { return _value ? "true" : "false"; }
@@ -261,7 +261,7 @@ namespace CxxTest
};
CXXTEST_COPY_CONST_TRAITS( signed long int );
-
+
//
// ValueTraits: unsigned long
//
@@ -276,17 +276,17 @@ namespace CxxTest
};
CXXTEST_COPY_CONST_TRAITS( unsigned long int );
-
+
//
// All decimals are the same as the long version
//
-
+
CXXTEST_COPY_TRAITS( const signed int, const signed long int );
CXXTEST_COPY_TRAITS( const unsigned int, const unsigned long int );
CXXTEST_COPY_TRAITS( const signed short int, const signed long int );
CXXTEST_COPY_TRAITS( const unsigned short int, const unsigned long int );
CXXTEST_COPY_TRAITS( const unsigned char, const unsigned long int );
-
+
CXXTEST_COPY_CONST_TRAITS( signed int );
CXXTEST_COPY_CONST_TRAITS( unsigned int );
CXXTEST_COPY_CONST_TRAITS( signed short int );
@@ -322,7 +322,7 @@ namespace CxxTest
class ValueTraits<const double>
{
public:
- ValueTraits( double t )
+ ValueTraits( double t )
{
( requiredDigitsOnLeft( t ) > MAX_DIGITS_ON_LEFT ) ?
hugeNumber( t ) :
@@ -330,7 +330,7 @@ namespace CxxTest
}
const char *asString( void ) const { return _asString; }
-
+
private:
enum { MAX_DIGITS_ON_LEFT = 24, DIGITS_ON_RIGHT = 10, BASE = 10 };
char _asString[1 + MAX_DIGITS_ON_LEFT + 1 + DIGITS_ON_RIGHT + 1];
diff --git a/Testing/Tools/cxxtest/cxxtest/Win32Gui.h b/Testing/Tools/cxxtest/cxxtest/Win32Gui.h
index 25fba524f6f6a159cc4a5f172dcc8c00f6c5a134..e8515fd4f0cb0b118abb0858b1a3960d74c911a9 100644
--- a/Testing/Tools/cxxtest/cxxtest/Win32Gui.h
+++ b/Testing/Tools/cxxtest/cxxtest/Win32Gui.h
@@ -36,7 +36,7 @@ namespace CxxTest
{
parseCommandLine( argc, argv );
}
-
+
void enterWorld( const WorldDescription &wd )
{
getTotalTests( wd );
@@ -66,7 +66,7 @@ namespace CxxTest
setIcon( IDI_WARNING );
getTotalTests();
}
-
+
void redBar()
{
if ( _startMinimized )
@@ -95,11 +95,11 @@ namespace CxxTest
HANDLE _canStartTests;
unsigned _numTotalTests, _testsDone;
char _strTotalTests[WorldDescription::MAX_STRLEN_TOTAL_TESTS];
- enum {
+ enum {
STATUS_SUITE_NAME, STATUS_SUITE_TIME,
STATUS_TEST_NAME, STATUS_TEST_TIME,
STATUS_TESTS_DONE, STATUS_WORLD_TIME,
- STATUS_TOTAL_PARTS
+ STATUS_TOTAL_PARTS
};
int _statusWidths[STATUS_TOTAL_PARTS];
unsigned _statusOffsets[STATUS_TOTAL_PARTS];
@@ -112,7 +112,7 @@ namespace CxxTest
{
_startMinimized = _keep = false;
_title = argv[0];
-
+
for ( int i = 1; i < argc; ++ i )
{
if ( !lstrcmpA( argv[i], "-minimized" ) )
@@ -123,7 +123,7 @@ namespace CxxTest
_title = argv[++i];
}
}
-
+
void getTotalTests()
{
getTotalTests( tracker().world() );
@@ -192,7 +192,7 @@ namespace CxxTest
HMODULE dll = LoadLibraryA( "comctl32.dll" );
if ( !dll )
return;
-
+
typedef void (WINAPI *FUNC)( void );
FUNC func = (FUNC)GetProcAddress( dll, "InitCommonControls" );
if ( !func )
@@ -399,7 +399,7 @@ namespace CxxTest
progressBarMessage( PBM_SETBARCOLOR, 0, RGB( red, green, blue ) );
}
#else // !PBM_SETBARCOLOR
- void setColor( BYTE, BYTE, BYTE )
+ void setColor( BYTE, BYTE, BYTE )
{
}
#endif // PBM_SETBARCOLOR
@@ -505,7 +505,7 @@ namespace CxxTest
{
setRatios( 0, 0, 0, 0, 1, 1 );
resizeControls();
-
+
const char *tests = (_numTotalTests == 1) ? "test" : "tests";
if ( tracker().failedTests() )
wsprintfA( _statusTestsDone, "Failed %u of %s %s",
diff --git a/Testing/Tools/cxxtest/cxxtest/WrappedTestSuite.h b/Testing/Tools/cxxtest/cxxtest/WrappedTestSuite.h
index 9c56687c7f2419067bfd688d1cbea7aa9b4d4d0c..4e8b9a99244ec1cb5d1baf7389b5214bbcc743b8 100644
--- a/Testing/Tools/cxxtest/cxxtest/WrappedTestSuite.h
+++ b/Testing/Tools/cxxtest/cxxtest/WrappedTestSuite.h
@@ -7,7 +7,7 @@
#pragma once
/**
- * This file is present so that the TestSuite.h header can be included in a precompiled
+ * This file is present so that the TestSuite.h header can be included in a precompiled
* header file and still have exception handling and the STL
*/
diff --git a/Testing/Tools/cxxtest/cxxtest/X11Gui.h b/Testing/Tools/cxxtest/cxxtest/X11Gui.h
index ed191c82359f3e441b7dc60d0a7e65fdcc3ecae6..36ea18e27eb33290671f0cf2e378117d8dc48883 100644
--- a/Testing/Tools/cxxtest/cxxtest/X11Gui.h
+++ b/Testing/Tools/cxxtest/cxxtest/X11Gui.h
@@ -8,7 +8,7 @@
//
// X11Gui displays a simple progress bar using X11
-//
+//
// It accepts the following command-line arguments:
// -title <title> - Sets the application title
// -fn or -font <font> - Sets the font
@@ -34,7 +34,7 @@ namespace CxxTest
{
parseCommandLine( argc, argv );
}
-
+
void enterWorld( const WorldDescription &wd )
{
openDisplay();
@@ -49,7 +49,7 @@ namespace CxxTest
processEvents();
}
}
-
+
void guiEnterTest( const char *suiteName, const char *testName )
{
if ( _display ) {
@@ -58,7 +58,7 @@ namespace CxxTest
redraw();
}
}
-
+
void yellowBar()
{
if ( _display ) {
@@ -153,7 +153,7 @@ namespace CxxTest
XAllocColor( _display, _colormap, &color );
return color.pixel;
}
-
+
void createWindow()
{
_window = XCreateSimpleWindow( _display, RootWindow( _display, 0 ), 0, 0, 1, 1, 0, 0, _background );
@@ -223,7 +223,7 @@ namespace CxxTest
void centerWindow()
{
XMapWindow( _display, _window );
-
+
Screen *screen = XDefaultScreenOfDisplay( _display );
int screenWidth = WidthOfScreen( screen );
int screenHeight = HeightOfScreen( screen );
@@ -232,14 +232,14 @@ namespace CxxTest
_width = (screenWidth * 4) / 5;
_height = screenHeight / 14;
-
+
XMoveResizeWindow( _display, _window, xCenter - (_width / 2), yCenter - (_height / 2), _width, _height );
}
void processEvents()
{
redraw();
-
+
XEvent event;
while( XCheckMaskEvent( _display, _eventMask, &event ) )
redraw();
@@ -295,7 +295,7 @@ namespace CxxTest
void drawPercentage()
{
XSetForeground( _display, _gc, _foreground );
-
+
char str[sizeof("1000000000 of ") + sizeof(_strTotalTests) + sizeof(" (100%)")];
sprintf( str, "%u of %s (%u%%)", _testsDone, _strTotalTests, (_testsDone * 100) / _numTotalTests );
unsigned len = strlen( str );
diff --git a/Testing/Tools/cxxtest/cxxtest/XUnitPrinter.h b/Testing/Tools/cxxtest/cxxtest/XUnitPrinter.h
index f703db3a32b2c4f550cd79daf00b3b0d32c0162d..42567288c6f8cb4fbe7d673fb62523c9f727da63 100644
--- a/Testing/Tools/cxxtest/cxxtest/XUnitPrinter.h
+++ b/Testing/Tools/cxxtest/cxxtest/XUnitPrinter.h
@@ -16,7 +16,7 @@ namespace CxxTest
XmlPrinter xml_printer;
ErrorPrinter error_printer;
-
+
XUnitPrinter( CXXTEST_STD(ostream) &o = CXXTEST_STD(cout) )
: xml_printer(o)
{
diff --git a/Testing/Tools/cxxtest/cxxtest/YesNoRunner.h b/Testing/Tools/cxxtest/cxxtest/YesNoRunner.h
index cc3da7179c9998937f1933f8a3e3a0cd4a906ac0..bf3118bf809ce199f714df7a81037387806ba8ff 100644
--- a/Testing/Tools/cxxtest/cxxtest/YesNoRunner.h
+++ b/Testing/Tools/cxxtest/cxxtest/YesNoRunner.h
@@ -14,7 +14,7 @@
#include <cxxtest/TestRunner.h>
#include <cxxtest/TestListener.h>
-namespace CxxTest
+namespace CxxTest
{
class YesNoRunner : public TestListener
{
@@ -22,7 +22,7 @@ namespace CxxTest
YesNoRunner()
{
}
-
+
int run()
{
TestRunner::runAllTests( *this );
diff --git a/Testing/Tools/cxxtest/docs/guide.texi b/Testing/Tools/cxxtest/docs/guide.texi
index 9b29ff1bac9f32377c01175baefa418fb77fcbe8..7a563098e5b3856653f39a310a3a19eed5d9f154 100644
--- a/Testing/Tools/cxxtest/docs/guide.texi
+++ b/Testing/Tools/cxxtest/docs/guide.texi
@@ -87,7 +87,7 @@
@macro screenshot{name}
@tex
@ifnum@pdftexversion>13
- @pdfximage width 0.6@pdfpagewidth{\name\.png}@pdfrefximage@pdflastximage
+ @pdfximage width 0.6@pdfpagewidth{\name\.png}@pdfrefximage@pdflastximage
@else
@pdfimage width 0.6@pdfpagewidth{\name\.png}
@fi
@@ -163,7 +163,7 @@ Here's a simple step-by-step guide:
@enumerate
-@item
+@item
Tests are organized into ``Test Suites''.
Test suites are written in header files.
@@ -176,7 +176,7 @@ Tests are organized into ``Test Suites''.
// MyTestSuite.h
#include <cxxtest/TestSuite.h>
-class MyTestSuite : public CxxTest::TestSuite
+class MyTestSuite : public CxxTest::TestSuite
{
public:
void testAddition( void )
@@ -247,7 +247,7 @@ We will add a failing test to the previous example:
// MyTestSuite.h
#include <cxxtest/TestSuite.h>
-class MyTestSuite : public CxxTest::TestSuite
+class MyTestSuite : public CxxTest::TestSuite
{
public:
void testAddition( void )
@@ -286,8 +286,8 @@ Fixing the bug is left as an exercise to the reader.
your compiler, OS and environment, but try the following pointers:
@itemize @bullet
-@item
-Under Windows with Visual C++, run @command{python cxxtestgen @w{-o runner.cpp}
+@item
+Under Windows with Visual C++, run @command{python cxxtestgen @w{-o runner.cpp}
@w{@emph{--gui=Win32Gui}} MyTestSuite.h}.
@item
@@ -588,7 +588,7 @@ These assertions are used to test whether an expression throws an exception.
@code{TS_ASSERT_THROWS} is used when you want to verify the type of exception
thrown, and @code{TS_ASSERT_THROWS_ANYTHING} is used to just make sure something
is thrown. As you might have guessed, @code{TS_ASSERT_THROWS_NOTHING} asserts
-that nothing is thrown.
+that nothing is thrown.
@addedIn{3.10.0}@code{TS_ASSERT_THROWS_EQUALS} checks the type of the
exception as in @code{TS_ASSERT_THROWS} then allows you to compare two
@@ -606,9 +606,9 @@ void testFunctionsWhichThrowExceptions( void )
TS_ASSERT_THROWS( checkInput(-11), std::runtime_error );
TS_ASSERT_THROWS_ANYTHING( thirdPartyFunction() );
- TS_ASSERT_THROWS_EQUALS( validate(), const std::exception &e,
+ TS_ASSERT_THROWS_EQUALS( validate(), const std::exception &e,
e.what(), "Invalid value" );
- TS_ASSERT_THROWS_ASSERT( validate(), const Error &e,
+ TS_ASSERT_THROWS_ASSERT( validate(), const Error &e,
TS_ASSERT_DIFFERS( e.code(), SUCCESS ) );
}
@end verbatim
@@ -633,7 +633,7 @@ void testToDoList( void )
@end verbatim
@end smallexample
-In the GUI, @code{TS_WARN} sets the bar color to yellow (unless it was
+In the GUI, @code{TS_WARN} sets the bar color to yellow (unless it was
already red).
@addedIn{3.9.0}@code{TS_TRACE} is the same, except that it
@@ -655,7 +655,7 @@ void testInterestingThrower()
TS_ASSERT_EQUALS( foo(2), 4 );
// More elaborate way:
- try { ETS_ASSERT_EQUALS( foo(2), 4 ); }
+ try { ETS_ASSERT_EQUALS( foo(2), 4 ); }
catch( const BadFoo &e ) { TS_FAIL( e.bar() ); }
}
@end verbatim
@@ -730,7 +730,7 @@ after each test.
@smallexample
@verbatim
-class TestFileOps : public CxxTest::TestSuite
+class TestFileOps : public CxxTest::TestSuite
{
public:
void setUp() { mkdir( "playground" ); }
@@ -781,7 +781,7 @@ For extra points, make the build tool run the tests automatically.
@subsection Actually doing it
-Unfortunately, there are way too many different build tools and IDE's for me
+Unfortunately, there are way too many different build tools and IDE's for me
to give ways to use CxxTest with all of them.
I will try to outline the usage for some cases.
@@ -818,7 +818,7 @@ runner.cpp: SimpleTest.h ComplicatedTest.h
@subsubsection Using Cons
-@uref{http://dsmit.com/cons/, Cons} is a powerful and
+@uref{http://dsmit.com/cons/, Cons} is a powerful and
versatile make replacement which uses Perl scripts instead of Makefiles.
See @file{sample/Construct} in the CxxTest distribution for an example of building CxxTest test runners
@@ -855,7 +855,7 @@ Unit testing for device drivers?! Why not?
And besides, the @file{build} utility can also be used to build
user-mode application.
-To use CxxTest with the @file{build} utility,
+To use CxxTest with the @file{build} utility,
you add the generated tests file as an extra dependency
using the @code{NTBUILDTARGET0} macro and the @file{Makefile.inc}
file.
@@ -1074,7 +1074,7 @@ For example, the following code
@verbatim
#include <cxxtest/TestSuite.h>
-class TestMyData : public CxxTest::TestSuite
+class TestMyData : public CxxTest::TestSuite
{
public:
struct Data
@@ -1130,7 +1130,7 @@ string. You can use this example as a possible skeleton:
@smallexample
@verbatim
-class MyClass
+class MyClass
{
int _value;
@@ -1152,10 +1152,10 @@ public:
#include <cxxtest/ValueTraits.h>
#include <stdio.h>
-namespace CxxTest
+namespace CxxTest
{
CXXTEST_TEMPLATE_INSTANTIATION
- class ValueTraits<MyClass>
+ class ValueTraits<MyClass>
{
char _s[256];
@@ -1188,7 +1188,7 @@ public:
// CxxTest requires a copy constructor
TMyClass( const TMyClass<T> &other ) : _value( other._value ) {}
-
+
// If you want to use TS_ASSERT_EQUALS
bool operator== ( const TMyClass<T> &other ) const { return _value == other._value; }
};
@@ -1198,15 +1198,15 @@ public:
#include <typeinfo>
#include <sstream>
-namespace CxxTest
+namespace CxxTest
{
template<class T>
- class ValueTraits< TMyClass<T> >
+ class ValueTraits< TMyClass<T> >
{
std::ostringstream _s;
public:
- ValueTraits( const TMyClass<T> &t )
+ ValueTraits( const TMyClass<T> &t )
{ _s << typeid(t).name() << "( " << t.value() << " )"; }
const char *asString() const { return _s.str().c_str(); }
};
@@ -1281,12 +1281,12 @@ function while testing. Here is an outline of how it works, before we
see an actual example:
@itemize @bullet
-@item
+@item
For each function you want to override, you use the macro
@code{CXXTEST_MOCK_GLOBAL} to ``prepare'' the function (all is explained
below in excruciating detail).
-@item
+@item
In the tested code you do not call the global functions directly;
rather, you access them in the @code{T} (for @emph{Test}) namespace. For
instance, your code needs to call @code{T::fopen()} instead of
@@ -1534,8 +1534,8 @@ functions runs all the test you've defined and reports to the
@subsection Other test listeners
If you don't like or can't use the @code{ErrorPrinter}, you can use
any other test listener.
-To do this you have to omit the @option{--error-printer}, @option{--runner=}
-or @option{--gui=} switch when generating the tests file.
+To do this you have to omit the @option{--error-printer}, @option{--runner=}
+or @option{--gui=} switch when generating the tests file.
It is then up to you to write the @code{main()} function, using the
test listener of your fancy.
@@ -1669,7 +1669,7 @@ A native XLib GUI. This GUI is very spartan and should work on any X server.
@item --gui=QtGui
A GUI that uses the Qt library from Troll. It has been tested with Qt versiond 2.2.1 and 3.0.1.
-@end table
+@end table
@section @option{--include}
@@ -1697,7 +1697,7 @@ are not enough. One example is the Windows DDK; see
@addedIn{2.8.4}@command{cxxtestgen} will scan its input files for uses of exception
handling; if found, the @code{TS_} macros will catch exceptions,
allowing the testing to continue. Use @option{--have-eh} to tell
-@command{cxxtestgen} to enable that functionality even if exceptions
+@command{cxxtestgen} to enable that functionality even if exceptions
are not used in the input files.
diff --git a/Testing/Tools/cxxtest/python/README.txt b/Testing/Tools/cxxtest/python/README.txt
index 1cd84b90240e302aa62702dc8abbc54768700cde..90b166ba05ae606aa1b871286608f1152c08f8b6 100644
--- a/Testing/Tools/cxxtest/python/README.txt
+++ b/Testing/Tools/cxxtest/python/README.txt
@@ -3,6 +3,6 @@ CxxTest Python Package
The CxxTest Python package includes utilities that are used by the
CxxTest unit testing framework. Specifically, this Python package
-supports C++ parsing and code generation done in the cxxtestgen
+supports C++ parsing and code generation done in the cxxtestgen
script.
diff --git a/Testing/Tools/cxxtest/sample/.cvsignore b/Testing/Tools/cxxtest/sample/.cvsignore
index 087c5dc6786b3b3bd7498e55f321d88225165a91..badbdfa91a2b2c70453869d8cacf377ba7d085b2 100644
--- a/Testing/Tools/cxxtest/sample/.cvsignore
+++ b/Testing/Tools/cxxtest/sample/.cvsignore
@@ -1,5 +1,5 @@
.consign
-Makefile
+Makefile
*_runner*
tests.cpp error_printer.cpp stdio_printer.cpp file_printer.cpp aborter.cpp only.cpp
error_printer stdio_printer file_printer aborter only
diff --git a/Testing/Tools/cxxtest/sample/CreatedTest.h b/Testing/Tools/cxxtest/sample/CreatedTest.h
index 95100e385628c216223d19ceb3a507665c8f316f..58916ca19a3a08eeeb9c33a292cbf9a0054f743c 100644
--- a/Testing/Tools/cxxtest/sample/CreatedTest.h
+++ b/Testing/Tools/cxxtest/sample/CreatedTest.h
@@ -22,7 +22,7 @@ class CreatedTest : public CxxTest::TestSuite
public:
CreatedTest( unsigned size ) : _buffer( new char[size] ) {}
virtual ~CreatedTest() { delete [] _buffer; }
-
+
static CreatedTest *createSuite() { return new CreatedTest( 16 ); }
static void destroySuite( CreatedTest *suite ) { delete suite; }
diff --git a/Testing/Tools/cxxtest/sample/DeltaTest.h b/Testing/Tools/cxxtest/sample/DeltaTest.h
index dddf12cced738199f476058f0a7522a1b0049418..1b3cb9dee013c8787bfcc173ad4de50db40b6f36 100644
--- a/Testing/Tools/cxxtest/sample/DeltaTest.h
+++ b/Testing/Tools/cxxtest/sample/DeltaTest.h
@@ -12,7 +12,7 @@
class DeltaTest : public CxxTest::TestSuite
{
double _delta;
-
+
public:
void setUp()
{
diff --git a/Testing/Tools/cxxtest/sample/ExceptionTest.h b/Testing/Tools/cxxtest/sample/ExceptionTest.h
index 17c9986ebdc5e0f93cb2401ddd212d13fd0672ee..51adc733f09cfe527bf24e2a4a0197a3785489c9 100644
--- a/Testing/Tools/cxxtest/sample/ExceptionTest.h
+++ b/Testing/Tools/cxxtest/sample/ExceptionTest.h
@@ -47,7 +47,7 @@ private:
public:
Number( int ) {}
};
-
+
int throwThis( int i )
{
throw Number( i );
diff --git a/Testing/Tools/cxxtest/sample/FixtureTest.h b/Testing/Tools/cxxtest/sample/FixtureTest.h
index 3ff7994bd6f5d9d7a64aab7849459bb1400ed8cb..fab2ef0bdecaaafa564db0c01323bdeff547bcfb 100644
--- a/Testing/Tools/cxxtest/sample/FixtureTest.h
+++ b/Testing/Tools/cxxtest/sample/FixtureTest.h
@@ -24,7 +24,7 @@ public:
{
_buffer = new char[1024];
}
-
+
void tearDown()
{
delete [] _buffer;
diff --git a/Testing/Tools/cxxtest/sample/Makefile.bcc32 b/Testing/Tools/cxxtest/sample/Makefile.bcc32
index ca112173f80caedc2f96d8410563bbff511c0aa5..6c2442b0848ebe5ccc08b715a0bc4ab903a794c3 100644
--- a/Testing/Tools/cxxtest/sample/Makefile.bcc32
+++ b/Testing/Tools/cxxtest/sample/Makefile.bcc32
@@ -21,8 +21,8 @@ CXXC = bcc32.exe -w- -I. -I..
all: $(TARGETS)
clean:
- del *~ *.o *.obj
- del $(TARGETS)
+ del *~ *.o *.obj
+ del $(TARGETS)
del $(GUI_TARGETS)
del tests.cpp error_printer.cpp stdio_printer.cpp file_printer.cpp aborter.cpp only.cpp
del win32_runner.cpp qt_runner.cpp
diff --git a/Testing/Tools/cxxtest/sample/Makefile.msvc b/Testing/Tools/cxxtest/sample/Makefile.msvc
index da46758c26ed7e5410bd3d8cd0dae35cd580f7fc..30236d7f0ead5d75bc1183130fadb0eb562ea951 100644
--- a/Testing/Tools/cxxtest/sample/Makefile.msvc
+++ b/Testing/Tools/cxxtest/sample/Makefile.msvc
@@ -20,8 +20,8 @@ CXXC = cl.exe -GX -W3 -WX -I. -I..
all: $(TARGETS)
clean:
- del *~ *.o *.obj
- del $(TARGETS)
+ del *~ *.o *.obj
+ del $(TARGETS)
del $(GUI_TARGETS)
del tests.cpp error_printer.cpp stdio_printer.cpp file_printer.cpp aborter.cpp only.cpp
del win32_runner.cpp qt_runner.cpp
diff --git a/Testing/Tools/cxxtest/sample/SCons/SConstruct b/Testing/Tools/cxxtest/sample/SCons/SConstruct
index 96aed5af26c3da811eca55e3a1e5d2dd0ddf47ce..bbee6114e0ddfc060364f4d6c129f1b7de092d5b 100644
--- a/Testing/Tools/cxxtest/sample/SCons/SConstruct
+++ b/Testing/Tools/cxxtest/sample/SCons/SConstruct
@@ -2,34 +2,34 @@
cxxtestbuilder_path = '../../build_tools/SCons/cxxtest.py'
cxxtest_path = '../..'
-# First a bit of python magic to make the CxxTestBuilder available
+# First a bit of python magic to make the CxxTestBuilder available
# without having to copy it into a particular path.
-# for nicer examples you *should* use, see the cxxtest builder tests in the
+# for nicer examples you *should* use, see the cxxtest builder tests in the
# build_tools/SCons/test directory.
import imp
cxxtest = imp.load_source('cxxtest', cxxtestbuilder_path)
-# First build the 'real' library, when working on an embedded system
+# First build the 'real' library, when working on an embedded system
# this may involve a cross compiler.
env = Environment()
env.BuildDir('build/embedded_platform', 'src')
env.Append(CPPPATH=['include'])
-libtested = env.StaticLibrary('build/embedded_platform/tested',
+libtested = env.StaticLibrary('build/embedded_platform/tested',
env.Glob('build/embedded_platform/*.c'))
# Now create a separate build environment for the tests so we can keep any
# options that are specific to testing separate from the 'production' build
# environment. For simplicity I am just copying the production environment.
-# If we are cross compiling for the "real" library, then this
+# If we are cross compiling for the "real" library, then this
# environment might be using the normal compiler.
env_test = env.Clone()
# Add the CxxTestBuilder to our testing build environment.
cxxtest.generate(env_test, CXXTEST_INSTALL_DIR = cxxtest_path)
-# If we were working with an embedded platform we may want to create a
-# separate version of our library that runs on our development box in
-# order to do our initial unit testing. This version may also include
+# If we were working with an embedded platform we may want to create a
+# separate version of our library that runs on our development box in
+# order to do our initial unit testing. This version may also include
# any special preprocessor defines needed for testing e.g. -DTESTING
env_test.BuildDir('build/dev_platform', 'src')
env_test.BuildDir('build/tests', 'tests')
diff --git a/Testing/Tools/cxxtest/sample/SCons/tests/stack_test.h b/Testing/Tools/cxxtest/sample/SCons/tests/stack_test.h
index 9727d58d563df3deb97c4fe6a67490d223664b0a..ac7882f0701c3306dfb944ee188ff2ae1868736a 100644
--- a/Testing/Tools/cxxtest/sample/SCons/tests/stack_test.h
+++ b/Testing/Tools/cxxtest/sample/SCons/tests/stack_test.h
@@ -11,7 +11,7 @@
class stack_test : public CxxTest::TestSuite
{
-
+
private:
stack_t* stack;
public:
@@ -36,11 +36,11 @@ class stack_test : public CxxTest::TestSuite
stack_push(stack, 1);
TS_ASSERT_EQUALS(1, stack_size(stack));
}
-
+
void test_push_pop_doesnt_change_size() {
stack_push(stack, 1);
(void)stack_pop(stack);
- TS_ASSERT_EQUALS(0, stack_size(stack));
+ TS_ASSERT_EQUALS(0, stack_size(stack));
}
void test_peak_after_push() {
diff --git a/Testing/Tools/cxxtest/sample/TraitsTest.h b/Testing/Tools/cxxtest/sample/TraitsTest.h
index 12a95225d353735d3bb5dc3f400b590d95ce3505..fe9c7ddd56cb279ff0f6c3a4dc15db0a22f5abee 100644
--- a/Testing/Tools/cxxtest/sample/TraitsTest.h
+++ b/Testing/Tools/cxxtest/sample/TraitsTest.h
@@ -25,7 +25,7 @@ public:
Pet( const char *petName ) { strcpy( _name, petName ); }
const char *name() const { return _name; }
-
+
bool operator== ( const Pet &other ) const
{
return !strcmp( name(), other.name() );
@@ -37,13 +37,13 @@ public:
// Note: Most compilers do not require that you define both
// ValueTraits<const T> and ValueTraits<T>, but some do.
//
-namespace CxxTest
+namespace CxxTest
{
CXXTEST_TEMPLATE_INSTANTIATION
class ValueTraits<const Pet>
{
char _asString[256];
-
+
public:
ValueTraits( const Pet &pet ) { sprintf( _asString, "Pet(\"%s\")", pet.name() ); }
const char *asString() const { return _asString; }
diff --git a/Testing/Tools/cxxtest/sample/mock/Dice.h b/Testing/Tools/cxxtest/sample/mock/Dice.h
index 6026172f591ec88d090f40cac127c2769728a88c..e1d3d9ea036fb1e65bee6285b2f97656ebceea22 100644
--- a/Testing/Tools/cxxtest/sample/mock/Dice.h
+++ b/Testing/Tools/cxxtest/sample/mock/Dice.h
@@ -10,6 +10,6 @@ class Dice
{
public:
Dice();
-
+
unsigned roll();
};
diff --git a/Testing/Tools/cxxtest/sample/mock/MockStdlib.h b/Testing/Tools/cxxtest/sample/mock/MockStdlib.h
index 0375f728dbf647ecb8c8f4f1c2f57d863b78fe58..c671165c7aa9bdc866a3e74cfaae8b2eb46984bd 100644
--- a/Testing/Tools/cxxtest/sample/mock/MockStdlib.h
+++ b/Testing/Tools/cxxtest/sample/mock/MockStdlib.h
@@ -13,7 +13,7 @@ class MockStdlib :
{
public:
unsigned lastSeed;
-
+
void srand( unsigned seed )
{
lastSeed = seed;
diff --git a/Testing/Tools/cxxtest/sample/mock/TestDice.h b/Testing/Tools/cxxtest/sample/mock/TestDice.h
index b457636ad16e884236e5a1ff9d8e335fa1e3cbde..a76295144d63720142b411a27ad93858f4282112 100644
--- a/Testing/Tools/cxxtest/sample/mock/TestDice.h
+++ b/Testing/Tools/cxxtest/sample/mock/TestDice.h
@@ -22,14 +22,14 @@ public:
{
delete stdlib;
}
-
+
void test_Randomize_uses_time()
{
stdlib->nextTime = 12345;
Dice dice;
TS_ASSERT_EQUALS( stdlib->lastSeed, 12345 );
}
-
+
void test_Roll()
{
Dice dice;
@@ -53,7 +53,7 @@ public:
stdlib->nextRand = 2;
TS_ASSERT_EQUALS( dice.roll(), 3 );
-
+
class Five : public T::Base_rand { int rand() { return 5; } };
Five *five = new Five;
@@ -61,7 +61,7 @@ public:
TS_ASSERT_EQUALS( dice.roll(), 6 );
TS_ASSERT_EQUALS( dice.roll(), 6 );
delete five;
-
+
stdlib->nextRand = 1;
TS_ASSERT_EQUALS( dice.roll(), 2 );
}
diff --git a/Testing/Tools/cxxtest/sample/mock/roll.cpp b/Testing/Tools/cxxtest/sample/mock/roll.cpp
index ab68506366a1f0be623a7a7baae78f2277f827e1..695bb89f7aa6af9825f3bd0b86d661404c5817b7 100644
--- a/Testing/Tools/cxxtest/sample/mock/roll.cpp
+++ b/Testing/Tools/cxxtest/sample/mock/roll.cpp
@@ -12,6 +12,6 @@ int main()
Dice dice;
printf( "First roll: %u\n", dice.roll() );
printf( "Second roll: %u\n", dice.roll() );
-
+
return 0;
}
diff --git a/Testing/Tools/cxxtest/sample/msvc/CxxTest_1_Run.dsp b/Testing/Tools/cxxtest/sample/msvc/CxxTest_1_Run.dsp
index 6bc00e7f41a1b3798ae8f27d7d19a6b39c902880..d20d295ae0f6a85eba367025c3ab35dd9d010888 100644
--- a/Testing/Tools/cxxtest/sample/msvc/CxxTest_1_Run.dsp
+++ b/Testing/Tools/cxxtest/sample/msvc/CxxTest_1_Run.dsp
@@ -7,19 +7,19 @@
CFG=CxxTest_1_Run - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "CxxTest_1_Run.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "CxxTest_1_Run.mak" CFG="CxxTest_1_Run - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "CxxTest_1_Run - Win32 Release" (based on "Win32 (x86) External Target")
!MESSAGE "CxxTest_1_Run - Win32 Debug" (based on "Win32 (x86) External Target")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -68,7 +68,7 @@ CFG=CxxTest_1_Run - Win32 Debug
# PROP Bsc_Name ""
# PROP Target_Dir ""
-!ENDIF
+!ENDIF
# Begin Target
@@ -79,7 +79,7 @@ CFG=CxxTest_1_Run - Win32 Debug
!ELSEIF "$(CFG)" == "CxxTest_1_Run - Win32 Debug"
-!ENDIF
+!ENDIF
# Begin Source File
diff --git a/Testing/Tools/cxxtest/sample/msvc/CxxTest_2_Build.dsp b/Testing/Tools/cxxtest/sample/msvc/CxxTest_2_Build.dsp
index 04727fd3322df62dbc23a60aee98541378509d67..6235120c3550326a1e4ae821257a3c0c4bc78d93 100644
--- a/Testing/Tools/cxxtest/sample/msvc/CxxTest_2_Build.dsp
+++ b/Testing/Tools/cxxtest/sample/msvc/CxxTest_2_Build.dsp
@@ -7,19 +7,19 @@
CFG=CxxTest_2_Build - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "CxxTest_2_Build.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "CxxTest_2_Build.mak" CFG="CxxTest_2_Build - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "CxxTest_2_Build - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "CxxTest_2_Build - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -76,7 +76,7 @@ LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/runner.exe" /pdbtype:sept
-!ENDIF
+!ENDIF
# Begin Target
diff --git a/Testing/Tools/cxxtest/sample/msvc/CxxTest_3_Generate.dsp b/Testing/Tools/cxxtest/sample/msvc/CxxTest_3_Generate.dsp
index 5bbad94ce00bba271ae573b9af7736d2e48d1364..32bbe4b0dc080702b34969f9bf9781fe8927468e 100644
--- a/Testing/Tools/cxxtest/sample/msvc/CxxTest_3_Generate.dsp
+++ b/Testing/Tools/cxxtest/sample/msvc/CxxTest_3_Generate.dsp
@@ -7,19 +7,19 @@
CFG=CxxTest_3_Generate - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "CxxTest_3_Generate.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "CxxTest_3_Generate.mak" CFG="CxxTest_3_Generate - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "CxxTest_3_Generate - Win32 Release" (based on "Win32 (x86) External Target")
!MESSAGE "CxxTest_3_Generate - Win32 Debug" (based on "Win32 (x86) External Target")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -68,7 +68,7 @@ CFG=CxxTest_3_Generate - Win32 Debug
# PROP Bsc_Name ""
# PROP Target_Dir ""
-!ENDIF
+!ENDIF
# Begin Target
@@ -79,7 +79,7 @@ CFG=CxxTest_3_Generate - Win32 Debug
!ELSEIF "$(CFG)" == "CxxTest_3_Generate - Win32 Debug"
-!ENDIF
+!ENDIF
# Begin Source File
diff --git a/Testing/Tools/cxxtest/sample/msvc/FixFiles.bat b/Testing/Tools/cxxtest/sample/msvc/FixFiles.bat
index 7ad11419dcc7e8ee27107b49f1e9ced3dc9fa609..f402a355e30be033c03eec7654d9eecd6696e5e9 100644
--- a/Testing/Tools/cxxtest/sample/msvc/FixFiles.bat
+++ b/Testing/Tools/cxxtest/sample/msvc/FixFiles.bat
@@ -101,7 +101,7 @@ run: $(DIR)\runner.exe
$(DIR)\runner.exe $(RUNNER_FLAGS)
';
-$CxxTest_2_Build =
+$CxxTest_2_Build =
'# Microsoft Developer Studio Project File - Name="CxxTest_2_Build" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
@@ -111,19 +111,19 @@ $CxxTest_2_Build =
CFG=CxxTest_2_Build - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "CxxTest_2_Build.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "CxxTest_2_Build.mak" CFG="CxxTest_2_Build - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "CxxTest_2_Build - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "CxxTest_2_Build - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -180,7 +180,7 @@ LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/runner.exe" /pdbtype:sept
-!ENDIF
+!ENDIF
# Begin Target
diff --git a/Testing/Tools/cxxtest/sample/only.tpl b/Testing/Tools/cxxtest/sample/only.tpl
index b2a7277cf637f79d947900db1ee1a9aa60f69fbe..337ecc50eb94d902e4aa0e387fee3b7295f86529 100644
--- a/Testing/Tools/cxxtest/sample/only.tpl
+++ b/Testing/Tools/cxxtest/sample/only.tpl
@@ -23,7 +23,7 @@ int main( int argc, char *argv[] )
fprintf( stderr, "Cannot find class %s\n", argv[1] );
return 2;
}
-
+
return CxxTest::StdioPrinter().run();
}
diff --git a/Testing/Tools/cxxtest/test/DefaultTraits.h b/Testing/Tools/cxxtest/test/DefaultTraits.h
index 1917df991a6857f75d585f162636c436c63ed121..09612c4898f68266a9b03ac0ce8c4b0f07ccea85 100644
--- a/Testing/Tools/cxxtest/test/DefaultTraits.h
+++ b/Testing/Tools/cxxtest/test/DefaultTraits.h
@@ -18,7 +18,7 @@ public:
EightBytes() {}
unsigned char data[8];
};
-
+
void testSmallDefaultTraits()
{
EightBytes x;
@@ -32,7 +32,7 @@ public:
NineBytes() {}
unsigned char data[9];
};
-
+
void testBigDefaultTraits()
{
NineBytes x;
diff --git a/Testing/Tools/cxxtest/test/DoubleCall.h b/Testing/Tools/cxxtest/test/DoubleCall.h
index 5255fed60ec1a53261babad9855d0fe6c586c736..9e7f59d921de1a710994bd7dc23d512ac4328808 100644
--- a/Testing/Tools/cxxtest/test/DoubleCall.h
+++ b/Testing/Tools/cxxtest/test/DoubleCall.h
@@ -21,7 +21,7 @@ public:
{
i = 0;
}
-
+
void testAssertEqualsWithSideEffects()
{
TS_ASSERT_EQUALS( increment(), 3 );
diff --git a/Testing/Tools/cxxtest/test/DynamicMax.h b/Testing/Tools/cxxtest/test/DynamicMax.h
index 78aa4cb931999c80bc47400eef2b4d312d86b98f..2ce501a674f0d829143d4a4a721636f69b29dac3 100644
--- a/Testing/Tools/cxxtest/test/DynamicMax.h
+++ b/Testing/Tools/cxxtest/test/DynamicMax.h
@@ -55,7 +55,7 @@ public:
x[i] = (unsigned char)i;
y[i] = (unsigned char)~x[i];
}
-
+
CxxTest::setMaxDumpSize( 12 );
}
diff --git a/Testing/Tools/cxxtest/test/EmptySuite.h b/Testing/Tools/cxxtest/test/EmptySuite.h
index 25790ee16dee60926337dcf7005d4bafe728b5f9..76a69ab85a2e5bc3c46fff0b216b1a69a22b7b2d 100644
--- a/Testing/Tools/cxxtest/test/EmptySuite.h
+++ b/Testing/Tools/cxxtest/test/EmptySuite.h
@@ -15,7 +15,7 @@ public:
void setUp() {}
void tearDown() {}
- void thisSuiteHasNoTests()
+ void thisSuiteHasNoTests()
{
TS_FAIL( "This suite has no tests" );
}
diff --git a/Testing/Tools/cxxtest/test/Exceptions.h b/Testing/Tools/cxxtest/test/Exceptions.h
index e92bd88f0afa0f29d0bec1495a73b738096b31dc..1636674537bf931accf7a878fd60ccd23576c88b 100644
--- a/Testing/Tools/cxxtest/test/Exceptions.h
+++ b/Testing/Tools/cxxtest/test/Exceptions.h
@@ -39,7 +39,7 @@ class ThrowDestroy : public CxxTest::TestSuite
public:
static ThrowDestroy *createSuite() { return new ThrowDestroy; }
static void destroySuite( ThrowDestroy * ) { throw 42; }
-
+
void testNothing() {}
};
diff --git a/Testing/Tools/cxxtest/test/Factor.h b/Testing/Tools/cxxtest/test/Factor.h
index 88ca18bd1bb2400049c8a27574573a4603b919ac..b9339288bcf5e88b9eff7227baae737efbbcd66b 100644
--- a/Testing/Tools/cxxtest/test/Factor.h
+++ b/Testing/Tools/cxxtest/test/Factor.h
@@ -55,7 +55,7 @@ public:
class NotShorterThan
{
ShorterThan _shorterThan;
-
+
public:
bool operator()( const char *s, unsigned n ) const { return !_shorterThan( s, n ); }
};
diff --git a/Testing/Tools/cxxtest/test/GfSetUpFails.h b/Testing/Tools/cxxtest/test/GfSetUpFails.h
index 88041b6dd856056167710880a707dd59bad992cf..54b834901c01c027de37052ce48ada31044094e6 100644
--- a/Testing/Tools/cxxtest/test/GfSetUpFails.h
+++ b/Testing/Tools/cxxtest/test/GfSetUpFails.h
@@ -23,7 +23,7 @@ public:
// and declare this global variable in the header file.
//
static Fixture fixture;
-
+
class Suite : public CxxTest::TestSuite
{
public:
diff --git a/Testing/Tools/cxxtest/test/GfSetUpThrows.h b/Testing/Tools/cxxtest/test/GfSetUpThrows.h
index 240356e0ce0c8e3c6d4f7a7d96cdb4990e491e4a..4062e1444c25cd4889d9413d48ba0147ec7813d9 100644
--- a/Testing/Tools/cxxtest/test/GfSetUpThrows.h
+++ b/Testing/Tools/cxxtest/test/GfSetUpThrows.h
@@ -23,7 +23,7 @@ public:
// and declare this global variable in the header file.
//
static Fixture fixture;
-
+
class Suite : public CxxTest::TestSuite
{
public:
diff --git a/Testing/Tools/cxxtest/test/GfTearDownFails.h b/Testing/Tools/cxxtest/test/GfTearDownFails.h
index c8fb28bcf1985eb973585af2340c05a797f3cfc9..01043230576b8f287110ece5f636332251bff6c6 100644
--- a/Testing/Tools/cxxtest/test/GfTearDownFails.h
+++ b/Testing/Tools/cxxtest/test/GfTearDownFails.h
@@ -23,7 +23,7 @@ public:
// and declare this global variable in the header file.
//
static Fixture fixture;
-
+
class Suite : public CxxTest::TestSuite
{
public:
diff --git a/Testing/Tools/cxxtest/test/GfTearDownThrows.h b/Testing/Tools/cxxtest/test/GfTearDownThrows.h
index 23680beaa67e387bd5ffbaf5ac629198b74d5e3d..8995217b3a365e3cd64759dcbcadfeb7e2616dee 100644
--- a/Testing/Tools/cxxtest/test/GfTearDownThrows.h
+++ b/Testing/Tools/cxxtest/test/GfTearDownThrows.h
@@ -23,7 +23,7 @@ public:
// and declare this global variable in the header file.
//
static Fixture fixture;
-
+
class Suite : public CxxTest::TestSuite
{
public:
diff --git a/Testing/Tools/cxxtest/test/GlobalFixtures.h b/Testing/Tools/cxxtest/test/GlobalFixtures.h
index f27429f2f5c9e8da2e001926a166d3ba4ea91fce..7ca0c552a7fb6b01f2d4b07a40d6f365676296fa 100644
--- a/Testing/Tools/cxxtest/test/GlobalFixtures.h
+++ b/Testing/Tools/cxxtest/test/GlobalFixtures.h
@@ -18,7 +18,7 @@ class Fixture1 : public CxxTest::GlobalFixture
{
unsigned _setUpCount;
unsigned _tearDownCount;
-
+
public:
Fixture1() { _setUpCount = _tearDownCount = 0; }
bool setUp() { ++ _setUpCount; return true; }
diff --git a/Testing/Tools/cxxtest/test/GoodSuite.h b/Testing/Tools/cxxtest/test/GoodSuite.h
index 2f1fdd3452ada3f6898acf76700b2b5dbbc54753..d2e9f922151e1c33162fb937c252891234e8989b 100644
--- a/Testing/Tools/cxxtest/test/GoodSuite.h
+++ b/Testing/Tools/cxxtest/test/GoodSuite.h
@@ -27,7 +27,7 @@ public:
{
TSM_ASSERT( "ASCII works", 'A' == 65 );
}
-
+
void testEquals()
{
TS_ASSERT_EQUALS( 1 + 1, 2 );
diff --git a/Testing/Tools/cxxtest/test/LessThanEquals.h b/Testing/Tools/cxxtest/test/LessThanEquals.h
index 685a016a2a84eada8d0d6643a578a2a4d420de0c..5e86343eb8620df426216faf1b6d8e97ef37bddd 100644
--- a/Testing/Tools/cxxtest/test/LessThanEquals.h
+++ b/Testing/Tools/cxxtest/test/LessThanEquals.h
@@ -18,7 +18,7 @@ public:
{
TS_ASSERT_LESS_THAN_EQUALS( 1, 2 );
TS_ASSERT_LESS_THAN_EQUALS( 1, 1 );
-
+
TS_ASSERT_LESS_THAN_EQUALS( 1, 0 );
TSM_ASSERT_LESS_THAN_EQUALS( "1 <=? 0", 1, 0 );
diff --git a/Testing/Tools/cxxtest/test/MockTest.h b/Testing/Tools/cxxtest/test/MockTest.h
index 276a6714bf11b81900e5990c93ebb846da6d8d49..4d5ea0dc809f8d56caabac7f6c535858a3b2eba5 100644
--- a/Testing/Tools/cxxtest/test/MockTest.h
+++ b/Testing/Tools/cxxtest/test/MockTest.h
@@ -15,7 +15,7 @@
static int one( void ) { return 1; }
static void two( int *p ) { *p = 2; }
-namespace NameSpace
+namespace NameSpace
{
static int identity( int i ) { return i; }
static double identity( double d ) { return d; }
@@ -28,7 +28,7 @@ public:
int value;
};
-static Opaque getOpaque( int i )
+static Opaque getOpaque( int i )
{
return Opaque( i );
}
@@ -180,7 +180,7 @@ public:
SupplyFour sf( 53 );
TS_ASSERT_EQUALS( supplyThree(), 28 );
-
+
int i;
supplyFour( &i );
TS_ASSERT_EQUALS( i, 53 );
diff --git a/Testing/Tools/cxxtest/test/SameZero.h b/Testing/Tools/cxxtest/test/SameZero.h
index b05619b96ac956170db7454e2ae1b718aeadb129..db00e696ea86ee36b6382e5e17e364b5de32e4e5 100644
--- a/Testing/Tools/cxxtest/test/SameZero.h
+++ b/Testing/Tools/cxxtest/test/SameZero.h
@@ -14,13 +14,13 @@ class SameZero : public CxxTest::TestSuite
{
public:
char data[4];
-
+
void setUp()
{
for ( unsigned i = 0; i < sizeof(data); ++ i )
data[i] = (char)i;
}
-
+
void test_TS_ASSERT_SAME_DATA_passed_zero()
{
TS_ASSERT_SAME_DATA( data, 0, sizeof(data) );
diff --git a/Testing/Tools/cxxtest/test/SetUpWorldFails.h b/Testing/Tools/cxxtest/test/SetUpWorldFails.h
index 5e2e09e4a70201f6e2da13bd8af8b983f29c1fe8..134bb0d6a17e2bfb4485d8b3ae0d9772794aa4fc 100644
--- a/Testing/Tools/cxxtest/test/SetUpWorldFails.h
+++ b/Testing/Tools/cxxtest/test/SetUpWorldFails.h
@@ -23,7 +23,7 @@ public:
// and declare this global variable in the header file.
//
static Fixture fixture;
-
+
class Suite : public CxxTest::TestSuite
{
public:
diff --git a/Testing/Tools/cxxtest/test/SetUpWorldThrows.h b/Testing/Tools/cxxtest/test/SetUpWorldThrows.h
index a0ec87de126426d486f83b9d3ae279c507d027e3..54ffcbf37e480677231a027ff4eabc7deec15176 100644
--- a/Testing/Tools/cxxtest/test/SetUpWorldThrows.h
+++ b/Testing/Tools/cxxtest/test/SetUpWorldThrows.h
@@ -23,7 +23,7 @@ public:
// and declare this global variable in the header file.
//
static Fixture fixture;
-
+
class Suite : public CxxTest::TestSuite
{
public:
diff --git a/Testing/Tools/cxxtest/test/StlTraits.h b/Testing/Tools/cxxtest/test/StlTraits.h
index 7453042369c1ce08e2decf08667d3394dd597566..067310837f344dfb1fc52d525ddfb17e0f3f7c5d 100644
--- a/Testing/Tools/cxxtest/test/StlTraits.h
+++ b/Testing/Tools/cxxtest/test/StlTraits.h
@@ -12,7 +12,7 @@ public:
typedef CXXTEST_STD(string) String;
typedef CXXTEST_STD(pair)<int, String> IntString;
typedef CXXTEST_STD(pair)<String, double> StringDouble;
-
+
void test_Pair()
{
IntString three( 3, "Three" );
@@ -97,7 +97,7 @@ public:
{
CXXTEST_STD(map)<String, String> m;
TS_TRACE( m );
-
+
m["Jack"] = "Jill";
m["Humpty"] = "Dumpty";
m["Ren"] = "Stimpy";
@@ -132,7 +132,7 @@ public:
{
CXXTEST_STD(multimap)<String, double> mm;
TS_TRACE( mm );
-
+
mm.insert( StringDouble( "One", 1.0 ) );
mm.insert( StringDouble( "Two", 2.0 ) );
TS_FAIL( mm );
@@ -142,7 +142,7 @@ public:
{
CXXTEST_STD(multiset)<int> ms;
TS_TRACE( ms );
-
+
ms.insert( 123 );
ms.insert( 456 );
TS_FAIL( ms );
diff --git a/Testing/Tools/cxxtest/test/TearDownWorldFails.h b/Testing/Tools/cxxtest/test/TearDownWorldFails.h
index 46404b52bd120a92552e58642b7c163cdfdac4a5..40ee8f47c865afe3a21d65060b90111dd06836ba 100644
--- a/Testing/Tools/cxxtest/test/TearDownWorldFails.h
+++ b/Testing/Tools/cxxtest/test/TearDownWorldFails.h
@@ -23,7 +23,7 @@ public:
// and declare this global variable in the header file.
//
static Fixture fixture;
-
+
class Suite : public CxxTest::TestSuite
{
public:
diff --git a/Testing/Tools/cxxtest/test/TearDownWorldThrows.h b/Testing/Tools/cxxtest/test/TearDownWorldThrows.h
index ac9e0ebd523efdbaeccc3e8105866e64054d6bf3..7f728c1e3fd4609a093c67289896b5df6c5f4f78 100644
--- a/Testing/Tools/cxxtest/test/TearDownWorldThrows.h
+++ b/Testing/Tools/cxxtest/test/TearDownWorldThrows.h
@@ -23,7 +23,7 @@ public:
// and declare this global variable in the header file.
//
static Fixture fixture;
-
+
class Suite : public CxxTest::TestSuite
{
public:
diff --git a/Testing/Tools/cxxtest/test/ThrowsAssert.h b/Testing/Tools/cxxtest/test/ThrowsAssert.h
index 20de24f6702e3d6143c009ddee91e59ead7e87b9..68754777f4e775c9c8830a35ec77f8b89aec8d9e 100644
--- a/Testing/Tools/cxxtest/test/ThrowsAssert.h
+++ b/Testing/Tools/cxxtest/test/ThrowsAssert.h
@@ -26,7 +26,7 @@ class ThrowsAssert : public CxxTest::TestSuite
public:
void test_TS_ASSERT_THROWS_EQUALS()
{
- TS_ASSERT_THROWS_EQUALS( { throw 1; }, int i, i, 2 );
+ TS_ASSERT_THROWS_EQUALS( { throw 1; }, int i, i, 2 );
TS_ASSERT_THROWS_EQUALS( { throw Thing( 1 ); }, const Thing &thing, thing.i(), 2 );
}
@@ -75,32 +75,32 @@ public:
{
TS_ASSERT_THROWS_ASSERT( { throw 1; }, int i,
TS_ASSERT_EQUALS( i, 2 ) );
-
+
TS_ASSERT_THROWS_ASSERT( { throw Thing( 1 ); }, const Thing &thing,
TS_ASSERT_EQUALS( thing.i(), 2 ) );
-
+
TS_ASSERT_THROWS_ASSERT( { throw Thing( 1 ); }, const Thing &thing,
TS_FAIL( thing.i() ) );
-
+
TS_ASSERT_THROWS_ASSERT( { throw Thing( 1 ); }, const Thing &thing,
TS_ASSERT( thing.i() - 1 ) );
char zero = 0, one = 1;
TS_ASSERT_THROWS_ASSERT( { throw Thing( 1 ); }, const Thing &,
TS_ASSERT_SAME_DATA( &zero, &one, sizeof(char) ) );
-
+
TS_ASSERT_THROWS_ASSERT( { throw Thing( 1 ); }, const Thing &thing,
TS_ASSERT_DELTA( thing.i(), 5, 2 ) );
-
+
TS_ASSERT_THROWS_ASSERT( { throw Thing( 1 ); }, const Thing &thing,
TS_ASSERT_DIFFERS( thing.i(), 1 ) );
-
+
TS_ASSERT_THROWS_ASSERT( { throw Thing( 1 ); }, const Thing &thing,
TS_ASSERT_LESS_THAN( thing.i(), 1 ) );
-
+
TS_ASSERT_THROWS_ASSERT( { throw Thing( 1 ); }, const Thing &thing,
TS_ASSERT_PREDICATE( Fail, thing.i() ) );
-
+
TS_ASSERT_THROWS_ASSERT( { throw Thing( 1 ); }, const Thing &thing,
TS_ASSERT_RELATION( Fail, thing.i(), 33 ) );
}
diff --git a/Testing/Tools/cxxtest/test/TraitsTest.h b/Testing/Tools/cxxtest/test/TraitsTest.h
index ee6c9a78d353a4d7f5de8c067ab796d29b4d9ebc..b23963ec8c00e0fe558abf25a3247e849bd91c90 100644
--- a/Testing/Tools/cxxtest/test/TraitsTest.h
+++ b/Testing/Tools/cxxtest/test/TraitsTest.h
@@ -37,7 +37,7 @@ public:
TS_FAIL( true );
TS_FAIL( false );
}
-
+
void testCharTraits()
{
TS_FAIL( 'A' );
diff --git a/Testing/Tools/cxxtest/test/Tsm.h b/Testing/Tools/cxxtest/test/Tsm.h
index f7eb5647974b900403511fe5b7f82a5d3a19ebab..10f090934b45172aa077faa4d1432f41671faae2 100644
--- a/Testing/Tools/cxxtest/test/Tsm.h
+++ b/Testing/Tools/cxxtest/test/Tsm.h
@@ -17,7 +17,7 @@ public:
{
int n = 42;
char x = 'x', y = 'y';
-
+
TSM_ASSERT( "String", false );
TSM_ASSERT( n, false );
TSM_ASSERT_EQUALS( "String", 2 + 2, 5 );
diff --git a/Testing/Tools/cxxtest/test/WorldFixtures.h b/Testing/Tools/cxxtest/test/WorldFixtures.h
index 2a68356287d80794ae00be71c709aed01b2967f5..7d1f77cc194d909a1f191e96603c775fa25f8b99 100644
--- a/Testing/Tools/cxxtest/test/WorldFixtures.h
+++ b/Testing/Tools/cxxtest/test/WorldFixtures.h
@@ -26,10 +26,10 @@ public:
// and declare this global variable in the header file.
//
static PrintingFixture printingFixture;
-
+
//
// Now define some tests
-//
+//
class FirstSuite : public CxxTest::TestSuite
{
diff --git a/Testing/Tools/cxxtest/test/cxxtest/DummyGui.h b/Testing/Tools/cxxtest/test/cxxtest/DummyGui.h
index 03bd976671fea5f85e431c840c8566b59d5ab4ea..fef77e8029762b0dfef54ae88ed3377fa6877941 100644
--- a/Testing/Tools/cxxtest/test/cxxtest/DummyGui.h
+++ b/Testing/Tools/cxxtest/test/cxxtest/DummyGui.h
@@ -24,12 +24,12 @@ namespace CxxTest
{
(CXXTEST_STD(cout) << " {Start " << numTotalTests << " tests} ").flush();
}
-
+
void guiEnterTest( const char *suiteName, const char *testName )
{
(CXXTEST_STD(cout) << " {" << suiteName << "::" << testName << "()} ").flush();
}
-
+
void yellowBar()
{
(CXXTEST_STD(cout) << " {Yellow} ").flush();
diff --git a/Testing/Tools/cxxtest/test/fake/X11/Xlib.h b/Testing/Tools/cxxtest/test/fake/X11/Xlib.h
index d5a8ab26441df0cb88db3f1ea63e15e8bea8eefd..27be83fd0f3315763375b54d53298fb8eec035bb 100644
--- a/Testing/Tools/cxxtest/test/fake/X11/Xlib.h
+++ b/Testing/Tools/cxxtest/test/fake/X11/Xlib.h
@@ -30,7 +30,7 @@ inline int XFreeFontInfo( char **, XFontStruct *, int ) { return 0; }
inline int XSelectInput( Display *, Window, int ) { return 0; }
inline int XMapWindow( Display *, Window ) { return 0; }
inline Screen *XDefaultScreenOfDisplay( Display * ) { return 0; }
-inline int WidthOfScreen( Screen * ) { return 0; }
+inline int WidthOfScreen( Screen * ) { return 0; }
inline int HeightOfScreen( Screen * ) { return 0; }
inline int XMoveResizeWindow( Display *, Window, int, int, int, int ) { return 0; }
diff --git a/Testing/Tools/cxxtest/test/fake/windows.h b/Testing/Tools/cxxtest/test/fake/windows.h
index 141a28926549dd8f993a27f5044b389fe33df23e..c28ac82afe89d129a1c1486489b090f70eedf629 100644
--- a/Testing/Tools/cxxtest/test/fake/windows.h
+++ b/Testing/Tools/cxxtest/test/fake/windows.h
@@ -80,7 +80,7 @@ struct MSG
{
};
-typedef struct
+typedef struct
{
LPVOID lpCreateParams;
} CREATESTRUCT, *LPCREATESTRUCT;
diff --git a/Testing/Tools/cxxtest/test/gui.out b/Testing/Tools/cxxtest/test/gui.out
index b269516103708d5de613272ef8ddbe879327e3a7..f22e6c7d3395f8695290e0387d1bb613b81269cb 100644
--- a/Testing/Tools/cxxtest/test/gui.out
+++ b/Testing/Tools/cxxtest/test/gui.out
@@ -1,15 +1,15 @@
- {Start 7 tests} Running 7 tests {GreenYellowRed::test_Start_green()} . {GreenYellowRed::test_Green_again()}
+ {Start 7 tests} Running 7 tests {GreenYellowRed::test_Start_green()} . {GreenYellowRed::test_Green_again()}
In GreenYellowRed::test_Green_again:
GreenYellowRed.h:26: Trace: Still green
-. {GreenYellowRed::test_Now_yellow()} {Yellow}
+. {GreenYellowRed::test_Now_yellow()} {Yellow}
In GreenYellowRed::test_Now_yellow:
GreenYellowRed.h:32: Warning: Yellow
-. {GreenYellowRed::test_Cannot_go_back()} . {GreenYellowRed::test_Finally_red()} {Red}
+. {GreenYellowRed::test_Cannot_go_back()} . {GreenYellowRed::test_Finally_red()} {Red}
In GreenYellowRed::test_Finally_red:
GreenYellowRed.h:43: Error: Test failed: Red
{GreenYellowRed::test_Cannot_go_back_to_yellow()} In GreenYellowRed::test_Cannot_go_back_to_yellow:
GreenYellowRed.h:49: Warning: Yellow?
-. {GreenYellowRed::test_Cannot_go_back_to_green()} . {Stop}
+. {GreenYellowRed::test_Cannot_go_back_to_green()} . {Stop}
Failed 1 of 7 tests
Success rate: 85%
Error level = 1
diff --git a/Testing/Tools/cxxtest/test/gui_paren.out b/Testing/Tools/cxxtest/test/gui_paren.out
index cb69544b10f81ad6ec2d99d9f8e38a8671388267..8c28e294d05966d9e818dc7af82474612d78a917 100644
--- a/Testing/Tools/cxxtest/test/gui_paren.out
+++ b/Testing/Tools/cxxtest/test/gui_paren.out
@@ -1,15 +1,15 @@
- {Start 7 tests} Running 7 tests {GreenYellowRed::test_Start_green()} . {GreenYellowRed::test_Green_again()}
+ {Start 7 tests} Running 7 tests {GreenYellowRed::test_Start_green()} . {GreenYellowRed::test_Green_again()}
In GreenYellowRed::test_Green_again:
GreenYellowRed.h(26): Trace: Still green
-. {GreenYellowRed::test_Now_yellow()} {Yellow}
+. {GreenYellowRed::test_Now_yellow()} {Yellow}
In GreenYellowRed::test_Now_yellow:
GreenYellowRed.h(32): Warning: Yellow
-. {GreenYellowRed::test_Cannot_go_back()} . {GreenYellowRed::test_Finally_red()} {Red}
+. {GreenYellowRed::test_Cannot_go_back()} . {GreenYellowRed::test_Finally_red()} {Red}
In GreenYellowRed::test_Finally_red:
GreenYellowRed.h(43): Error: Test failed: Red
{GreenYellowRed::test_Cannot_go_back_to_yellow()} In GreenYellowRed::test_Cannot_go_back_to_yellow:
GreenYellowRed.h(49): Warning: Yellow?
-. {GreenYellowRed::test_Cannot_go_back_to_green()} . {Stop}
+. {GreenYellowRed::test_Cannot_go_back_to_green()} . {Stop}
Failed 1 of 7 tests
Success rate: 85%
Error level = 1
diff --git a/Testing/Tools/cxxtest/test/main.cpp b/Testing/Tools/cxxtest/test/main.cpp
index f71f9fcfedfb1c391fc5dc3ca2b8dd2d755f1fb1..3406e042ef00f6f3d8f8e0228816fc218fb48015 100644
--- a/Testing/Tools/cxxtest/test/main.cpp
+++ b/Testing/Tools/cxxtest/test/main.cpp
@@ -23,7 +23,7 @@ public:
{
CxxTest::TestRunner::runAllTests( *this );
}
-
+
void leaveWorld( const CxxTest::WorldDescription &wd )
{
printf( "Number of suites: %u\n", wd.numSuites() );
diff --git a/Testing/Tools/cxxtest/test/preamble.tpl b/Testing/Tools/cxxtest/test/preamble.tpl
index a15356b4da8dc00de53f8ddf01bc24eefe783f3b..0e60d9b3e0ab106c0a77008943922b13fcbc3c0c 100644
--- a/Testing/Tools/cxxtest/test/preamble.tpl
+++ b/Testing/Tools/cxxtest/test/preamble.tpl
@@ -19,7 +19,7 @@ int main()
TS_FAIL( "This will not be displayed" );
int result = runner.run() + runner.run();
TS_FAIL( "This will not be displayed" );
-
+
return result;
}
diff --git a/Testing/Tools/cxxtest/test/test.pl b/Testing/Tools/cxxtest/test/test.pl
index dac808250b6e62069bf91fae4b35f098f6aa27f1..6bdcbb7dea04af97eb362acd2f5007d9467c6b47 100755
--- a/Testing/Tools/cxxtest/test/test.pl
+++ b/Testing/Tools/cxxtest/test/test.pl
@@ -495,7 +495,7 @@ testCase { 'name' => "GF:TDW throws ", 'args' => "--error-printer TearDownWorl
#
testCase { 'name' => "GUI ", 'args' => "--gui=DummyGui $guiInputs",
'output' => "gui.out" };
-testCase { 'name' => "GUI + runner ", 'args' => "--gui=DummyGui --runner=ParenPrinter $guiInputs",
+testCase { 'name' => "GUI + runner ", 'args' => "--gui=DummyGui --runner=ParenPrinter $guiInputs",
'output' => "gui_paren.out" };
testCase { 'name' => "QT GUI ", 'args' => "--gui=QtGui GoodSuite.h", 'compile' => "$qtFlags" };
testCase { 'name' => "Win32 GUI ", 'args' => "--gui=Win32Gui GoodSuite.h", 'compile' => "$w32Flags" };
diff --git a/buildconfig/CMake/CoverallsGenerateGcov.py b/buildconfig/CMake/CoverallsGenerateGcov.py
index 7f45783a0f546f2883e0011ff4355e8c1359a23c..3d255cd5ccecbdbea3d5c9878c8f954be6bc6cfa 100644
--- a/buildconfig/CMake/CoverallsGenerateGcov.py
+++ b/buildconfig/CMake/CoverallsGenerateGcov.py
@@ -15,7 +15,7 @@ def getRemotes(directory):
"""Returns list of remote git repositories"""
gitRemoteOutput = subprocess.check_output(['git','remote','-v'],cwd=directory)
remotes = []
- for line in gitRemoteOutput.splitlines():
+ for line in gitRemoteOutput.splitlines():
if '(fetch)' in line:
splitLine = line.split();
remotes.append({'name': splitLine[0].strip(), 'url': splitLine[1].strip()})
@@ -37,11 +37,11 @@ def getAllFilesWithExtension(directory,extension):
def getSourcePathFromGcovFile(gcovFilename):
"""Return the source path corresponding to a .gcov file"""
gcovPath,gcovFilenameWithExtension = os.path.split(gcovFilename)
- srcFilename = re.sub(".gcov$","",gcovFilenameWithExtension)
+ srcFilename = re.sub(".gcov$","",gcovFilenameWithExtension)
return re.sub("#","/",srcFilename)
def main(argv):
- arguments = ['COVERAGE_SRCS_FILE=','COVERALLS_OUTPUT_FILE=','COV_PATH=','PROJECT_ROOT=']
+ arguments = ['COVERAGE_SRCS_FILE=','COVERALLS_OUTPUT_FILE=','COV_PATH=','PROJECT_ROOT=']
COVERAGE_SRCS_FILE=None
COVERALLS_OUTPUT_FILE=None
COV_PATH=None
@@ -95,7 +95,7 @@ def main(argv):
#get name for json file
sourceWithPath = getSourcePathFromGcovFile(gcovFilename)
fileCoverage['name'] = os.path.relpath(sourceWithPath,PROJECT_ROOT)
- print "Generating JSON file for "+fileCoverage['name']
+ print "Generating JSON file for "+fileCoverage['name']
fileCoverage['source_digest'] = hashlib.md5(open(sourceWithPath, 'rb').read()).hexdigest()
lineCoverage = []
gcovFile = open(gcovFilename,'r')
@@ -107,7 +107,7 @@ def main(argv):
lineCoverage.append(0)
elif line[0] == '-':
lineCoverage.append(None)
- else:
+ else:
lineCoverage.append(int(line[0]))
if lineNumber != len(lineCoverage):
raise RuntimeError['line_number does not match len(array)']
@@ -133,7 +133,7 @@ def main(argv):
head = {'id':gitLogValue('H',PROJECT_ROOT),'author_name':gitLogValue('an',PROJECT_ROOT), \
'author_email':gitLogValue('ae',PROJECT_ROOT),'committer_name':gitLogValue('cn',PROJECT_ROOT), \
- 'committer_email':gitLogValue('ce',PROJECT_ROOT), 'message':gitLogValue('B',PROJECT_ROOT)}
+ 'committer_email':gitLogValue('ce',PROJECT_ROOT), 'message':gitLogValue('B',PROJECT_ROOT)}
gitDict = {'head':head,'branch':getBranchName(PROJECT_ROOT),'remotes':getRemotes(COV_PATH)}
coverallsOutput['git'] = gitDict
diff --git a/buildconfig/CMake/ExternalSipPyQt4.cmake b/buildconfig/CMake/ExternalSipPyQt4.cmake
index d92479e645e08e86989f249418b52518a5d66e01..3b9771942d80b98f0947d9944fd6735654cc7dc8 100644
--- a/buildconfig/CMake/ExternalSipPyQt4.cmake
+++ b/buildconfig/CMake/ExternalSipPyQt4.cmake
@@ -77,6 +77,6 @@ import sys; new = sys.path[sys.__plen:]; del sys.path[sys.__plen:]; p = getattr(
# Package PyQt. We assume this is for Python 3
install(DIRECTORY ${PRIVATE_PYQT_SITE_PACKAGES}/PyQt4
- DESTINATION ${LIB_DIR}
+ DESTINATION ${LIB_DIR}
PATTERN "__pycache__" EXCLUDE
PATTERN "port_v2" EXCLUDE)
diff --git a/buildconfig/CMake/FindCppcheck.cmake b/buildconfig/CMake/FindCppcheck.cmake
index 89bb0b88ec5e512df5d147450bf3893b278e7cf0..ce7737a0fa724fcdb8332e0d5a2e22e7829d8454 100644
--- a/buildconfig/CMake/FindCppcheck.cmake
+++ b/buildconfig/CMake/FindCppcheck.cmake
@@ -101,7 +101,7 @@ function(add_cppcheck _name) # additional arguments are files to ignore
# add the target
if (CPPCHECK_GENERATE_XML )
add_custom_target( cppcheck_${_name}
- COMMAND ${CPPCHECK_EXECUTABLE} ${_cppcheck_args} --xml --xml-version=2 ${_files} 2> ${CMAKE_BINARY_DIR}/cppcheck-${_name}.xml
+ COMMAND ${CPPCHECK_EXECUTABLE} ${_cppcheck_args} --xml --xml-version=2 ${_files} 2> ${CMAKE_BINARY_DIR}/cppcheck-${_name}.xml
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
DEPENDS ${_files}
COMMENT "cppcheck_${_name}: Running cppcheck to generate cppcheck-${_name}.xml"
diff --git a/buildconfig/CMake/FindJsonCPP.cmake b/buildconfig/CMake/FindJsonCPP.cmake
index 7d2d4f5da2adc78b31887589da2d66ad3490dc82..68bf27cddb1da7ae8c812b9ab0839ed16681f72e 100644
--- a/buildconfig/CMake/FindJsonCPP.cmake
+++ b/buildconfig/CMake/FindJsonCPP.cmake
@@ -2,7 +2,7 @@
# Use this module by invoking find_package with the form:
# find_package(JsonCPP [required] [quiet] )
#
-# The module sets the following variables
+# The module sets the following variables
# JSONCPP_FOUND - True if headers and libraries were found
# JSONCPP_INCLUDE_DIR - jsoncpp include directories
# JSONCPP_LIBRARY - library files for linking (optimised version)
@@ -35,7 +35,7 @@ if (EXISTS "${JSONCPP_INCLUDE_DIR}/json/version.h")
set(_JSONCPP_VERSION_ARGS VERSION_VAR JSONCPP_VERSION_STRING)
endif ()
-# Handle the QUIETLY and REQUIRED arguments and set JSONCPP_FOUND to TRUE if
+# Handle the QUIETLY and REQUIRED arguments and set JSONCPP_FOUND to TRUE if
# all listed variables are TRUE
include ( FindPackageHandleStandardArgs )
find_package_handle_standard_args( JsonCPP REQUIRED_VARS JSONCPP_INCLUDE_DIR JSONCPP_LIBRARIES ${_JSONCPP_VERSION_ARGS} )
diff --git a/buildconfig/CMake/FindLibRDKafka.cmake b/buildconfig/CMake/FindLibRDKafka.cmake
index 615e9d2d6e888679f504e79d6ca940d136962ae4..18786b939a9288be94959b739dd16928dd0822d6 100644
--- a/buildconfig/CMake/FindLibRDKafka.cmake
+++ b/buildconfig/CMake/FindLibRDKafka.cmake
@@ -113,7 +113,7 @@ endmacro(_LibRDKafka_check_version)
find_path(LibRDKafka_ROOT_DIR
NAMES include/librdkafka/rdkafkacpp.h
PATHS /usr/local
- )
+ )
find_path(LibRDKafka_INCLUDE_DIR
NAMES librdkafka/rdkafkacpp.h
HINTS ${LibRDKafka_ROOT_DIR}/include
@@ -138,7 +138,7 @@ find_library(LibRDKafka_C_DEBUG
if (LibRDKafka_INCLUDE_DIR)
_LibRDKafka_check_version()
endif ()
-
+
if( LibRDKafka_DEBUG )
set( LibRDKafka_LIBRARIES optimized ${LibRDKafka}
@@ -160,7 +160,7 @@ set( LibRDKafka_C_LIBRARIES optimized ${LibRDKafka_C}
else ()
-set( LibRDKafka_C_LIBRARIES ${LibRDKafka_C}
+set( LibRDKafka_C_LIBRARIES ${LibRDKafka_C}
)
endif ()
diff --git a/buildconfig/CMake/FindOpenCascade.cmake b/buildconfig/CMake/FindOpenCascade.cmake
index 8cd5913b47afc582d53db283ae6910c0a67b6a85..427e0662b18cc688a456f49b5687dd8eca4e4a46 100644
--- a/buildconfig/CMake/FindOpenCascade.cmake
+++ b/buildconfig/CMake/FindOpenCascade.cmake
@@ -3,7 +3,7 @@
# OPENCASCADE_LIBRARIES libraries to link against
# OPENCASCADE_FOUND If false, do not try to use OPENCASCADE
-find_path ( OPENCASCADE_INCLUDE_DIR Standard.hxx
+find_path ( OPENCASCADE_INCLUDE_DIR Standard.hxx
PATHS /opt/OpenCASCADE/inc $ENV{CASROOT}/inc
PATH_SUFFIXES opencascade oce
)
@@ -84,15 +84,15 @@ set ( OPENCASCADE_LIBRARIES
${OPENCASCADE_LIB_TKGEOMALGO}
)
-# handle the QUIETLY and REQUIRED arguments and set OPENCASCADE_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set OPENCASCADE_FOUND to TRUE if
# all listed variables are TRUE
include ( FindPackageHandleStandardArgs )
find_package_handle_standard_args( OpenCascade DEFAULT_MSG OPENCASCADE_LIBRARIES OPENCASCADE_INCLUDE_DIR )
mark_as_advanced ( OPENCASCADE_INCLUDE_DIR OPENCASCADE_LIBRARY_DIR
- OPENCASCADE_LIB_TKERNEL OPENCASCADE_LIB_TKBO
+ OPENCASCADE_LIB_TKERNEL OPENCASCADE_LIB_TKBO
OPENCASCADE_LIB_TKPRIM OPENCASCADE_LIB_TKMESH
- OPENCASCADE_LIB_TKBREP OPENCASCADE_LIB_TKTOPALGO
+ OPENCASCADE_LIB_TKBREP OPENCASCADE_LIB_TKTOPALGO
OPENCASCADE_LIB_TKMATH OPENCASCADE_LIB_TKG2D
OPENCASCADE_LIB_TKG3D OPENCASCADE_LIB_TKGEOMBASE
OPENCASCADE_LIB_TKGEOMALGO
diff --git a/buildconfig/CMake/FindSIP.cmake b/buildconfig/CMake/FindSIP.cmake
index 2c2b924a21bacbda0b99a55951d04de9cd2cbedf..ffb61ae30b98579b9b14518f159633208c388871 100644
--- a/buildconfig/CMake/FindSIP.cmake
+++ b/buildconfig/CMake/FindSIP.cmake
@@ -59,7 +59,7 @@ ELSE(SIP_VERSION)
get_filename_component(SIP_INCLUDE_DIRECTORY "${_sip_h}" DIRECTORY)
endif()
find_path(SIP_INCLUDE_DIR sip.h PATHS ${SIP_INCLUDE_DIRECTORY} NO_DEFAULT_PATH)
-
+
include ( FindPackageHandleStandardArgs )
find_package_handle_standard_args( SIP DEFAULT_MSG SIP_VERSION_STR SIP_INCLUDE_DIR SIP_EXECUTABLE )
diff --git a/buildconfig/CMake/GenerateMantidExportHeader.cmake b/buildconfig/CMake/GenerateMantidExportHeader.cmake
index 6354d95a2dd18edb8b235b72cc362511da02ad2e..d3b5070816163dd0ff1e8df7ba682a7c80dbadf0 100644
--- a/buildconfig/CMake/GenerateMantidExportHeader.cmake
+++ b/buildconfig/CMake/GenerateMantidExportHeader.cmake
@@ -2,7 +2,7 @@ include (GenerateExportHeader)
function( GENERATE_MANTID_EXPORT_HEADER TARGET_LIBRARY GENERATE_EXTERN)
string(TOUPPER "${TARGET_LIBRARY}" TARGET_NAME)
set (CUSTOM "\n")
-
+
if(MSVC)
set (CUSTOM "${CUSTOM}\n\
#ifdef _WIN32\n\
@@ -23,7 +23,7 @@ function( GENERATE_MANTID_EXPORT_HEADER TARGET_LIBRARY GENERATE_EXTERN)
#endif\n\n\
")
endif(MSVC)
-
+
set(CUSTOM "${CUSTOM}\
#ifndef UNUSED_ARG\n\
#define UNUSED_ARG(x) (void) x;\n\
@@ -44,9 +44,9 @@ function( GENERATE_MANTID_EXPORT_HEADER TARGET_LIBRARY GENERATE_EXTERN)
#endif /* ${TARGET_NAME}_EXPORTS*/\n\
")
endif(GENERATE_EXTERN)
-
- generate_export_header("${TARGET_LIBRARY}"
- BASE_NAME "MANTID_${TARGET_NAME}"
+
+ generate_export_header("${TARGET_LIBRARY}"
+ BASE_NAME "MANTID_${TARGET_NAME}"
PREFIX_NAME ""
EXPORT_FILE_NAME "Mantid${TARGET_LIBRARY}/DllConfig.h"
EXPORT_MACRO_NAME "MANTID_${TARGET_NAME}_DLL"
diff --git a/buildconfig/CMake/MantidUtils.cmake b/buildconfig/CMake/MantidUtils.cmake
index cbf92fdedba486ed25a50d27e390c27000c1b795..7514f8fb54c5d47af6221a8ec7bae7787e50308f 100644
--- a/buildconfig/CMake/MantidUtils.cmake
+++ b/buildconfig/CMake/MantidUtils.cmake
@@ -4,7 +4,7 @@
#######################################################################
# NAME: SET_TARGET_OUTPUT_DIRECTORY
-# Change the output directory of a library target. Handles the incorrect
+# Change the output directory of a library target. Handles the incorrect
# behaviour of MSVC
# Parameters:
# TARGET - The name of the target
@@ -22,22 +22,22 @@ function( SET_TARGET_OUTPUT_DIRECTORY TARGET OUTPUT_DIR )
set ( LIB_EXT .dll )
endif()
set ( SRC_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR} )
- add_custom_command( TARGET ${TARGET} POST_BUILD
+ add_custom_command( TARGET ${TARGET} POST_BUILD
COMMAND ${CMAKE_COMMAND} ARGS -E make_directory
${OUTPUT_DIR} )
add_custom_command ( TARGET ${TARGET} POST_BUILD
- COMMAND ${CMAKE_COMMAND} ARGS -E echo
+ COMMAND ${CMAKE_COMMAND} ARGS -E echo
"Copying \"$(TargetName)${LIB_EXT}\" to ${OUTPUT_DIR}/$(TargetName)${LIB_EXT}"
COMMAND ${CMAKE_COMMAND} ARGS -E copy
${SRC_DIR}/$(TargetName)${LIB_EXT}
${OUTPUT_DIR}/$(TargetName)${LIB_EXT} )
# Clean up
set ( LIB_EXT )
- set ( SRC_DIR )
+ set ( SRC_DIR )
elseif(CMAKE_GENERATOR STREQUAL Xcode)
- # Because at the moment Xcode does something similar to MSVC and creates
- # Debug/Release directory for the output libraries, we need to copy the
- # library up a level (usually) in order for it to be in the correct place
+ # Because at the moment Xcode does something similar to MSVC and creates
+ # Debug/Release directory for the output libraries, we need to copy the
+ # library up a level (usually) in order for it to be in the correct place
# for python to find it.
# Lets get the location of the output for the given target
@@ -45,8 +45,8 @@ function( SET_TARGET_OUTPUT_DIRECTORY TARGET OUTPUT_DIR )
add_custom_command( TARGET ${TARGET} POST_BUILD
COMMAND ${CMAKE_COMMAND} ARGS -E make_directory
${OUTPUT_DIR})
- add_custom_command (TARGET ${TARGET} POST_BUILD
- COMMAND ${CMAKE_COMMAND} ARGS -E echo
+ add_custom_command (TARGET ${TARGET} POST_BUILD
+ COMMAND ${CMAKE_COMMAND} ARGS -E echo
"Copying \"$<TARGET_FILE:${TARGET}>\" to \"${OUTPUT_DIR}/\" "
COMMAND ${CMAKE_COMMAND} ARGS -E copy
$<TARGET_FILE:${TARGET}>
diff --git a/buildconfig/CMake/Packaging/deb/scripts/deb_pre_rm.in b/buildconfig/CMake/Packaging/deb/scripts/deb_pre_rm.in
index 04630f097c37ec1b5c704ebdc2b4994a327f0811..07dec4fd71a1aabd5ea72a9b071859e97e3069ad 100644
--- a/buildconfig/CMake/Packaging/deb/scripts/deb_pre_rm.in
+++ b/buildconfig/CMake/Packaging/deb/scripts/deb_pre_rm.in
@@ -41,10 +41,10 @@ case "$1" in
fi
fi
;;
-
+
failed-upgrade)
;;
-
+
*)
echo "prerm called with unknown argument \`$1'" >&2
exit 1
diff --git a/buildconfig/CMake/Packaging/launch_mantidplot.vbs b/buildconfig/CMake/Packaging/launch_mantidplot.vbs
index 7d7f62d7fbf9927f9f916eaff0f4c76aad79c8b6..3164010882ca7ad2b9d3cd257810c11c638c0a51 100644
--- a/buildconfig/CMake/Packaging/launch_mantidplot.vbs
+++ b/buildconfig/CMake/Packaging/launch_mantidplot.vbs
@@ -1,6 +1,6 @@
'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
' Launch script for launch_mantidplot.bat
-'
+'
' This is primarily used when launching via an icon. It ensures that the main
' launch_mantiplot.bat script is started with a hidden cmd window and only the
' MantidPlot application is visible.
diff --git a/buildconfig/CMake/Packaging/osx/mantidpython.in b/buildconfig/CMake/Packaging/osx/mantidpython.in
index 982919d2d628178f0379413f99b3d13d94f48dac..ef1eb4a42de7fd820e27692e2c58c7a8c5997bf2 100755
--- a/buildconfig/CMake/Packaging/osx/mantidpython.in
+++ b/buildconfig/CMake/Packaging/osx/mantidpython.in
@@ -20,7 +20,7 @@ INSTALLDIR=${SCRIPT_PATH%/*}
PYTHONHOME=@PYTHONHOME@
if [ -z "${PYTHONHOME}" ]; then
# assume dev build
- PYTHONEXE=@PYTHON_EXECUTABLE@
+ PYTHONEXE=@PYTHON_EXECUTABLE@
else
# assume installed bundle
export PYTHONHOME
@@ -43,7 +43,7 @@ fi
# Find private sip module for PyQt4 or qtpy fails to import
if [ "$QT_API" = "pyqt" ] || [ "$QT_API" = "pyqt4" ]; then
SIP_SO=`${PYTHONEXE} -c"import PyQt4.sip as sip;print(sip.__file__)"`
- LOCAL_PYTHONPATH=`dirname ${SIP_SO}`:${LOCAL_PYTHONPATH}
+ LOCAL_PYTHONPATH=`dirname ${SIP_SO}`:${LOCAL_PYTHONPATH}
fi
if [ -n "$1" ] && [ "$1" = "--classic" ]; then
diff --git a/buildconfig/CMake/UnityBuild.cmake b/buildconfig/CMake/UnityBuild.cmake
index a4a234bf46d6a806997a7c6f2b340b54ecca2894..9704697c45f63baa3cad3d358cde617b8b50907c 100644
--- a/buildconfig/CMake/UnityBuild.cmake
+++ b/buildconfig/CMake/UnityBuild.cmake
@@ -5,15 +5,15 @@ function(enable_unity_build UB_SUFFIX SOURCE_VARIABLE_NAME SOURCE_UNITY_IGNORE U
#limit is zero based conversion of unit_size
math(EXPR LIMIT ${UNIT_SIZE}-1)
set(files ${${SOURCE_VARIABLE_NAME}})
-
+
#counts the number of cpp files up to the threshold
set(counter ${LIMIT})
-
+
#Have one or more unity build files
set(file_number 0 )
set(unit_build_files, "")
foreach(source_file ${files} )
- if(counter EQUAL LIMIT)
+ if(counter EQUAL LIMIT)
set(unit_build_file ${CMAKE_CURRENT_BINARY_DIR}/ub_${file_number}_${UB_SUFFIX}.cpp)
# Open the ub file
FILE(WRITE ${unit_build_file} "// Unity Build generated by CMake\n")
@@ -35,13 +35,13 @@ function(enable_unity_build UB_SUFFIX SOURCE_VARIABLE_NAME SOURCE_UNITY_IGNORE U
set(ignore_source "false")
endif(${source_file} MATCHES ${ignore_file})
endforeach(ignore_file)
-
+
if("true" STREQUAL ${ignore_source})
#Effectivly ignore the cpp files from the build.
set_source_files_properties(${source_file} PROPERTIES HEADER_FILE_ONLY true)
FILE( APPEND ${unit_build_file} "#include <${CMAKE_CURRENT_SOURCE_DIR}/${source_file}>\n")
endif("true" STREQUAL ${ignore_source})
-
+
endforeach(source_file)
set(${SOURCE_VARIABLE_NAME} ${${SOURCE_VARIABLE_NAME}} ${unit_build_files} PARENT_SCOPE)
endfunction(enable_unity_build)
diff --git a/buildconfig/CMake/pyqt4_disable_unnecessary_modules.patch b/buildconfig/CMake/pyqt4_disable_unnecessary_modules.patch
index 0b524720bf727afdb8d7326e883e241ccbb14f00..0d44a7f01d1fefb491cd5cec9fbf0ac259eabfda 100644
--- a/buildconfig/CMake/pyqt4_disable_unnecessary_modules.patch
+++ b/buildconfig/CMake/pyqt4_disable_unnecessary_modules.patch
@@ -4,46 +4,46 @@
# This script generates the PyQt configuration and generates the Makefiles.
#
# Copyright (c) 2016 Riverbank Computing Limited <info@riverbankcomputing.com>
--#
+-#
+#
# This file is part of PyQt4.
--#
+-#
+#
# This file may be used under the terms of the GNU General Public License
# version 3.0 as published by the Free Software Foundation and appearing in
# the file LICENSE included in the packaging of this file. Please review the
# following information to ensure the GNU General Public License version 3.0
# requirements will be met: http://www.gnu.org/copyleft/gpl.html.
--#
+-#
+#
# If you do not wish to use this file under the terms of the GPL version 3.0
# then you may purchase a commercial license. For more information contact
# info@riverbankcomputing.com.
--#
+-#
+#
# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
+
@@ -90,7 +90,7 @@ def find_default_qmake():
-
+
for d in path.split(os.pathsep):
qmake = os.path.join(d, base_qmake)
--
+-
+
if os.access(qmake, os.X_OK):
return qmake
-
+
@@ -109,7 +109,7 @@ def create_optparser():
if not os.path.isdir(value):
raise optparse.OptionValueError("'%s' is not a directory" % value)
setattr(parser.values, option.dest, os.path.abspath(value))
--
+-
+
def store_abspath_file(option, opt_str, value, parser):
if not os.path.isfile(value):
raise optparse.OptionValueError("'%s' is not a file" % value)
@@ -342,8 +342,8 @@ class ConfigurePyQt4:
-
+
check_module("QtGui", "qwidget.h", "new QWidget()")
check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")")
- check_module("QtMultimedia", "QAudioDeviceInfo",
@@ -51,7 +51,7 @@
+ # check_module("QtMultimedia", "QAudioDeviceInfo",
+ # "new QAudioDeviceInfo()")
check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()")
-
+
# Qt v4.7 was current when we added support for QtDBus and we didn't
@@ -364,14 +364,14 @@ class ConfigurePyQt4:
extra_libs=sql_libs)
@@ -69,18 +69,18 @@
+ # check_module("QtAssistant", "qassistantclient.h",
+ # "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
+ # extra_libs=ass_libs)
-
+
if qt_shared == '':
sipconfig.inform("QtDesigner module disabled with static Qt libraries.")
@@ -503,8 +503,8 @@ class ConfigurePyQt4:
if "QtTest" in pyqt_modules:
generate_code("QtTest")
-
+
- if "QtWebKit" in pyqt_modules:
- generate_code("QtWebKit")
+ # if "QtWebKit" in pyqt_modules:
+ # generate_code("QtWebKit")
-
+
if "QtXml" in pyqt_modules:
generate_code("QtXml")
@@ -1511,7 +1511,7 @@ def needed_qt_libs(mname, qt_libs):
diff --git a/buildconfig/CMake/span_disable_testing.patch b/buildconfig/CMake/span_disable_testing.patch
index 6d2b0b1a01e9618b12c357a088acd68afe0dc3f5..739d81b6b54c0739c0c19196c17b35c8dd34b4e0 100644
--- a/buildconfig/CMake/span_disable_testing.patch
+++ b/buildconfig/CMake/span_disable_testing.patch
@@ -5,15 +5,15 @@ index 7ad07e2..0470696 100644
@@ -2,7 +2,7 @@
cmake_minimum_required(VERSION 3.8)
project(span LANGUAGES CXX)
-
+
-enable_testing()
+# enable_testing()
-
+
add_library(span INTERFACE)
target_sources(span INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include/tcb/span.hpp)
@@ -11,4 +11,4 @@ target_compile_features(span INTERFACE cxx_std_11)
-
+
set(TCB_SPAN_TEST_CXX_STD 11 CACHE STRING "C++ standard version for testing")
-
+
-add_subdirectory(test)
+# add_subdirectory(test)
diff --git a/buildconfig/coverity_model.c b/buildconfig/coverity_model.c
index c8db0c45d66b42a33ac4f6e644e67404cbe38102..faa6318f40db940b43334ddee70b2fec9aa8865d 100644
--- a/buildconfig/coverity_model.c
+++ b/buildconfig/coverity_model.c
@@ -15,4 +15,3 @@
* must be uploaded by an admin in the analysis settings of
* http://scan.coverity.com/projects/2832
*/
-
\ No newline at end of file
diff --git a/buildconfig/pyport.patch b/buildconfig/pyport.patch
index 6a317302232d1274d74d87d87830de13abc3c196..03fefffe34cbeac5422dcca1dd63eff2653f8ae6 100644
--- a/buildconfig/pyport.patch
+++ b/buildconfig/pyport.patch
@@ -3,7 +3,7 @@ diff --git a/pyport.h b/pyport.h
+++ b/pyport.h
@@ -657,6 +657,9 @@
#endif
-
+
#ifdef _PY_PORT_CTYPE_UTF8_ISSUE
+
+#ifndef __cplusplus
@@ -18,9 +18,9 @@ diff --git a/pyport.h b/pyport.h
-#endif
+
+#endif /* !__cplusplus */
-+
++
+
+#endif /* _PY_PORT_CTYPE_UTF8_ISSUE */
-
-
+
+
/* Declarations for symbol visibility.
diff --git a/buildconfig/wrap_pyui.py b/buildconfig/wrap_pyui.py
index dd4e5c3585b29cd7fa6d772169b17fb13587a61c..f5f4c6649c322fe842267a4bb23b07d1170b1544 100644
--- a/buildconfig/wrap_pyui.py
+++ b/buildconfig/wrap_pyui.py
@@ -17,17 +17,17 @@ def lines_to_pre_append():
def main(argv):
"""
Main entry point
-
+
Args:
argv (list): List of strings giving command line arguments The full absolulte path to the file to wrap is mandatory.
-
+
"""
-
+
argv.reverse()
to_wrap = argv[0]
if not os.path.exists(to_wrap):
raise ValueError("%s : Does not exist." % to_wrap)
-
+
with open(to_wrap, "r+", encoding="UTF-8") as f:
existing = f.read();
f.seek(0);
@@ -35,7 +35,7 @@ def main(argv):
for line in lines_to_pre_append():
f.write(line)
f.write(existing)
-
+
return 0
if __name__ == '__main__':
diff --git a/dev-docs/source/BuildingOnOSX.rst b/dev-docs/source/BuildingOnOSX.rst
index cec083a63e4a1b6f58abddb4618e7a60830089d6..ba3f7458da21d1b18202227026b0d6f3998abcd9 100644
--- a/dev-docs/source/BuildingOnOSX.rst
+++ b/dev-docs/source/BuildingOnOSX.rst
@@ -13,7 +13,7 @@ Building on OS X
:local:
-The minimum supported version of macOS is High Sierra (10.13).
+The minimum supported version of macOS is High Sierra (10.13).
These instructions are from the assumptions of a blank newly installed version of High Sierra using Homebrew for dependency management.
@@ -71,7 +71,7 @@ In order to be able to 'tap' the ``mantidproject/mantid`` 'tap' we need to have
.. code-block:: sh
- python3 -m pip install setuptools==48.0.0
+ python3 -m pip install setuptools==48.0.0
10. Install python requirements
diff --git a/dev-docs/source/BuildingOnOSXHistoric.rst b/dev-docs/source/BuildingOnOSXHistoric.rst
index dca29dee10759490b7c980565d5aa78bbab52b00..e2ec7fea3043a640e4cc46f4fe6f6869b601cbf8 100644
--- a/dev-docs/source/BuildingOnOSXHistoric.rst
+++ b/dev-docs/source/BuildingOnOSXHistoric.rst
@@ -15,8 +15,8 @@ OS X 10.9 using clang and macports
*Disclaimer*
-This instruction considers that you either use macports or need them for your other development projects. It also
-considers that you need to compile Mantid by yourself. In other cases please either `download a Mantid dmg package <http://download.mantidproject.org/>`_ or follow the instructions below. Warning:
+This instruction considers that you either use macports or need them for your other development projects. It also
+considers that you need to compile Mantid by yourself. In other cases please either `download a Mantid dmg package <http://download.mantidproject.org/>`_ or follow the instructions below. Warning:
it is not recommended to have both, homebrew and macports installed simultaneously on one mac.
Instruction
@@ -34,7 +34,7 @@ Instruction
1. Download the source code from the `NeXus developers website <http://download.nexusformat.org/kits/>`_.
2. Build and install it:
-
+
.. code-block:: sh
% ./configure --prefix=/opt/local
@@ -42,10 +42,10 @@ Instruction
% sudo make install
You may need to install additional packages to be able to build libNeXus.
-
+
3. libNeXus must be recompiled after update of the macports if it's dependencies have been updated. Otherwise it may depend on some non-existent libraries.
-
-- jsoncpp: ``mantid/Code/Mantid/Framework/DataObjects/src/NoShape.cpp`` line 3 contains: ``#include <jsoncpp/json/json.h>`` but in macports there is no ``jsoncpp`` folder in the ``/opt/local/include``, ``json.h`` is located in ``/opt/local/include/json``. As a temporary solution, you may create a symbolic link:
+
+- jsoncpp: ``mantid/Code/Mantid/Framework/DataObjects/src/NoShape.cpp`` line 3 contains: ``#include <jsoncpp/json/json.h>`` but in macports there is no ``jsoncpp`` folder in the ``/opt/local/include``, ``json.h`` is located in ``/opt/local/include/json``. As a temporary solution, you may create a symbolic link:
.. code-block:: sh
@@ -57,10 +57,10 @@ Instruction
.. code-block:: sh
- cmake -DCMAKE_C_COMPILER=/usr/bin/clang \
+ cmake -DCMAKE_C_COMPILER=/usr/bin/clang \
-DCMAKE_CXX_COMPILER=/usr/bin/clang++ -G 'Unix Makefiles' \
- -DCMAKE_PREFIX_PATH=/opt/local \
- -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_PREFIX_PATH=/opt/local \
+ -DCMAKE_BUILD_TYPE=Release \
-DENABLE_CPACK=True \
-DPOCO_INCLUDE_DIR=/opt/local/include \
-DQWTPLOT3D_INCLUDE_DIR=/opt/local/include/qwtplot3d \
@@ -74,7 +74,7 @@ Instruction
-DSPHINX_EXECUTABLE=/opt/local/bin/sphinx-build-2.7 \
-DPACKAGE_DOCS=FALSE \
-DDOCS_HTML=TRUE \
- -DPYQT4_PATH=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/PyQt4 \
+ -DPYQT4_PATH=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/PyQt4 \
-DSITEPACKAGES_PATH=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages \
-DOPENSSL_ROOT_DIR=/opt/local \
-DMACPORTS=TRUE \
@@ -89,7 +89,7 @@ Instruction
##########################################
OS X 10.10 and 10.11 using clang and Xcode
##########################################
-These instructions are from the assumptions of a blank newly installed Mac and want to use the system python. Other python distributions may work but have not been tested.
+These instructions are from the assumptions of a blank newly installed Mac and want to use the system python. Other python distributions may work but have not been tested.
1. First install Xcode and then clone the mantid git repository.
@@ -144,7 +144,7 @@ In order to be able to 'tap' the ``mantidproject/mantid`` 'tap' we need to have
brew install pyqt --build-from-source
brew install qscintilla2 --build-from-source --without-python3
brew install poco --c++11
- brew install boost --c++11
+ brew install boost --c++11
# boost-python brings in homebrew's python if installed with --build-bottle.
brew install boost-python --c++11 --build-from-source
brew install gsl
@@ -182,7 +182,7 @@ In order to be able to 'tap' the ``mantidproject/mantid`` 'tap' we need to have
sudo -H pip install sphinx
# https://github.com/mantidproject/mantid/issues/13481
sudo -H pip install "ipython[notebook]==3.2.1"
- # qtconsole only required with ipython 4+
+ # qtconsole only required with ipython 4+
#sudo -H pip install qtconsole
sudo -H pip install qtpy
sudo -H pip install pygments
@@ -227,7 +227,7 @@ In order to be able to 'tap' the ``mantidproject/mantid`` 'tap' we need to have
.. code-block:: sh
- cd /System/Library/Frameworks/Python.framework/Headers
+ cd /System/Library/Frameworks/Python.framework/Headers
then
@@ -236,10 +236,10 @@ In order to be able to 'tap' the ``mantidproject/mantid`` 'tap' we need to have
sudo cp pyport.h pyport.h.original
sudo patch pyport.h $MANTIDCHECKOUTROOT/buildconfig/pyport.patch
-- If building with Xcode on OS X Yosemite
+- If building with Xcode on OS X Yosemite
.. code-block:: sh
-
+
cd /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
@@ -268,7 +268,7 @@ Troubleshooting
2. If you have upgraded to Mavericks (OS X 10.9) from a previous version of OS X with homebrew already installed then you may encounter some issues related to the fact that the default std lib has changed. The easiest way to avoid this is to remove and then re-install all your formulas.
3. You may find that if you build the ``MantidPlot`` target then you will get errors when you run, such as *Can't start python* and *Cannot load Curve Fitting Plugins*, this is due to the fact that the MantidPlot target does not contain all the dependencies. You are best, if you are unsure of the hierarchy, to just use the ALL_BUILD target and then just switch to the MantidPlot target in order to run.
4. NOTE that you might need to run ``./MantidPlot.app/Contents/MacOS/MantidPlot`` from the ``BUILD-DIR/bin`` (instead of ``open MantidPlot.app`` OR ``./MantidPlot`` from ``BUILD-DIR/bin/MantidPlot.app/Contents/MacOS/``) to get the library paths correct. Otherwise the issues above might show up (at least on OS X 10.11 El Capitan).
-5. Upgrading HDF5 requires also rebuilding nexusformat, and h5py.
+5. Upgrading HDF5 requires also rebuilding nexusformat, and h5py.
##########
@@ -277,7 +277,7 @@ OS X 10.12
The following instructions setup the build environment for mantid using clang compiler and python provided by the system, and all the other dependencies installed with brew. The drawback is that one has little control over python version and OpenMP will not be found. Make sure you have Qt Creator IDE and optionally cmake (GUI) app installed.
1. Install Xcode from AppStore
-2. Install Xcode command line tools
+2. Install Xcode command line tools
.. code-block:: sh
@@ -364,7 +364,7 @@ If, while configuring Mantid, cmake complains that it cannot find sip, uninstall
sudo pip install sphinx_bootstrap_theme
sudo pip install psutil
sudo pip install "matplotlib>=2.1.2"
- sudo pip install requests==2.9.1
+ sudo pip install requests==2.9.1
9. Install h5py
@@ -381,7 +381,7 @@ If, while configuring Mantid, cmake complains that it cannot find sip, uninstall
11. Git clone the mantid repository
-12. Disable the system integrity protection (SIP). To do this
+12. Disable the system integrity protection (SIP). To do this
- restart the computer
- before the apple logo appears press `Command+R` to enter the recovery mode
@@ -390,7 +390,7 @@ If, while configuring Mantid, cmake complains that it cannot find sip, uninstall
.. code-block:: sh
csrutil disable
-
+
- reboot again
13. Now that SIP is disabled we can do the necessary patch:
@@ -416,7 +416,7 @@ If, while configuring Mantid, cmake complains that it cannot find sip, uninstall
PATH=/usr/local/bin/:$PATH
Local bin contains the symlink to the brew packages, which have to come first in path, before `/usr/bin`. That's why it is important not to have python or clang (with this setup) in brew.
-
+
16. Add to your `.profile`
diff --git a/dev-docs/source/Communication.rst b/dev-docs/source/Communication.rst
index 4344a5157a0619472ec79800774afb8f8dcd016f..f2c727ab573c3c8ebe65a3579fb3734d2c783f2d 100644
--- a/dev-docs/source/Communication.rst
+++ b/dev-docs/source/Communication.rst
@@ -2,7 +2,7 @@
.. toctree::
:hidden:
-
+
DevelopmentTeam
Communication
diff --git a/dev-docs/source/DoxygenSetup.rst b/dev-docs/source/DoxygenSetup.rst
index 0c7f3b2d2104fe1842c126c3a01200bc49ca7808..e5eeee0fc33709b80b2024501484b76d135229e8 100644
--- a/dev-docs/source/DoxygenSetup.rst
+++ b/dev-docs/source/DoxygenSetup.rst
@@ -33,7 +33,7 @@ Visual Studio Doxygen Setup
| Rerun CMake | Run cmake for the build to ensure that the Mantid.doxyfile is created |
+-----------------+-----------------------------------------------------------------------------------------+
| Add VC++ Tool: | - Tools\External Tool then click Add |
-| "DoxyGen" | - Title: &DoxyGen |
+| "DoxyGen" | - Title: &DoxyGen |
| | - Command: C:\Program Files\Doxygen\bin\doxygen.exe |
| | - Arguments: "$(SolutionDir)\Framework\Doxygen\Mantid.doxyfile" (include the quotes!) |
| | - Initial Directory: $(SolutionDir)\Build |
diff --git a/dev-docs/source/Eclipse.rst b/dev-docs/source/Eclipse.rst
index d70bcf58e9485ea71ab3af5f416d6c57f4285226..295c319c31027c6e6fbda1776465212bd70eda6e 100644
--- a/dev-docs/source/Eclipse.rst
+++ b/dev-docs/source/Eclipse.rst
@@ -6,7 +6,7 @@ Eclipse on Ubuntu
.. contents::
:local:
-
+
Prerequisites
################
1.
@@ -15,7 +15,7 @@ Follow the getting started guide and building with cmake, but stop before actual
2.
Install the JRE by running sudo apt-get install default-jre
-
+
Installing Eclipse
###################
1.
@@ -25,11 +25,11 @@ run the following in terminal
.. code-block:: sh
- sudo add-apt-repository ppa:ubuntu-desktop/ubuntu-make
+ sudo add-apt-repository ppa:ubuntu-desktop/ubuntu-make
sudo apt update
sudo apt install ubuntu-make
-
-
+
+
This will add the umake repository to the list of repositories then install umake
2.
@@ -40,7 +40,7 @@ run the following in terminal
.. code-block:: sh
umake ide eclipse-cpp
-
+
leave the installation path to the default
3.
@@ -50,14 +50,14 @@ run the following in terminal
.. code-block:: sh
- gedit .bashrc
-
-then scroll to the bottom of the file and add
+ gedit .bashrc
+
+then scroll to the bottom of the file and add
.. code-block:: sh
export PATH=$PATH:/path/to/eclipse-cpp-folder/
-
+
then save and exit gedit, and restart terminal.
type eclipse into command line, it should open.
@@ -68,29 +68,29 @@ Install gdb by running
.. code-block:: sh
sudo apt install gdb
-
-
+
+
Building with CMake
######################
1.
-from the pre-requisites section, you should already have installed/setup everything to the point where you are ready to run CMake, create two
+from the pre-requisites section, you should already have installed/setup everything to the point where you are ready to run CMake, create two
folders, one for debugging in eclipse "eclipseDebug" and one for quick test runs EclipseTest
-
-Enter eclipseDebug and run
+
+Enter eclipseDebug and run
.. code-block:: sh
-
- cmake -G"Eclipse CDT4 - Ninja" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT=TRUE -DCXXTEST_ADD_PERFORMANCE=TRUE -DENABLE_WORKBENCH=TRUE /path/to/mantidrepository
-
-
+ cmake -G"Eclipse CDT4 - Ninja" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT=TRUE -DCXXTEST_ADD_PERFORMANCE=TRUE -DENABLE_WORKBENCH=TRUE /path/to/mantidrepository
+
+
+
then enter eclipseTest and run
.. code-block:: sh
-
+
cmake -G"Ninja" -DCMAKE_BUILD_TYPE=Release -DCXXTEST_ADD_PERFORMANCE=TRUE -DENABLE_WORKBENCH=TRUE /path/to/mantidrepository
-
+
2.
open eclipse, leaving your workspace as it is, then go to ``File>Import>General>Existing Projects into Workspace`` and then click next
click browse and find eclipseDebug folder and then add it to eclipse
diff --git a/dev-docs/source/FlowchartCreation.rst b/dev-docs/source/FlowchartCreation.rst
index 8b1db35c64aec5b0e6eabb11486d45221222fe25..d5a1aebc38e599f5afe0973991cb57404a575f61 100644
--- a/dev-docs/source/FlowchartCreation.rst
+++ b/dev-docs/source/FlowchartCreation.rst
@@ -8,7 +8,7 @@ Flowchart Creation
:local:
-The flowchart diagrams are created by writing ``graphviz`` .dot files that describe the diagram in plain text, and placing them into ``docs/source/diagrams``. These can then be rendered in documentation by using the diagram directive in an .rst file:
+The flowchart diagrams are created by writing ``graphviz`` .dot files that describe the diagram in plain text, and placing them into ``docs/source/diagrams``. These can then be rendered in documentation by using the diagram directive in an .rst file:
.. code-block:: rest
diff --git a/dev-docs/source/ISISReflectometryInterface.rst b/dev-docs/source/ISISReflectometryInterface.rst
index 5197dabb1ea6b7a8b95a32445f68b8652222f2e9..ca9b5d9a0784ee3301d00adedf96dec7bb308063 100644
--- a/dev-docs/source/ISISReflectometryInterface.rst
+++ b/dev-docs/source/ISISReflectometryInterface.rst
@@ -37,7 +37,7 @@ Briefly the structure is as follows:
.. figure:: images/ISISReflectometryInterface_structure.png
:figwidth: 70%
:align: center
-
+
:code:`Reduction`
#################
@@ -103,7 +103,7 @@ Avoid use of Qt types outside of Qt classes
Qt-specific types such as :code:`QString`, :code:`QColor` and subclasses of :code:`QWidget` should be kept out of the presenters and models. This avoids confusion over which types should be used and a potentially messy situation where we are always having to convert back and forth between Qt types and :code:`std` types. It also avoids an over-reliance on Qt, so that the view could be swapped out in future to one using a different framework, with little or no changes to the presenters and models.
-To help make it clear where Qt is used, all classes that use Qt (namely the views, along with a few supporting classes which wrap or subclass :code:`QObject`) are named with a :code:`Qt` prefix in their file and class names. Conversion from types like :code:`QString` to :code:`std::string` is performed within the views, and no Qt types are present in their interfaces.
+To help make it clear where Qt is used, all classes that use Qt (namely the views, along with a few supporting classes which wrap or subclass :code:`QObject`) are named with a :code:`Qt` prefix in their file and class names. Conversion from types like :code:`QString` to :code:`std::string` is performed within the views, and no Qt types are present in their interfaces.
Keep the reduction configuration up to date
###########################################
@@ -258,7 +258,7 @@ The :code:`MainWindowPresenter` constructs the child Batch presenters on demand.
- it returns the result as an :code:`IBatchPresenter`.
- The :code:`IBatchPresenter` is then added to the :code:`MainWindowPresenter`'s list of child presenters.
-
+
The :code:`MainWindowPresenter` therefore creates, and owns, the :code:`BatchPresenter`, but does not need to know its concrete type. In turn, the :code:`BatchPresenterFactory` creates the child :code:`EventPresenter` and injects this into the :code:`BatchPresenter`, also without knowing the child's concrete type. As mentioned in the `Dependency inversion`_ section, this helps testability by allowing us to replace the real dependencies with mock objects.
Testing
@@ -284,7 +284,7 @@ Let's look at the presenter-view interactions in the :code:`Event` component as
class MockEventView : public IEventView {
public:
MOCK_METHOD1(subscribe, void(EventViewSubscriber *));
-
+
- The presenter then uses :code:`EXPECT_CALL` to check that the method was called. Note that for :code:`subscribe` it is difficult to check that the correct presenter pointer is passed because of the two-way dependency in the construction, so we just check that it is called with any argument; for other methods we typically want to check the exact arguments.
.. code-block:: c++
@@ -310,7 +310,7 @@ Let's look at the presenter-view interactions in the :code:`Event` component as
UniformSlicingByNumberOfSlices(expectedSliceCount));
verifyAndClear();
}
-
+
.. code-block:: c++
void testChangingSliceCountNotifiesMainPresenter() {
diff --git a/dev-docs/source/ISISSANSReductionBackend.rst b/dev-docs/source/ISISSANSReductionBackend.rst
index 07d92528c35023b19d2e4cf16c1ec9a6463da75f..4665cbd9b2a13ab9bef56ba6aa25a7e42469e944 100644
--- a/dev-docs/source/ISISSANSReductionBackend.rst
+++ b/dev-docs/source/ISISSANSReductionBackend.rst
@@ -1037,8 +1037,8 @@ manual selection takes precedence.
*Normalize To SANS Monitor*
---------------------------
-This step provides a monitor normalization workspace for subsequent
-wavelength correction in :ref:`algm-Q1D` or :ref:`algm-Qxy`.
+This step provides a monitor normalization workspace for subsequent
+wavelength correction in :ref:`algm-Q1D` or :ref:`algm-Qxy`.
The user can provide a *ScaleFactor* which is
normally obtained during event slicing.
diff --git a/dev-docs/source/IssueTracking.rst b/dev-docs/source/IssueTracking.rst
index 8e37c7b555a64e76fff8d24cbb55b6bdd395a471..5df0a40608b1b73f7c63c795d17714e3c85d523e 100644
--- a/dev-docs/source/IssueTracking.rst
+++ b/dev-docs/source/IssueTracking.rst
@@ -94,10 +94,10 @@ to refer to either an issue or a PR on this page*)
right away, for instance if it relates to a bug which affects a
large number of users. If you are unsure about an issue that could
be high priority, discuss with a senior developer. Issues marked
- high priority must also have a justification for the priority
+ high priority must also have a justification for the priority
stated in the ticket
- **No priority set** - use this for tickets of intermediate priority
- this will probably be your default setting, most issues will fall
+ this will probably be your default setting, most issues will fall
into this category
- **Priority: Low** - use this for the "nice to have" tickets
this means that they are not necessarily urgent but can be
@@ -119,10 +119,10 @@ to refer to either an issue or a PR on this page*)
ZenHub
^^^^^^
-Using the ZenHub browser extension set an estimate, this should be the number of
+Using the ZenHub browser extension set an estimate, this should be the number of
days you expect to take from begining to work on an issue, to opening a pull-request about it.
-Once you actually begin working on the issue change the pipeline to In Progress,
-then again to Review/QA when you open a pull-request for it. This will be used to to aid with
+Once you actually begin working on the issue change the pipeline to In Progress,
+then again to Review/QA when you open a pull-request for it. This will be used to to aid with
future estimations of time for an issue.
diff --git a/dev-docs/source/MVPTutorial/AddButton.rst b/dev-docs/source/MVPTutorial/AddButton.rst
index c1fd40badfae25123941d944ae81bacda5c34ee4..0cf17f130f302ab138aa89aa09de8ff923c2eade 100644
--- a/dev-docs/source/MVPTutorial/AddButton.rst
+++ b/dev-docs/source/MVPTutorial/AddButton.rst
@@ -69,7 +69,7 @@ all been saved in ``view.py``, the ``main.py`` will contain:
from qtpy import QtWidgets
import sys
-
+
import view
"""
diff --git a/dev-docs/source/MVPTutorial/ExtractInfoFromView.rst b/dev-docs/source/MVPTutorial/ExtractInfoFromView.rst
index e7eb3289524f288e8b3712fad766fc394766f195..f9b2ae3ae5c5f1cf42a7cf18141dd5728af1e016 100644
--- a/dev-docs/source/MVPTutorial/ExtractInfoFromView.rst
+++ b/dev-docs/source/MVPTutorial/ExtractInfoFromView.rst
@@ -30,19 +30,19 @@ be used.
# add widgets to layout
self.sub_layout = QtWidgets.QHBoxLayout()
- self.sub_layout.addWidget(self.label)
+ self.sub_layout.addWidget(self.label)
self.sub_layout.addWidget(self.button)
-
+
grid = QtWidgets.QVBoxLayout(self)
grid.addLayout(self.sub_layout)
-
+
self.value = QtWidgets.QLineEdit()
- grid.addWidget(self.value)
+ grid.addWidget(self.value)
+
-
# set the layout for the view widget
self.setLayout(grid)
-
+
#send signals
def btn_click(self):
print ("hellow from view")
diff --git a/dev-docs/source/MVPTutorial/Matplotlib.rst b/dev-docs/source/MVPTutorial/Matplotlib.rst
index c6d0dd546636f1add26b4f04a343619ce1f31ff2..4c3c4bfaef0f3066d658e12f78bb9f9d9710a4ef 100644
--- a/dev-docs/source/MVPTutorial/Matplotlib.rst
+++ b/dev-docs/source/MVPTutorial/Matplotlib.rst
@@ -46,10 +46,10 @@ the plot and creating an empty plot (no data).
self.figure = plt.figure()
grid = QtWidgets.QVBoxLayout(self)
- self.draw()
+ self.draw()
self.canvas = self.getWidget()
grid.addWidget(self.canvas)
- self.setLayout(grid)
+ self.setLayout(grid)
def draw(self):
ax = self.figure.add_subplot(111)
@@ -66,7 +66,7 @@ the plot and creating an empty plot (no data).
def addData(self, xvalues, yvalues, grid_lines, colour, marker):
ax = self.draw()
ax.grid(grid_lines)
- ax.plot(xvalues, yvalues, color=colour, marker=marker, linestyle="--")
+ ax.plot(xvalues, yvalues, color=colour, marker=marker, linestyle="--")
self.canvas.draw()
The ``draw`` method creates the plot area without any data. The widget
diff --git a/dev-docs/source/MVPTutorial/Mocking.rst b/dev-docs/source/MVPTutorial/Mocking.rst
index f82df74d058c4dc60f5ea4ebb56ddf649b0f10e6..88e13fdfdca6357beab0038d0d89b8bea8459040 100644
--- a/dev-docs/source/MVPTutorial/Mocking.rst
+++ b/dev-docs/source/MVPTutorial/Mocking.rst
@@ -34,12 +34,12 @@ The test class is then initialised:
class PresenterTest(unittest.TestCase):
def setUp(self):
self.view = mock.create_autospec(view.View)
-
+
# mock view
self.view.doSomethingSignal = mock.Mock()
self.view.btn_click = mock.Mock()
self.view.getValue = mock.Mock(return_value=3.14)
-
+
self.presenter = presenter.Presenter(self.view)
``create_autospec`` mocks the class contained within the brackets. We
diff --git a/dev-docs/source/MVPTutorial/MockingExercise.rst b/dev-docs/source/MVPTutorial/MockingExercise.rst
index bd9cf4c643b66017adfce905eaafa4f7fc50670f..a0353e43ae5fa0b735ab7b431777e60197303150 100644
--- a/dev-docs/source/MVPTutorial/MockingExercise.rst
+++ b/dev-docs/source/MVPTutorial/MockingExercise.rst
@@ -8,4 +8,4 @@ mocked and the return values should be present only when necessary (on
this occasion the values do not matter). The ``updatePlot`` function
should be tested to make sure that it calls the correct methods.
-See :ref:`here <MockingExerciseSolution>` for the solution.
+See :ref:`here <MockingExerciseSolution>` for the solution.
diff --git a/dev-docs/source/MVPTutorial/MockingExerciseSolution.rst b/dev-docs/source/MVPTutorial/MockingExerciseSolution.rst
index 14f0196d1ae91e21fe76c51ef10aa77e3fc90e5a..eb3957f64f8f41f0be4a99473e2b5ab36048b7b7 100644
--- a/dev-docs/source/MVPTutorial/MockingExerciseSolution.rst
+++ b/dev-docs/source/MVPTutorial/MockingExerciseSolution.rst
@@ -29,7 +29,7 @@ Mocking Exercise Solution
self.view.setTableRow = mock.Mock()
self.view.addWidgetToTable = mock.Mock()
self.view.addITemToTable = mock.Mock()
-
+
self.presenter = presenter.Presenter(self.view)
def test_updatePlot(self):
diff --git a/dev-docs/source/MVPTutorial/ModelExercise.rst b/dev-docs/source/MVPTutorial/ModelExercise.rst
index c863ce1fef648a1aa090c04018b84f8686f83f12..b8f4fbbf794dd0ceaae7aae3556ddd88b65e8989 100644
--- a/dev-docs/source/MVPTutorial/ModelExercise.rst
+++ b/dev-docs/source/MVPTutorial/ModelExercise.rst
@@ -15,4 +15,4 @@ achieve this you will need to add:
#. In the initialisation of the presenter get the allowed colours from
the model and pass them to the view.
-See :ref:`here <ModelExerciseSolution>` for the solution.
+See :ref:`here <ModelExerciseSolution>` for the solution.
diff --git a/dev-docs/source/MVPTutorial/ModelExerciseSolution.rst b/dev-docs/source/MVPTutorial/ModelExerciseSolution.rst
index c85b3ac1a648ff37215a7cdeb1e06d1db79a3f55..d108ee36a461336aeccc7b81ff9d2bfcf3f6ea4c 100644
--- a/dev-docs/source/MVPTutorial/ModelExerciseSolution.rst
+++ b/dev-docs/source/MVPTutorial/ModelExerciseSolution.rst
@@ -27,7 +27,7 @@ The presenter initialisation should now be:
def __init__(self, view, data_model, colour_list):
self.view = view
self.data_model = data_model
-
+
self.view.setColours(colour_list)
# connect statements
self.view.plotSignal.connect(self.updatePlot)
diff --git a/dev-docs/source/MVPTutorial/MultipleViews.rst b/dev-docs/source/MVPTutorial/MultipleViews.rst
index 8ceb06a0edd09acf953b6b6dfe928318d7a20769..e70d8a35e9083f42666f12ae17dd7268d8e44ec4 100644
--- a/dev-docs/source/MVPTutorial/MultipleViews.rst
+++ b/dev-docs/source/MVPTutorial/MultipleViews.rst
@@ -34,7 +34,7 @@ previous section into a single view. To achieve this we will create a
self.options_view = view.View(parent=self)
grid.addWidget(self.plot_view)
- grid.addWidget(self.options_view)
+ grid.addWidget(self.options_view)
self.setLayout(grid)
The important thing to note here is that when the PlotView and View
diff --git a/dev-docs/source/MVPTutorial/PresenterExercise.rst b/dev-docs/source/MVPTutorial/PresenterExercise.rst
index edb8c97f815535c35f7a01bc68b2c534f3b13ba3..ad5a838c34ab6edaf1c2edffe4c2ca3b57dd3b2c 100644
--- a/dev-docs/source/MVPTutorial/PresenterExercise.rst
+++ b/dev-docs/source/MVPTutorial/PresenterExercise.rst
@@ -15,4 +15,4 @@ is pressed the following should be output:
The ``main`` module will also need updating to handle these changes.
-See :ref:`here <PresenterExerciseSolution>` for the solution.
+See :ref:`here <PresenterExerciseSolution>` for the solution.
diff --git a/dev-docs/source/MVPTutorial/PresenterExerciseSolution.rst b/dev-docs/source/MVPTutorial/PresenterExerciseSolution.rst
index d366805acc07eea37fc544794216e8640ae00997..28d4add5c55ada6c59fad425e6d41d6c900861ff 100644
--- a/dev-docs/source/MVPTutorial/PresenterExerciseSolution.rst
+++ b/dev-docs/source/MVPTutorial/PresenterExerciseSolution.rst
@@ -25,8 +25,8 @@ View
self.table = QtWidgets.QTableWidget(self)
self.table.setRowCount(4)
self.table.setColumnCount(2)
-
- grid.addWidget(self.table)
+
+ grid.addWidget(self.table)
self.colours = QtWidgets.QComboBox()
options=["Blue", "Green", "Red"]
@@ -36,7 +36,7 @@ View
self.grid_lines.setFlags(QtCore.Qt.ItemIsUserCheckable | QtCore.Qt.ItemIsEnabled)
self.grid_lines.setCheckState(QtCore.Qt.Unchecked)
self.addItemToTable("Show grid lines", self.grid_lines, 1)
-
+
self.freq = QtWidgets.QTableWidgetItem("1.0")
self.phi = QtWidgets.QTableWidgetItem("0.0")
@@ -47,7 +47,7 @@ View
self.plot = QtWidgets.QPushButton('Add', self)
self.plot.setStyleSheet("background-color:lightgrey")
- grid.addWidget(self.plot)
+ grid.addWidget(self.plot)
self.setLayout(grid)
@@ -55,7 +55,7 @@ View
def getColour(self):
return self.colours.currentText()
-
+
def getGridLines(self):
return self.grid_lines.checkState() == QtCore.Qt.Checked
@@ -78,12 +78,12 @@ View
self.setTableRow(name, row)
col = 1
self.table.setCellWidget(row, col, widget)
-
+
def addItemToTable(self, name, widget, row):
self.setTableRow(name, row)
col = 1
self.table.setItem(row, col, widget)
-
+
Presenter
#########
@@ -97,9 +97,9 @@ Presenter
def __init__(self, view):
self.view = view
- self.view.plotSignal.connect(self.updatePlot)
-
- # handle signals
+ self.view.plotSignal.connect(self.updatePlot)
+
+ # handle signals
def updatePlot(self):
print("The table settings are:")
print(" colour : " + str(self.view.getColour()))
diff --git a/dev-docs/source/MVPTutorial/ReceivingSignalFromView.rst b/dev-docs/source/MVPTutorial/ReceivingSignalFromView.rst
index 1a63157d121b9496b444f6dbd0fa4faf99b3183f..9429e29785003a02188912572b327a8912f2eb00 100644
--- a/dev-docs/source/MVPTutorial/ReceivingSignalFromView.rst
+++ b/dev-docs/source/MVPTutorial/ReceivingSignalFromView.rst
@@ -37,14 +37,14 @@ pressed. First we will start with the view:
# add widgets to layout
self.sub_layout = QtWidgets.QHBoxLayout()
- self.sub_layout.addWidget(self.label)
+ self.sub_layout.addWidget(self.label)
self.sub_layout.addWidget(self.button)
-
+
grid = QtWidgets.QVBoxLayout(self)
grid.addLayout(self.sub_layout)
# set the layout for the view widget
self.setLayout(grid)
-
+
#send signals
def btn_click(self):
print ("hellow from view")
@@ -71,9 +71,9 @@ custom signal from the view to its own function (``handleButton``).
def __init__(self, view):
self.view = view
- self.view.doSomethingSignal.connect(self.handleButton)
-
- # handle signals
+ self.view.doSomethingSignal.connect(self.handleButton)
+
+ # handle signals
def handleButton(self):
print("hello world, from the presenter")
diff --git a/dev-docs/source/MVPTutorial/ViewExercise1Solution.rst b/dev-docs/source/MVPTutorial/ViewExercise1Solution.rst
index d3d98b8b537b22bbffb05abe76d470461aa2db88..36bbb98576478acd45f555293c0f907e3eb32acb 100644
--- a/dev-docs/source/MVPTutorial/ViewExercise1Solution.rst
+++ b/dev-docs/source/MVPTutorial/ViewExercise1Solution.rst
@@ -62,7 +62,7 @@ view.py
self.table = QtWidgets.QTableWidget(self)
self.table.setRowCount(4)
self.table.setColumnCount(2)
- grid.addWidget(self.table)
+ grid.addWidget(self.table)
self.colours = QtWidgets.QComboBox()
options = ["Blue", "Green", "Red"]
@@ -83,7 +83,7 @@ view.py
self.plot = QtWidgets.QPushButton('Add', self)
self.plot.setStyleSheet("background-color:lightgrey")
- grid.addWidget(self.plot)
+ grid.addWidget(self.plot)
self.setLayout(grid)
diff --git a/dev-docs/source/MVPTutorial/index.rst b/dev-docs/source/MVPTutorial/index.rst
index 1d17310c0fb33696002c70ee4de4891de270fabe..2ca6b6967eaedc9b71c3f00228e16e10fca68f5f 100644
--- a/dev-docs/source/MVPTutorial/index.rst
+++ b/dev-docs/source/MVPTutorial/index.rst
@@ -7,7 +7,7 @@ Interface (GUI) using PyQt. Some knowledge of Python is assumed.
The concepts carry over into Qt in C++.
-Duration: 6 hours as a hands-on course with exercises.
+Duration: 6 hours as a hands-on course with exercises.
.. toctree::
:maxdepth: 1
diff --git a/dev-docs/source/ProfilingWithValgrind.rst b/dev-docs/source/ProfilingWithValgrind.rst
index d5e66f6621a95e757cce0fde21432c784f2cd755..911fbbe650618965c168479b1838a3fcff0f8b80 100644
--- a/dev-docs/source/ProfilingWithValgrind.rst
+++ b/dev-docs/source/ProfilingWithValgrind.rst
@@ -24,7 +24,7 @@ Ubuntu
::
- >> apt-get install valgrind kcachegrind
+ >> apt-get install valgrind kcachegrind
Red Hat/Fedora
~~~~~~~~~~~~~~
diff --git a/dev-docs/source/PyCharm.rst b/dev-docs/source/PyCharm.rst
index 008a270275a258d2d76525fff892c3fc3a29ffe9..76b7d232cc31dada0b92f7030316462bdaf43671 100644
--- a/dev-docs/source/PyCharm.rst
+++ b/dev-docs/source/PyCharm.rst
@@ -244,4 +244,4 @@ Note: Requires PyCharm Professional.
PyCharm supports deployment and syncronisation of written code to a remote server via SSH.
-Open a local copy of the project and then follow the the guides here for `configuring the remote interpreter <https://www.jetbrains.com/help/pycharm/configuring-remote-interpreters-via-ssh.html>`_ and `creating a deployment configuration <https://www.jetbrains.com/help/pycharm/creating-a-remote-server-configuration.html>`_.
+Open a local copy of the project and then follow the the guides here for `configuring the remote interpreter <https://www.jetbrains.com/help/pycharm/configuring-remote-interpreters-via-ssh.html>`_ and `creating a deployment configuration <https://www.jetbrains.com/help/pycharm/creating-a-remote-server-configuration.html>`_.
diff --git a/dev-docs/source/RunningSanitizers.rst b/dev-docs/source/RunningSanitizers.rst
index 44669cd6b66d1555a76ac8833a935651b251685e..7febb496b5a4ce2113dca95c5a2297238e4c380c 100644
--- a/dev-docs/source/RunningSanitizers.rst
+++ b/dev-docs/source/RunningSanitizers.rst
@@ -96,7 +96,7 @@ variables in the console before running in each mode.
Visual Studio Address Sanitizer
===============================
-The Visual Studio address sanitizer raises exceptions with code 0xC0000005 as part of its normal operation.
+The Visual Studio address sanitizer raises exceptions with code 0xC0000005 as part of its normal operation.
The exceptions are handled but they cause the debugger to stop. These exceptions need to be ignored in the Debug, Windows, Exception Settings dialog
Genuine sanitizer issues cause an unhandled exception and the debugger will stop at the relevant unit\line.
diff --git a/dev-docs/source/RunningTheUnitTests.rst b/dev-docs/source/RunningTheUnitTests.rst
index 4f611d11a8885d8387e9131ebfd420370dff6001..a5217fb009246a2e2687514b28d4d0ee39175dc3 100644
--- a/dev-docs/source/RunningTheUnitTests.rst
+++ b/dev-docs/source/RunningTheUnitTests.rst
@@ -116,7 +116,7 @@ Open the Mantid solution in Visual Studio. To run a subset of tests (for example
- Right click the directory again and select Debug->Start new instance.
-- Once the build has finished, open a file browser and navigate to the mantid build directory, run the command-prompt.bat file to open a command prompt and run
+- Once the build has finished, open a file browser and navigate to the mantid build directory, run the command-prompt.bat file to open a command prompt and run
.. code-block:: sh
diff --git a/dev-docs/source/Standards/AdditionalPythonCode.rst b/dev-docs/source/Standards/AdditionalPythonCode.rst
index c984cbf5fb52ff05cdf0992f8df932fb98398776..59362c5f3b58b208fa5d95501be7a90cd94f5e28 100644
--- a/dev-docs/source/Standards/AdditionalPythonCode.rst
+++ b/dev-docs/source/Standards/AdditionalPythonCode.rst
@@ -15,39 +15,39 @@ related to the Python exports (``mantid.*`` modules) nor an integral part of
``workbench`` should go to either the ``scripts`` directory or ``qt``
directory.
-``scripts`` is a place to put non-GUI modules and scripts such as pure Python
-reduction frameworks or technique specific plotting modules which are
-desirable to be included in an official release. The code in ``scripts`` can
-be included in the automatic unit testing machinery making it possible to
-avoid breakages due to changes in Mantid's core parts. Although some reduction
-interface code lives in ``scripts``, adding more GUI related code there is
-discouraged.
+``scripts`` is a place to put non-GUI modules and scripts such as pure Python
+reduction frameworks or technique specific plotting modules which are
+desirable to be included in an official release. The code in ``scripts`` can
+be included in the automatic unit testing machinery making it possible to
+avoid breakages due to changes in Mantid's core parts. Although some reduction
+interface code lives in ``scripts``, adding more GUI related code there is
+discouraged.
Python interfaces should go to the ``qt`` directory.
The ``scripts`` directory
#########################
-Python code should be written as proper `modules
-<https://docs.python.org/3/tutorial/modules.html>`_. For example, the code of
-a module called ``spam`` should go into ``scripts/spam`` and contain a file
-named ``__init__.py`` at minimum. Then the module can be imported into Mantid
+Python code should be written as proper `modules
+<https://docs.python.org/3/tutorial/modules.html>`_. For example, the code of
+a module called ``spam`` should go into ``scripts/spam`` and contain a file
+named ``__init__.py`` at minimum. Then the module can be imported into Mantid
simply by ``import spam``.
Documentation
-------------
-Documentation can be added to Mantid's Python API docs in ``docs/source/api``
-and linked to ``docs/source/api/index.rst``. Note, that it is possible to
-import Python's docstrings in ``.rst`` files using directives such as ``..
-automodule::`` or ``.. autoclass::``, see `here
+Documentation can be added to Mantid's Python API docs in ``docs/source/api``
+and linked to ``docs/source/api/index.rst``. Note, that it is possible to
+import Python's docstrings in ``.rst`` files using directives such as ``..
+automodule::`` or ``.. autoclass::``, see `here
<http://www.sphinx-doc.org/es/stable/ext/autodoc.html>`_.
Unit testing
------------
-Unit tests for each module should be added to ``scripts/test/modulename``. The
-tests follow the :ref:`standard Mantid unit testing practices
+Unit tests for each module should be added to ``scripts/test/modulename``. The
+tests follow the :ref:`standard Mantid unit testing practices
<UnitTestGoodPractice>`.
The ``qt`` directory
diff --git a/dev-docs/source/Standards/AlgorithmDocumentation.rst b/dev-docs/source/Standards/AlgorithmDocumentation.rst
index 7db9c8cd8392017c6e12e6d13e04975e4a409100..8b340b450db632897f84b663ceb5528f2a0da5a9 100644
--- a/dev-docs/source/Standards/AlgorithmDocumentation.rst
+++ b/dev-docs/source/Standards/AlgorithmDocumentation.rst
@@ -111,7 +111,7 @@ As the **Description** and **Usage** of an algorithm *cannot* be obtained automa
* Insertion of the Table Of Contents.
``.. summary::``
- The content of the summary method declared in your algorithm is output as HTML, for example, the following method is used in Rebin:
+ The content of the summary method declared in your algorithm is output as HTML, for example, the following method is used in Rebin:
.. code-block:: c++
@@ -121,7 +121,7 @@ As the **Description** and **Usage** of an algorithm *cannot* be obtained automa
}
``.. relatedalgorithms::``
- This directive obtains a list of related algorithms from the ``seeAlso`` and ``alias`` methods in the algorithm, for example, the following ``seeAlso`` is used in Rebin:
+ This directive obtains a list of related algorithms from the ``seeAlso`` and ``alias`` methods in the algorithm, for example, the following ``seeAlso`` is used in Rebin:
.. code-block:: c++
@@ -132,7 +132,7 @@ As the **Description** and **Usage** of an algorithm *cannot* be obtained automa
}
``.. properties::``
- As mentioned above, it is *critical* that you include a description for the properties of your algorithm. This directive obtains all of the algorithm's properties (set inside the algorithm's ``init`` method) and outputs in a table format.
+ As mentioned above, it is *critical* that you include a description for the properties of your algorithm. This directive obtains all of the algorithm's properties (set inside the algorithm's ``init`` method) and outputs in a table format.
``.. categories::``
By default, this directive obtains the categories that were set in the ``categories`` method the algorithm. For example, in Rebin the category method is in the header and contains:
@@ -156,7 +156,7 @@ It is possible to add additional categories by passing the directive arguments,
Description
===========
-This section must be manually entered. The description is an extension of the summary, and must contain a detailed overview of the algorithm's functionality.
+This section must be manually entered. The description is an extension of the summary, and must contain a detailed overview of the algorithm's functionality.
Referencing Other Algorithms
----------------------------
@@ -173,7 +173,7 @@ If you need to reference a particular version then you would type
:ref:`DiffractionFocussing version 2 <algm-DiffractionFocussing-v2>`
-where the first part outside the angle brackets defines the link text and the part inside the angle brackets references the tag name.
+where the first part outside the angle brackets defines the link text and the part inside the angle brackets references the tag name.
Usage
=====
diff --git a/dev-docs/source/Standards/AlgorithmUsageExamples.rst b/dev-docs/source/Standards/AlgorithmUsageExamples.rst
index f0cdc11c59ee57fe55b07abe133f8515691958c2..b0a054a4a35e235a1eb04d45076c0a5729e2ef2d 100644
--- a/dev-docs/source/Standards/AlgorithmUsageExamples.rst
+++ b/dev-docs/source/Standards/AlgorithmUsageExamples.rst
@@ -18,7 +18,7 @@ From a user's point of view, the main purposes of usage examples are:
* Understanding the algorithm
* Showing hints/comments etc. that help understand Mantid Python scripting in general
-The usage examples are written in `reStructuredText <http://docutils.sourceforge.net/rst.html>`__, which can be converted to HTML and the code in the usage examples can be tested.
+The usage examples are written in `reStructuredText <http://docutils.sourceforge.net/rst.html>`__, which can be converted to HTML and the code in the usage examples can be tested.
Guide
=====
@@ -30,26 +30,26 @@ The example below show the proposed way to format an usage example in reStructur
Usage
-----
- **Example - simple rebin of a histogram workspace:**
+ **Example - simple rebin of a histogram workspace:**
.. testcode:: ExHistSimple
# create histogram workspace
- dataX = [0,1,2,3,4,5,6,7,8,9] # or use dataX=range(0,10)
- dataY = [1,1,1,1,1,1,1,1,1] # or use dataY=[1]*9
+ dataX = [0,1,2,3,4,5,6,7,8,9] # or use dataX=range(0,10)
+ dataY = [1,1,1,1,1,1,1,1,1] # or use dataY=[1]*9
ws = CreateWorkspace(dataX, dataY)
-
+
# rebin from min to max with size bin = 2
- ws = Rebin(ws, 2)
-
- print "The rebinned X values are: " + str(ws.readX(0))
- print "The rebinned Y values are: " + str(ws.readY(0))
+ ws = Rebin(ws, 2)
+
+ print "The rebinned X values are: " + str(ws.readX(0))
+ print "The rebinned Y values are: " + str(ws.readY(0))
Output:
.. testoutput:: ExHistSimple
-
+
The rebinned X values are: [ 0. 2. 4. 6. 8. 9.]
The rebinned Y values are: [ 2. 2. 2. 2. 1.]
@@ -103,9 +103,9 @@ There are many ways to create sample workspaces. For example :ref:`CreateMDHisto
# Setup the data to fit:
workspaceIndex = 0 # the spectrum with which WorkspaceIndex to fit
- startX = 1 # specify fitting region
+ startX = 1 # specify fitting region
endX = 9 #
-
+
# Setup the model, here a Gaussian, to fit to data
tryCentre = '4' # A start guess on peak centre
sigma = '1' # A start guess on peak width
@@ -116,17 +116,17 @@ There are many ways to create sample workspaces. For example :ref:`CreateMDHisto
#myFunc = 'name=LinearBackground, A0=0.3;name=Gaussian, Height='+height+', PeakCentre='+tryCentre+', Sigma='+sigma
# Do the fitting
- fitStatus, chiSq, covarianceTable, paramTable, fitWorkspace = Fit(InputWorkspace='ws', \
+ fitStatus, chiSq, covarianceTable, paramTable, fitWorkspace = Fit(InputWorkspace='ws', \
WorkspaceIndex=0, StartX = startX, EndX=endX, Output='fit', Function=myFunc)
- print "The fit was: " + fitStatus
+ print "The fit was: " + fitStatus
print("chi-squared of fit is: %.2f" % chiSq)
print("Fitted Height value is: %.2f" % paramTable.column(1)[0])
- print("Fitted centre value is: %.2f" % paramTable.column(1)[1])
+ print("Fitted centre value is: %.2f" % paramTable.column(1)[1])
print("Fitted sigma value is: %.2f" % paramTable.column(1)[2])
- # fitWorkspace contains the data, the calculated and the difference patterns
+ # fitWorkspace contains the data, the calculated and the difference patterns
print "Number of spectra in fitWorkspace is: " + str(fitWorkspace.getNumberHistograms())
- print("The 20th y-value of the calculated pattern: %.4f" % fitWorkspace.readY(1)[19])
+ print("The 20th y-value of the calculated pattern: %.4f" % fitWorkspace.readY(1)[19])
.. testcleanup:: ExFitPeak
@@ -158,13 +158,13 @@ For a more simple use of CreateSampleWorkspace see example below (note if no arg
# create some event workspace
ws = CreateSampleWorkspace(WorkspaceType="Event")
- print "What type is the workspace before 1st rebin: " + str(type(ws))
+ print "What type is the workspace before 1st rebin: " + str(type(ws))
# rebin from min to max with size bin = 2 preserving event workspace (default behaviour)
- ws = Rebin(ws, 2)
- print "What type is the workspace after 1st rebin: " + str(type(ws))
- ws = Rebin(ws, 2, PreserveEvents=False)
- print "What type is the workspace after 2nd rebin: " + str(type(ws))
- # note you can also check the type of a workspace using: print isinstance(ws, IEventWorkspace)
+ ws = Rebin(ws, 2)
+ print "What type is the workspace after 1st rebin: " + str(type(ws))
+ ws = Rebin(ws, 2, PreserveEvents=False)
+ print "What type is the workspace after 2nd rebin: " + str(type(ws))
+ # note you can also check the type of a workspace using: print isinstance(ws, IEventWorkspace)
.. testcleanup:: ExEventRebin
@@ -199,23 +199,23 @@ as shown in the example below. This will generate a note to the user explaining
.. include:: ../usagedata-note.txt
**Example - Load ISIS histogram Nexus file:**
- (see :ref:`LoadISISNexus <algm-LoadISISNexus>` for more options)
+ (see :ref:`LoadISISNexus <algm-LoadISISNexus>` for more options)
.. testcode:: ExLoadISISnexusHist
# Load ISIS LOQ histogram dataset
- ws = Load('LOQ49886.nxs')
-
- print "The 1st x-value of the first spectrum is: " + str(ws.readX(0)[0])
+ ws = Load('LOQ49886.nxs')
+
+ print "The 1st x-value of the first spectrum is: " + str(ws.readX(0)[0])
.. testcleanup:: ExLoadISISnexusHist
DeleteWorkspace(ws)
-
+
Output:
.. testoutput:: ExLoadISISnexusHist
-
+
The 1st x-value of the first spectrum is: 5.0
Running the Tests
diff --git a/dev-docs/source/Standards/DocumentationGuideForDevs.rst b/dev-docs/source/Standards/DocumentationGuideForDevs.rst
index a30ddcd2b7510fcb303a9550c13edb094264ab6a..966f2a012d40beebdfba164c1cae03b506327e34 100644
--- a/dev-docs/source/Standards/DocumentationGuideForDevs.rst
+++ b/dev-docs/source/Standards/DocumentationGuideForDevs.rst
@@ -17,8 +17,8 @@ and processed using `Sphinx <http://www.sphinx-doc.org/en/master/>`__ along with
Configuration
-------------
-The documentation is configured using CMake and assumes the the instructions in the
-:ref:`Getting Started <GettingStarted>` section have been followed.
+The documentation is configured using CMake and assumes the the instructions in the
+:ref:`Getting Started <GettingStarted>` section have been followed.
The following settings, relating to the documentation, are available:
@@ -42,7 +42,7 @@ A list of the most notable ones can be found `here <https://stackoverflow.com/qu
Other tools:
-* `restview <https://pypi.python.org/pypi/restview>`__: which can be easily installed using ``pip``.
+* `restview <https://pypi.python.org/pypi/restview>`__: which can be easily installed using ``pip``.
It opens a webpage with the rst file processed and refreshes the page automatically whenever the .rst file is saved.
This can help you quickly track down that unexpected space or missing newline without having to rebuild the documentation each time.
It does not support sphinx directives so links will produce errors on the page which need to be checked by building the documentation using Mantid.
@@ -88,7 +88,7 @@ Interfaces
##########
For documenting custom interfaces, it is recommended that you consult :ref:`this <InterfaceDocumentation>` page,
-which explains how to document them, and which directives may be used in more detail.
+which explains how to document them, and which directives may be used in more detail.
How to define titles, sections etc.
###################################
@@ -131,19 +131,19 @@ Sub-sub-sections
Common Warnings and Fixes
-------------------------
-If you have weird messages about sphinx warnings that happen on “Console outputâ€,
+If you have weird messages about sphinx warnings that happen on “Console outputâ€,
those are coming either from summary functions in algorithms or from parameter descriptions.
In these
* *Do not* use ``*`` in parameter names or summary. This yields “Inline emphasis start-string without end-string†warnings.
* *Do not* use things like ``|Q|``. This yields sphinx error “Undefined substitution referencedâ€.
-* When using hyperlinks with a label, try to use anonymous hyperlinks (two underscores instead of one) to avoid name clashes.
+* When using hyperlinks with a label, try to use anonymous hyperlinks (two underscores instead of one) to avoid name clashes.
* ```MD <http://mysite.com/MD1.html>`__`` and ```MD <http://mysite.com/MD2.html>`__`` instead of ```MD <http://mysite.com/MD1.html>`_`` and ```MD <http://mysite.com/MD2.html>`_``. The second on will result in a warning.
While building the final output, Sphinx will emit warning messages if it things the input restructured text is malformed.
-This section lists some more common warnings along with suggestions for fixes.
+This section lists some more common warnings along with suggestions for fixes.
Explicit markup ends without a blank line; unexpected unindent.
###############################################################
@@ -164,7 +164,7 @@ It can be fixed by having a blank line between the indented block and the uninde
Inline interpreted text or phrase reference start-string without end-string
###########################################################################
-This is caused by using one of the `inline markup tags <http://www.sphinx-doc.org/en/master/rest.html#inline-markup>`__, where the text being wrapped splits over multiple lines. In these cases the directive variant of the inline markup should be used. One example is the ``:math:`` tag being spread over multiple lines. The tag ``:math:`` must only be used for inline markup, i.e. when there is no newline in the math string. For multi-line maths markup you must use the ``.. math::`` directive instead.
+This is caused by using one of the `inline markup tags <http://www.sphinx-doc.org/en/master/rest.html#inline-markup>`__, where the text being wrapped splits over multiple lines. In these cases the directive variant of the inline markup should be used. One example is the ``:math:`` tag being spread over multiple lines. The tag ``:math:`` must only be used for inline markup, i.e. when there is no newline in the math string. For multi-line maths markup you must use the ``.. math::`` directive instead.
.. code-block:: rest
@@ -200,7 +200,7 @@ This indicates the that image referenced by ``.. image::`` or ``.. figure::`` ca
Either the image is not there or the reference is incorrect.
Image links in Sphinx are either relative,
-in which case it is relative to the current document or
+in which case it is relative to the current document or
absolute in which case the path is assumed relative to the root of the source tree (the directory containing the conf.py)
Unknown directive type "foo"
diff --git a/dev-docs/source/Standards/InterfaceDocumentation.rst b/dev-docs/source/Standards/InterfaceDocumentation.rst
index eb60abd91477df67125490b83317a9806bccf1f7..197eeccd2553edb5566cca6d418a7f11a70b9a54 100644
--- a/dev-docs/source/Standards/InterfaceDocumentation.rst
+++ b/dev-docs/source/Standards/InterfaceDocumentation.rst
@@ -17,7 +17,7 @@ The ``interface`` Directive
This directive allows you to insert a screenshot of the interface into the documentation. It has one required argument: the name of the interface, as given by the interface's ``name()`` method. Several options, detailed below, may also be provided to further control the behaviour of this directive.
-The inserted screenshots are generated automatically when the documentation is being compiled. This is preferable to screenshots taken manually as these will automatically stay up to date.
+The inserted screenshots are generated automatically when the documentation is being compiled. This is preferable to screenshots taken manually as these will automatically stay up to date.
Options
-------
diff --git a/dev-docs/source/SystemTests.rst b/dev-docs/source/SystemTests.rst
index d985b399887482fe4dc5f0b30a6af3336cd73d6b..12ccf8a98186d604160cecea02486125cf2edc95 100644
--- a/dev-docs/source/SystemTests.rst
+++ b/dev-docs/source/SystemTests.rst
@@ -28,16 +28,16 @@ repository at
`mantidproject/mantid <https://github.com/mantidproject/mantid>`__, under
the ``Testing/SystemTests`` directory.
-System tests inherit from the :class:`systemtesting.MantidSystemTest` class.
-The methods that need to be overridden are ``runTest(self)``, where the Python
-code that runs the test should be placed, and ``validate(self)``, which should
-simply return a pair of strings: the name of the final workspace that results
-from the ``runTest`` method and the name of a nexus file that should be saved
-in the ``ReferenceResults`` sub-directory in the repository. The test code
-itself is likely to be the output of a *Save History* command, though it can
-be any Python code. In the unlikely case of files being used during a system
-test, implement the method ``requiredFiles`` which should return a list of
-filenames without paths. The file to validate against should be included as
+System tests inherit from the :class:`systemtesting.MantidSystemTest` class.
+The methods that need to be overridden are ``runTest(self)``, where the Python
+code that runs the test should be placed, and ``validate(self)``, which should
+simply return a pair of strings: the name of the final workspace that results
+from the ``runTest`` method and the name of a nexus file that should be saved
+in the ``ReferenceResults`` sub-directory in the repository. The test code
+itself is likely to be the output of a *Save History* command, though it can
+be any Python code. In the unlikely case of files being used during a system
+test, implement the method ``requiredFiles`` which should return a list of
+filenames without paths. The file to validate against should be included as
well. If any of those files are missing the test will be marked as skipped.
The tests should be added to the ``Testing/SystemTests/tests/framework``,
diff --git a/dev-docs/source/Testing/Core/Core.rst b/dev-docs/source/Testing/Core/Core.rst
index 0ca6eb5ef1caf05c366fdc7db58fa800774535b4..d26e9b5bf1327c919108566eb2c2e39c6c48f531 100644
--- a/dev-docs/source/Testing/Core/Core.rst
+++ b/dev-docs/source/Testing/Core/Core.rst
@@ -3,9 +3,9 @@
.. raw:: html
<style> .r {color:#FF0000; font-weight:bold} </style>
- <style> .g {color:#008000; font-weight:bold} </style>
- <style> .b {color:#0000FF; font-weight:bold} </style>
- <style> .o {color:#FF8C00; font-weight:bold} </style>
+ <style> .g {color:#008000; font-weight:bold} </style>
+ <style> .b {color:#0000FF; font-weight:bold} </style>
+ <style> .o {color:#FF8C00; font-weight:bold} </style>
.. role:: r
diff --git a/dev-docs/source/Testing/EngineeringDiffraction/EngineeringDiffractionTestGuide.rst b/dev-docs/source/Testing/EngineeringDiffraction/EngineeringDiffractionTestGuide.rst
index 72dfc6b140c425dbf0a5e903101d0b605bb97931..1a2695070adb58c3ff82d360782c3d5a07809d63 100644
--- a/dev-docs/source/Testing/EngineeringDiffraction/EngineeringDiffractionTestGuide.rst
+++ b/dev-docs/source/Testing/EngineeringDiffraction/EngineeringDiffractionTestGuide.rst
@@ -115,7 +115,7 @@ This test covers the Cropping functionality.
5. Check that only a single output file was generated.
6. Go to focus tab and do the same with the Crop Focus. In comparison to the previous focus test, this will only
- generate a single axis on the figure, rather than two.
+ generate a single axis on the figure, rather than two.
7. Change the RB number to "Custom".
diff --git a/dev-docs/source/Testing/ErrorReporter-ProjectRecovery/ErrorReporterTesting.rst b/dev-docs/source/Testing/ErrorReporter-ProjectRecovery/ErrorReporterTesting.rst
index 7b6210e8f65c8405eab3dbfbc51cd487fe0d4ba4..035cf90ee67c0bb8aef704d2b0b4bbcd0a3a8e4d 100644
--- a/dev-docs/source/Testing/ErrorReporter-ProjectRecovery/ErrorReporterTesting.rst
+++ b/dev-docs/source/Testing/ErrorReporter-ProjectRecovery/ErrorReporterTesting.rst
@@ -15,8 +15,8 @@ Error Reporter test
- Below you will be asked to produce a hard crash (by running the `Segfault`
Algorithm) or a soft crash (bring up an error report pop-up without also
closing Mantid, by Loading ``Training_Exercise3a_SNS.nxs`` available from
- the `Training Course Data <https://sourceforge.net/projects/mantid/files/Sample%20Data/TrainingCourseData.zip/download>`__
- and running the `NormaliseToMonitor` Algorithm. If one or both of these
+ the `Training Course Data <https://sourceforge.net/projects/mantid/files/Sample%20Data/TrainingCourseData.zip/download>`__
+ and running the `NormaliseToMonitor` Algorithm. If one or both of these
methods to crash Mantid no longer works, then ask other developers for a
suitable method and update these instructions.
- Make sure the location of this file is included in your search directories. Full instructions :ref:`are available online <mantid:getting started>`.
diff --git a/dev-docs/source/Testing/ErrorReporter-ProjectRecovery/ProjectRecoveryTesting.rst b/dev-docs/source/Testing/ErrorReporter-ProjectRecovery/ProjectRecoveryTesting.rst
index 484f9c003448e885df4b2dc534c31f711b35c1fe..50c513f0a8807593a1dce5199fbf18dc80730f2d 100644
--- a/dev-docs/source/Testing/ErrorReporter-ProjectRecovery/ProjectRecoveryTesting.rst
+++ b/dev-docs/source/Testing/ErrorReporter-ProjectRecovery/ProjectRecoveryTesting.rst
@@ -41,27 +41,27 @@ Project Recovery test
.. code-block:: python
Load(Filename='INTER00013464.nxs', OutputWorkspace='INTER1')
- Load(Filename='INTER00013469.nxs', OutputWorkspace='INTER2')
- Load(Filename='INTER00013469.nxs', OutputWorkspace='INTER3')
- RenameWorkspace(InputWorkspace='INTER2', OutputWorkspace='Rename2')
- RenameWorkspace(InputWorkspace='INTER1', OutputWorkspace='Rename1')
- RenameWorkspace(InputWorkspace='INTER3', OutputWorkspace='Rename3')
- Fit(Function='name=DynamicKuboToyabe,BinWidth=0.05,' 'Asym=5.83382,Delta=5.63288,Field=447.873,Nu=8.53636e-09', InputWorkspace='Rename1', IgnoreInvalidData=True, Output='Rename1_fit', OutputCompositeMembers=True, ConvolveMembers=True)
- Fit(Function='name=ExpDecayMuon,A=4306.05,Lambda=0.458289', InputWorkspace='Rename2', IgnoreInvalidData=True, Output='Rename2_fit', OutputCompositeMembers=True, ConvolveMembers=True)
+ Load(Filename='INTER00013469.nxs', OutputWorkspace='INTER2')
+ Load(Filename='INTER00013469.nxs', OutputWorkspace='INTER3')
+ RenameWorkspace(InputWorkspace='INTER2', OutputWorkspace='Rename2')
+ RenameWorkspace(InputWorkspace='INTER1', OutputWorkspace='Rename1')
+ RenameWorkspace(InputWorkspace='INTER3', OutputWorkspace='Rename3')
+ Fit(Function='name=DynamicKuboToyabe,BinWidth=0.05,' 'Asym=5.83382,Delta=5.63288,Field=447.873,Nu=8.53636e-09', InputWorkspace='Rename1', IgnoreInvalidData=True, Output='Rename1_fit', OutputCompositeMembers=True, ConvolveMembers=True)
+ Fit(Function='name=ExpDecayMuon,A=4306.05,Lambda=0.458289', InputWorkspace='Rename2', IgnoreInvalidData=True, Output='Rename2_fit', OutputCompositeMembers=True, ConvolveMembers=True)
Fit(Function='name=Abragam,A=-500.565,Omega=944.105,Phi=-2.97876,Sigma=230.906,Tau=5.54415e+06', InputWorkspace='Rename1_fit_Workspace', CreateOutput=True, Output='Rename1_fit_Workspace_1', CalcErrors=True)
Fit(Function='name=Abragam,A=343210,Omega=-91853.1,Phi=-1.51509,Sigma=11920.5,Tau=2.80013e+13', InputWorkspace='Rename2_fit_Workspace', CreateOutput=True, Output='Rename2_fit_Workspace_1', CalcErrors=True)
- GroupWorkspaces(InputWorkspaces='Rename1_fit_Workspace_1_Workspace,Rename2_fit_Workspace_1_Workspace', OutputWorkspace='Rename3_fit_Workspaces')
+ GroupWorkspaces(InputWorkspaces='Rename1_fit_Workspace_1_Workspace,Rename2_fit_Workspace_1_Workspace', OutputWorkspace='Rename3_fit_Workspaces')
RenameWorkspace(InputWorkspace='Rename1_fit_Workspace_1_Workspace', OutputWorkspace='Sequential1')
RenameWorkspace(InputWorkspace='Rename2_fit_Workspace_1_Workspace', OutputWorkspace='Sequential2')
- Fit(Function='name=ExpDecayMuon,A=4306.05,Lambda=0.458289', InputWorkspace='Rename3', IgnoreInvalidData=True, Output='Rename3_fit', OutputCompositeMembers=True, ConvolveMembers=True)
- Fit(Function='name=ExpDecayMuon,A=4306.05,Lambda=0.458289', InputWorkspace='Rename2_fit_Workspace', CreateOutput=True, Output='Rename2_fit_Workspace_1', CalcErrors=True)
- Fit(Function='name=ExpDecayMuon,A=4306.05,Lambda=0.458289', InputWorkspace='Rename3_fit_Workspace', CreateOutput=True, Output='Rename3_fit_Workspace_1', CalcErrors=True)
- GroupWorkspaces(InputWorkspaces='Rename2_fit_Workspace_1_Workspace,Rename3_fit_Workspace_1_Workspace', OutputWorkspace='Rename3_fit_Workspaces')
+ Fit(Function='name=ExpDecayMuon,A=4306.05,Lambda=0.458289', InputWorkspace='Rename3', IgnoreInvalidData=True, Output='Rename3_fit', OutputCompositeMembers=True, ConvolveMembers=True)
+ Fit(Function='name=ExpDecayMuon,A=4306.05,Lambda=0.458289', InputWorkspace='Rename2_fit_Workspace', CreateOutput=True, Output='Rename2_fit_Workspace_1', CalcErrors=True)
+ Fit(Function='name=ExpDecayMuon,A=4306.05,Lambda=0.458289', InputWorkspace='Rename3_fit_Workspace', CreateOutput=True, Output='Rename3_fit_Workspace_1', CalcErrors=True)
+ GroupWorkspaces(InputWorkspaces='Rename2_fit_Workspace_1_Workspace,Rename3_fit_Workspace_1_Workspace', OutputWorkspace='Rename3_fit_Workspaces')
RenameWorkspace(InputWorkspace='Rename3_fit_Workspace_1_Workspace', OutputWorkspace='Sequential3')
RenameWorkspace(InputWorkspace='Rename2_fit_Workspace_1_Workspace', OutputWorkspace='Sequential4')
- Fit(Function='name=ExpDecayMuon,A=4306.05,Lambda=0.458289', InputWorkspace='Rename3_fit_Workspace', CreateOutput=True, Output='Rename3_fit_Workspace_1', CalcErrors=True)
+ Fit(Function='name=ExpDecayMuon,A=4306.05,Lambda=0.458289', InputWorkspace='Rename3_fit_Workspace', CreateOutput=True, Output='Rename3_fit_Workspace_1', CalcErrors=True)
Fit(Function='name=ExpDecayMuon,A=4306.05,Lambda=0.458289', InputWorkspace='Rename1_fit_Workspace', CreateOutput=True, Output='Rename1_fit_Workspace_1', CalcErrors=True)
- GroupWorkspaces(InputWorkspaces='Rename3_fit_Workspace_1_Workspace,Rename1_fit_Workspace_1_Workspace', OutputWorkspace='Rename3_fit_Workspaces')
+ GroupWorkspaces(InputWorkspaces='Rename3_fit_Workspace_1_Workspace,Rename1_fit_Workspace_1_Workspace', OutputWorkspace='Rename3_fit_Workspaces')
RenameWorkspace(InputWorkspace='Rename3_fit_Workspace_1_Workspace', OutputWorkspace='Sequential5')
RenameWorkspace(InputWorkspace='Rename1_fit_Workspace_1_Workspace', OutputWorkspace='Sequential6')
@@ -71,7 +71,7 @@ Project Recovery test
- Choose `Yes`
- This should re-populate your workspace dialog and pop up a recovery script in the script window
---------
+--------
2. Testing many workspaces
@@ -242,7 +242,7 @@ Project Recovery test
.. code-block:: python
CreateWorkspace(DataX=range(12), DataY=range(12), DataE=range(12), NSpec=4, OutputWorkspace='NewWorkspace')
- RenameWorkspace(InputWorkspace='NewWorkspace', OutputWorkspace='Rename2')
+ RenameWorkspace(InputWorkspace='NewWorkspace', OutputWorkspace='Rename2')
- Save the workspace as a `.nxs` file
- Close Mantid normally
diff --git a/dev-docs/source/Testing/IndirectInelastic/IndirectInelasticAcceptanceTests.rst b/dev-docs/source/Testing/IndirectInelastic/IndirectInelasticAcceptanceTests.rst
index 2b0cd3c92e1afa53fb7a196b46e1259d6e88bb10..7ec63302192ea6a01597e2c595fe0e8400c65d83 100644
--- a/dev-docs/source/Testing/IndirectInelastic/IndirectInelasticAcceptanceTests.rst
+++ b/dev-docs/source/Testing/IndirectInelastic/IndirectInelasticAcceptanceTests.rst
@@ -163,11 +163,11 @@ Data analysis I(Q, T)
#. Go to ``Interfaces`` > ``Indirect`` > ``Data Analysis``
#. Go to the ``I(Q, T)`` tab
#. Load the ``irs26176_graphite002_red.nxs`` file from the sample data
-#. Load the resolution file ``irs26173_graphite002_res.nxs`` from the sample data
+#. Load the resolution file ``irs26173_graphite002_res.nxs`` from the sample data
#. Click ``Run``
#. A new workspace with the suffix ``_iqt`` should appear in the main GUI, it should be a 87 x 6 table. **NB** keep this workspace for the next test
#. Click ``Plot Current View`` this should plot the same data as the preview window
-#. Choose some workspace indices (e.g. 0-2) in the ``Output`` section and click ``Plot Spectra`` this should give a plot with the title *irs26176_graphite002_iqt*
+#. Choose some workspace indices (e.g. 0-2) in the ``Output`` section and click ``Plot Spectra`` this should give a plot with the title *irs26176_graphite002_iqt*
#. Click the down arrow on the ``Plot Spectra`` button and then select ``Plot Tiled``. This should give a tiled plot of the selected workspace indices.
Data analysis I(Q, T) Fit
@@ -193,4 +193,4 @@ Data analysis I(Q, T) Fit
#. Click ``Run``
#. Select Lifetime from the ``Output`` drop-down
#. Click ``Plot`` this should open a new plot with the lifetimes plotted
-
+
diff --git a/dev-docs/source/Testing/LiveData/LiveDataTests.rst b/dev-docs/source/Testing/LiveData/LiveDataTests.rst
index 68d3ee3d976b68a1b4c71b871b76d1d893843875..8a7eacae1d2b607562f548eb8e3d7b99c36f16a8 100644
--- a/dev-docs/source/Testing/LiveData/LiveDataTests.rst
+++ b/dev-docs/source/Testing/LiveData/LiveDataTests.rst
@@ -37,12 +37,12 @@ ISIS Event
#. Run the ``FakeISISEventDAE`` Algorithm from the Algorithms toolbox
#. These settings will create an instrument with 100 spectra, transmitting 2000 events every 20 milliseconds in 1 period. The data is between 10,000 and 20,000 microseconds TOF:
-
+
- NPeriods = 1
- NSpectra = 100
- Rate = 20
- NEvents = 2000
-
+
#. To stop the fake instrument, open the Algorithm Details window, by clicking on the ``Running`` button (MantidPlot) or ``Details`` button (MantidWorkbench) at the bottom of the Algorithms Toolbox. Then click ``Cancel`` next to ``FakeISISEventDAE``.
ISIS Histogram
@@ -50,7 +50,7 @@ ISIS Histogram
#. Run the ``FakeISISHistoDAE`` Algorithm from the Algorithms toolbox
#. These settings will create an instrument with 100 spectra, with 100 bins in 1 period:
-
+
- NPeriods = 1
- NSpectra = 100
- NBins = 100
@@ -63,17 +63,17 @@ ADARA Fake Event
This approach reads from an SNS pre-nexus file to recreate realistic event data, however It is a little more fiddly to setup.
#. Find the file ``Mantid.user.properties``. Its location will be:
-
+
- Windows: ``C:\MantidInstall\bin``
- Mac or linux: ``~/.mantid`` (i.e. in a ``.mantid`` directory under your home directory)
-
+
#. To use the ``REF_L_32035_neutron_event.dat`` file (located in the ``TrainingCourseData`` folder), open ``Mantid.user.properties`` in your favorite text editor and add the following lines:
::
-
+
fileeventdatalistener.filename=REF_L_32035_neutron_event.dat
fileeventdatalistener.chunks=300
-
+
#. Start MantidPlot
#. Use the instrument ``ADARA_FileReader`` in the ``TEST_LIVE`` facility in the First Time Setup dialog (MantidPlot) or Settings dialog (MantidWorkbench). There is no need to stop this fake instrument.
@@ -82,9 +82,9 @@ The data from this file comprises almost 50,000 events across 77,824 histograms,
Starting a live data session
----------------------------
-#. Ensure that ``FakeISISHistoDAE`` and ``FakeISISEventDAE`` are running in the background to complete this example
+#. Ensure that ``FakeISISHistoDAE`` and ``FakeISISEventDAE`` are running in the background to complete this example
#. To open the ``StartLiveData`` interface you can either
-
+
- click the drop down ``Load`` button in the Workspaces toolbox and select ``Live Data``
- Run the ``StartLiveData`` algorithm from the Algorithms toolbox
@@ -127,7 +127,7 @@ Enter the following settings in the StartLiveData interface:
Live event pre- and post-processing
###################################
-This uses rebin to select a region of time of flight, and then after
+This uses rebin to select a region of time of flight, and then after
the data is accumulated it uses SumSpectra to sum all of the data into a single spectrum.
When using post processing you have to give the accumulation workspace a name.
@@ -142,14 +142,14 @@ Enter the following settings in the StartLiveData interface:
- Within the Processing step tab select the ``Rebin`` algorthm
- In the algorthim properties set ``Params`` to ``40e3,500,60e3``
-
+
- PreserveEvents: Not Ticked
- Accumulation Method: Add
- Post Processing: Algorithm
- Within the Post Processing step tab select the ``SumSpectra`` algorthm
-
-- AccumulationWorkspace: accumulation
+
+- AccumulationWorkspace: accumulation
- OutputWorkspace: live
Stopping a live data session
diff --git a/dev-docs/source/Testing/MuonAnalysis_test_guides/Muon Analysis Unscripted Testing Guide.rst b/dev-docs/source/Testing/MuonAnalysis_test_guides/Muon Analysis Unscripted Testing Guide.rst
index 5883dc51b27422823eefa58d0e7e3c986b3c40d6..8b39d61be5a88615b7b045e7c3646664ae055931 100644
--- a/dev-docs/source/Testing/MuonAnalysis_test_guides/Muon Analysis Unscripted Testing Guide.rst
+++ b/dev-docs/source/Testing/MuonAnalysis_test_guides/Muon Analysis Unscripted Testing Guide.rst
@@ -5,7 +5,7 @@ Muon Interfaces Unscripted Testing
.. contents:: Table of Contents
:local:
-
+
Preamble
^^^^^^^^^
This document is intended for developers to use for unscripted testing of `Muon Analysis` and
diff --git a/dev-docs/source/Testing/MuonAnalysis_test_guides/Muon_Analysis_test_group_1_general.rst b/dev-docs/source/Testing/MuonAnalysis_test_guides/Muon_Analysis_test_group_1_general.rst
index be9d0cf02bb8756b1a52b286e0f7c70d3a2ada09..c8cab48589b1a7aa85a00cf29f2080d800737c58 100644
--- a/dev-docs/source/Testing/MuonAnalysis_test_guides/Muon_Analysis_test_group_1_general.rst
+++ b/dev-docs/source/Testing/MuonAnalysis_test_guides/Muon_Analysis_test_group_1_general.rst
@@ -11,9 +11,9 @@ Introduction
------------
These are unscripted tests for the :program:`Muon Analysis` interface.
-The tests here in group 1 are concerned with general data loading and
-processing, as well as with switching between the old and new fitting
-interfaces and fitting raw or binned data. The master testing guide is
+The tests here in group 1 are concerned with general data loading and
+processing, as well as with switching between the old and new fitting
+interfaces and fitting raw or binned data. The master testing guide is
located at :ref:`Muon_Analysis_TestGuide-ref`.
------------------------
@@ -23,34 +23,34 @@ Test 1: Load Current Run
**Time required 5 minutes**
-.. note:: This test will only work if you are using Windows and are connected
- to the ISIS network. You should also enable search of the archive in your
- :ref:`manage user directories <ManageUserDirectories>`. If this is not the
+.. note:: This test will only work if you are using Windows and are connected
+ to the ISIS network. You should also enable search of the archive in your
+ :ref:`manage user directories <ManageUserDirectories>`. If this is not the
case, go to :ref:`test_2`.
- Open **Muon Analysis** (*Interfaces* > *Muon* > *Muon Analysis*)
-- On the **Home** tab, in the *Instrument* section, select each ISIS muon
+- On the **Home** tab, in the *Instrument* section, select each ISIS muon
instrument in turn
-- For each instrument, click the **Load Current Run** button in the *Loading*
+- For each instrument, click the **Load Current Run** button in the *Loading*
section
-- A datafile should be successfully loaded, and a plot produced, for every
+- A datafile should be successfully loaded, and a plot produced, for every
instrument except **PSI**
-- When the current run is loaded, check that the **<** and **>** buttons
- on the interface cycle through recent runs. You shouldn't be able to
- use the **>** button after loading the most recent run as there should be no
+- When the current run is loaded, check that the **<** and **>** buttons
+ on the interface cycle through recent runs. You shouldn't be able to
+ use the **>** button after loading the most recent run as there should be no
runs that exist after the current run
-----------
-
+
.. _test_2:
-
+
Test 2: Data Loading and Rebinning
----------------------------------
**Time required 5 minutes**
- Open **Muon Analysis** (*Interfaces* > *Muon* > *Muon Analysis*)
-- On the **Home** tab, in the *Instrument* section, set the instrument to
+- On the **Home** tab, in the *Instrument* section, set the instrument to
**EMU**
- Load run ``20918``
- The data should look like this:
@@ -59,8 +59,8 @@ Test 2: Data Loading and Rebinning
:align: center
:alt: emu20918.png
-- On the **Home** tab, under the *Rebin* section, change **Rebin** to
- **Fixed** with steps of ``5``. Then on the Plotting Window make sure
+- On the **Home** tab, under the *Rebin* section, change **Rebin** to
+ **Fixed** with steps of ``5``. Then on the Plotting Window make sure
**Plot Raw** is unchecked. The data should now look like this:
.. image:: /images/MuonAnalysisTests/emu20918_rebin.png
@@ -68,7 +68,7 @@ Test 2: Data Loading and Rebinning
:alt: emu20918_rebin.png
--------------------------------
-
+
Test 3: Basic Fitting In The GUI
--------------------------------
@@ -87,9 +87,9 @@ Test 3: Basic Fitting In The GUI
:align: center
:alt: emu20918_rebin_fitted.png
-- Now set **Fit To Raw Data** to be ``true`` and click **Fit** again. This time
- it will fit to the raw data, but the rebinned data will still be shown in the
+- Now set **Fit To Raw Data** to be ``true`` and click **Fit** again. This time
+ it will fit to the raw data, but the rebinned data will still be shown in the
plot
-- There should now be two new workspaces in the workspace toolbox; One for
+- There should now be two new workspaces in the workspace toolbox; One for
fitted raw data and one for fitted rebinned data
diff --git a/dev-docs/source/Testing/MuonAnalysis_test_guides/Muon_Analysis_test_group_2_fitting.rst b/dev-docs/source/Testing/MuonAnalysis_test_guides/Muon_Analysis_test_group_2_fitting.rst
index 3c4b5d1537d156d3f48f4367bec3efde6a186942..5a4c2ae60d0a1fe1e98aea08b1ca61782dbe814f 100644
--- a/dev-docs/source/Testing/MuonAnalysis_test_guides/Muon_Analysis_test_group_2_fitting.rst
+++ b/dev-docs/source/Testing/MuonAnalysis_test_guides/Muon_Analysis_test_group_2_fitting.rst
@@ -6,16 +6,16 @@ Muon Analysis Unscripted Testing: Group 2 (Fitting)
.. contents:: Table of Contents
:local:
-
+
Introduction
------------
These are unscripted tests for the :program:`Muon Analysis` interface.
-The tests here in group 2 are concerned with the different types of fits
-possible through the **Fitting** and **Sequential Fitting** tabs. In each test,
-the fit should succeed without a crash - the results will be tested later, in
-:ref:`Muon_Analysis_TestGuide_3_Results-ref`. You will be using all the results
-from these tests as inputs for :ref:`Muon_Analysis_TestGuide_3_Results-ref` so
+The tests here in group 2 are concerned with the different types of fits
+possible through the **Fitting** and **Sequential Fitting** tabs. In each test,
+the fit should succeed without a crash - the results will be tested later, in
+:ref:`Muon_Analysis_TestGuide_3_Results-ref`. You will be using all the results
+from these tests as inputs for :ref:`Muon_Analysis_TestGuide_3_Results-ref` so
**do not** clear or close the interface.
The master testing guide is located at :ref:`Muon_Analysis_TestGuide-ref`.
@@ -42,20 +42,20 @@ Test 1: Individual Fit
.. image:: /images/MuonAnalysisTests/fitting_test1.png
:align: center
:alt: fitting_test1.png
-
+
- In the bottom table, set ``Time Start = 1`` and ``Time End = 5``
- Click **Fit** again
-- The fit curve should be updated with the new time constraints and look like
- this:
-
+- The fit curve should be updated with the new time constraints and look like
+ this:
+
.. image:: /images/MuonAnalysisTests/fitting_test1_start_end_time.png
:align: center
:alt: fitting_test1_start_end_time.png
-----------
-
+
.. _test_2:
-
+
Test 2: Sequential Fit
----------------------
@@ -72,27 +72,27 @@ Test 2: Sequential Fit
- Go to the **Sequential Fitting** tab
- Click **Sequentially fit all**, all fits should succeed
- Select each row in the table and see that the plot updates corrctly
- - Select the first row, and change ``Omega = 9.0`` and ``Tau = 0.2`` in the
+ - Select the first row, and change ``Omega = 9.0`` and ``Tau = 0.2`` in the
table
- - Then click **Fit selected**. This should update the fit for run ``20918``
+ - Then click **Fit selected**. This should update the fit for run ``20918``
but the other fits should remain the same
-----------
-
+
.. _test_3:
-
+
Test 3: Co-added Fit
--------------------
**Time required 5 minutes**
-- Following :ref:`test_2`, in the *Loading* section, check **Co-Add** to load
+- Following :ref:`test_2`, in the *Loading* section, check **Co-Add** to load
``20918-20`` as one run
- Go to **Fitting** tab
- In the **Select Workspace** drop-down, there should only be one workspace
; ``EMU00020918-20; Pair Asym; long; MA``
- Click **Fit** as before. The plot should be updated
-
+
.. image:: /images/MuonAnalysisTests/fitting_test3.png
:align: center
:alt: fitting_test3.png
@@ -100,7 +100,7 @@ Test 3: Co-added Fit
-----------
.. _test_4:
-
+
Test 4: Simultaneous Fit Across Runs
------------------------------------
@@ -108,18 +108,18 @@ Test 4: Simultaneous Fit Across Runs
- Following :ref:`test_3`, uncheck **Co-Add**
- Go to the **Fitting** tab
- - Check the **Simultaneous fit over** checkbox, and change from **Run**
+ - Check the **Simultaneous fit over** checkbox, and change from **Run**
to **Group/Pair**
- The **Display parameters for** drop down should contain three workspaces
- - Using the same fit function as before, check the **Global** checkbox for
+ - Using the same fit function as before, check the **Global** checkbox for
the parameters **A**, **Omega**, **Phi** and **Sigma**
- Click **Fit**
- - Use the **<<** and **>>** buttons, or drop-down list, to see the fitted
+ - Use the **<<** and **>>** buttons, or drop-down list, to see the fitted
parameters for each run in the function browser.
- In the **Plotting Window**, check **Tile plot by** and change to **Run**
from **Group/Pair**
- The fit should look something like this:
-
+
.. image:: /images/MuonAnalysisTests/fitting_test4.png
:align: center
:alt: fitting_test4.png
@@ -127,7 +127,7 @@ Test 4: Simultaneous Fit Across Runs
-----------
.. _test_5:
-
+
Test 5: Simultaneous Fit Across Groups
--------------------------------------
@@ -135,7 +135,7 @@ Test 5: Simultaneous Fit Across Groups
- Load run ``20918``, keeping the same set up as before in :ref:`test_4`
- Go to the **Grouping** tab
- - Uncheck **Analyse (plot/fit)** for the pair **long**, and check
+ - Uncheck **Analyse (plot/fit)** for the pair **long**, and check
**Analyse (plot/fit)** for both groups; **fwd** and **bwd**
- Go to the **Fitting** tab
- Keep fit function and global parameters as before
@@ -143,7 +143,7 @@ Test 5: Simultaneous Fit Across Groups
- The **Display parameters for** drop down should contain two workspaces
- Click **Fit**
- The fit won't be very good but it shouldn't crash
-
+
-------------------------------------------
Test 6: Sequential Fit of Simultaneous Fits
@@ -152,44 +152,44 @@ Test 6: Sequential Fit of Simultaneous Fits
**Time required 5 minutes**
- Load runs ``20918-20`` again
-- Keep the same set up as :ref:`test_5` in the **Grouping** and **Fitting**
+- Keep the same set up as :ref:`test_5` in the **Grouping** and **Fitting**
tab
-- With **Simultaneous fit over** still checked, go to the
+- With **Simultaneous fit over** still checked, go to the
**Sequential Fitting** tab
- Click **Sequentially fit all**
- - This should fit the **fwd** and **bwd** groups simultaneously for each
+ - This should fit the **fwd** and **bwd** groups simultaneously for each
run in sequence; ``20918``, ``20919``, ``20920``
-- In the workspace toolbox there should be a group workspace for each run
+- In the workspace toolbox there should be a group workspace for each run
that contains fitted data for both **fwd** and **bwd**
---------------------------------------
-
+
Test 7: Simultaneous Fit Across Periods
---------------------------------------
**Time required 5 minutes**
-The data used so far has been single period, so here we will use MUSR data
+The data used so far has been single period, so here we will use MUSR data
that has multiple periods.
- Go back to the **Home** tab and set *Instrument* to **MUSR**
- Load run ``15189``
- Go to the **Grouping** tab
- - There should now be four groups, two **fwd** and two **bwd**, and two
+ - There should now be four groups, two **fwd** and two **bwd**, and two
pairs
-- Go to the **Fitting** tab
+- Go to the **Fitting** tab
- Remove any existing functions (Right click *Composite function* > *Remove function*)
- Make sure **Simultaneous fit over** is checked and is over **Run**
- Add a **Linear Background** (*Background* > *Linear Background*)
- Click **Fit**
- In the **Plotting Window**, check **Tile plot by** and change to **Run**
- from **Group/Pair**
+ from **Group/Pair**
- The fit should look something like this:
.. image:: /images/MuonAnalysisTests/fitting_test7.png
:align: center
:alt: fitting_test7.png
-
+
------------------------
Test 8: TF Asymmetry Fit
@@ -212,12 +212,12 @@ Test 8: TF Asymmetry Fit
- Look at the fitting parameters and see **Flat Background** is non-zero.
- Instead disable **TF Asymmetry Mode**
- Clear the remaining fitting functions
- - Add **GausOsc** (*Muon* > *MuonGeneric* > *GausOsc*) and set
+ - Add **GausOsc** (*Muon* > *MuonGeneric* > *GausOsc*) and set
``Frequency = 1.3`` as before
- Now add **Flat Background** (*Background* > *Flat Background*)
- Click **Fit**
- Now check the parameters for flat background, they should be closer to 0
-
+
------------
.. _test_9::
@@ -233,14 +233,14 @@ Test 9: Simultaneous TF Asymmetry Fits
- Go to the **Fitting** tab
- Check **Simultaneous fit over** and make sure it is over **Run**
- Clear all functions
- - Add **GausOsc** (*Muon* > *MuonGeneric* > *GausOsc*) and set
+ - Add **GausOsc** (*Muon* > *MuonGeneric* > *GausOsc*) and set
``Frequency = 1.3``
- Tick the **Global** checkbox for **Frequency** and **Sigma**
- Enable **TF Asymmetry Mode**
- Click **Fit**
- Check that all values for the flat background are different to each other
- Before moving to the final test, disable **TF Asymmetry Mode**
-
+
-------------------------------------
Test 10: Sequential TF Asymmetry Fits
@@ -251,7 +251,7 @@ Test 10: Sequential TF Asymmetry Fits
- Load runs ``62260-2`` (still using *Instrument* **MUSR**)
- In the **Fitting** tab
- Uncheck **Simultaneous fit over**
- - Add **GausOsc** (*Muon* > *MuonGeneric* > *GausOsc*) and set
+ - Add **GausOsc** (*Muon* > *MuonGeneric* > *GausOsc*) and set
``Frequency = 1.3``
- Enable **TF Asymmetry Mode**
- Go to the **Sequential Fitting** tab
diff --git a/dev-docs/source/Testing/MuonAnalysis_test_guides/Muon_Analysis_test_group_3_results.rst b/dev-docs/source/Testing/MuonAnalysis_test_guides/Muon_Analysis_test_group_3_results.rst
index ab400782fdd8f0f9af56fda93bee5b542bd66ce0..c150221abea6656579a95a20f3852a8d61180b79 100644
--- a/dev-docs/source/Testing/MuonAnalysis_test_guides/Muon_Analysis_test_group_3_results.rst
+++ b/dev-docs/source/Testing/MuonAnalysis_test_guides/Muon_Analysis_test_group_3_results.rst
@@ -6,15 +6,15 @@ Muon Analysis Unscripted Testing: Group 3 (Results Tables)
.. contents:: Table of Contents
:local:
-
+
Introduction
------------
These are unscripted tests for the :program:`Muon Analysis` interface.
-The tests here in group 3 are concerned with generating results tables from
-fits that have previously been run. In this case, the fits previously run are
-those in :ref:`Muon_Analysis_TestGuide_2_Fitting-ref`, so those tests need to
-be run before these ones. Once you have comepleted group 2 tests, go to the
+The tests here in group 3 are concerned with generating results tables from
+fits that have previously been run. In this case, the fits previously run are
+those in :ref:`Muon_Analysis_TestGuide_2_Fitting-ref`, so those tests need to
+be run before these ones. Once you have comepleted group 2 tests, go to the
**Reults** tab.
The master testing guide is located at :ref:`Muon_Analysis_TestGuide-ref`.
@@ -28,14 +28,14 @@ Test 1: Individual And Co-Added Fits
**Time required 5-10 minutes**
-- In the **Results** tab, in the top log values table, check **run_number**
+- In the **Results** tab, in the top log values table, check **run_number**
and **sample_temp**
- Change **Function Name** to be **FlatBackground,Abragam** or equivalent
-- The bottom table should have all fit workspaces that used both
+- The bottom table should have all fit workspaces that used both
**Flat Background** and the **Abragam** functions
- Click **Unselect All** for the workspaces table
- Change **Table Name** to ``IndividualFitsTable``
-- Check all boxes next to workspaces that are individual fits, including the
+- Check all boxes next to workspaces that are individual fits, including the
co-added workspace
- This should look a little something like this:
@@ -45,13 +45,13 @@ Test 1: Individual And Co-Added Fits
:width: 600
- Click **Output Results**
-- In the main workbench window, in the workspace toolbox, open the results
+- In the main workbench window, in the workspace toolbox, open the results
table
- The table should have four rows, one for each individual fit
-- **sample_temp** should be correctly expresses as an average for the co-added
+- **sample_temp** should be correctly expresses as an average for the co-added
runs, in this case the average is ``190`` (``180+190+200/3``)
-- There should be several pairs of columns, one for each parameter and one for
- the error of the parameter, plus a final column called
+- There should be several pairs of columns, one for each parameter and one for
+ the error of the parameter, plus a final column called
**Cost function value**
- The table should look similar to this:
@@ -63,11 +63,11 @@ Test 2: Sequential Fits And Simultaneous Fits
*Time required 5-10 minutes*
-- For this test we will use the same **Function Name** as in :ref:`test_1`
+- For this test we will use the same **Function Name** as in :ref:`test_1`
(*FlatBackground,Abragam*)
- Change the **Table Name** to ``SeqFitOfSimFits``
- Click **Unselect All** for the workspaces table
-- Check the three workspaces that were simultaneous fits over groups and
+- Check the three workspaces that were simultaneous fits over groups and
sequentially fit for all runs
- At this point the table should look something like this:
@@ -75,16 +75,16 @@ Test 2: Sequential Fits And Simultaneous Fits
:align: center
:alt: results_test2_table.png
:width: 600
-
+
- Click **Output Results**
-- In the main workbench window, in the workspace toolbox, open the results
+- In the main workbench window, in the workspace toolbox, open the results
table
- There should be 3 rows
-- In particular, there should be only one column for ``A``, ``Omega``, ``Phi``
- and ``Sigma`` (plus one for each paramaters error) as these paramaters are
+- In particular, there should be only one column for ``A``, ``Omega``, ``Phi``
+ and ``Sigma`` (plus one for each paramaters error) as these paramaters are
global
-- There should be a column for ``f0.f0.A0`` and ``f1.f0.A0`` as this was not
- a global paramater, and similarly for the ``Tau`` Parameter. They should all
+- There should be a column for ``f0.f0.A0`` and ``f1.f0.A0`` as this was not
+ a global paramater, and similarly for the ``Tau`` Parameter. They should all
have their own error associated with them
- The table should look similar to this:
@@ -92,7 +92,7 @@ Test 2: Sequential Fits And Simultaneous Fits
:align: center
:alt: results_test2.png
:width: 600
-
+
Test 3: TF Asymmetry Results
----------------------------
@@ -101,7 +101,7 @@ Test 3: TF Asymmetry Results
- Click **Unselect All** for the log values table
- Now Select **Field_Danfysik**
- Change **Function Name** to be **GausOsc,TFAsymmetry** or equivalent
-- There is one workspace which was fit simultaneously so will not be included
+- There is one workspace which was fit simultaneously so will not be included
in this results table. Deselect that worksapce
- Change the table name to ``TFAsymmetryFits``
- The table should look like this:
diff --git a/dev-docs/source/Testing/MuonAnalysis_test_guides/Muon_Analysis_test_group_4_FDAG.rst b/dev-docs/source/Testing/MuonAnalysis_test_guides/Muon_Analysis_test_group_4_FDAG.rst
index 6f3924371e639cadd6501e66f5d320a0da693bdb..49697c26da5e795af6dcd91f31b4dbe06a56cfc7 100644
--- a/dev-docs/source/Testing/MuonAnalysis_test_guides/Muon_Analysis_test_group_4_FDAG.rst
+++ b/dev-docs/source/Testing/MuonAnalysis_test_guides/Muon_Analysis_test_group_4_FDAG.rst
@@ -5,12 +5,12 @@ Muon Unscripted Testing: Group 4 (Frequency Domain Analysis)
.. contents:: Table of Contents
:local:
-
+
Introduction
^^^^^^^^^^^^
These are unscripted tests for the :program:`Frequency Domain Analysis` interface.
-Load "MUSR00062260" into Muon analysis and plot each of the available groups **before** opening Frequency Domain Analysis.
+Load "MUSR00062260" into Muon analysis and plot each of the available groups **before** opening Frequency Domain Analysis.
The master testing guide is located at :ref:`Muon_Analysis_TestGuide-ref`.
@@ -21,7 +21,7 @@ Ensure that you have first run all the tests in group 2, then open the Frequency
Test 1: Basic FFT
-----------------
-- Set the workspace to "MUSR00062260;Group;bkwd;Asym;#1"
+- Set the workspace to "MUSR00062260;Group;bkwd;Asym;#1"
- Click the calculate FFT button and a 3 workspaces should appear in the "MUSR00062260 FFT FD" group
- The group will contain 3 workspace ending in `Re` (real), `Im` (imaginary) and `mod` (modulus)
- The plot window will show a broad peak
@@ -54,7 +54,7 @@ Test 3: PhaseQuad
- You will be able to select the real and imaginary parts of 'pq'
- Select the real part
- Click calculate
-- Tick the `Imaginary Data`
+- Tick the `Imaginary Data`
- Select the imaginary part of the phasequad
- Click calculate
- In both cases the plot should be a nice peak
@@ -64,7 +64,7 @@ Test 4: MaxEnt
--------------
- Change the drop-down menu at the top of the interface to "MaxEnt"
- The interface should look different
-- Click the Calculate MaxEnt button
+- Click the Calculate MaxEnt button
- The calculate button will be disabled and cancel enabled
- Click the cancel button
- Click Calculate MaxEnt
diff --git a/dev-docs/source/Testing/MuonInterface/MuonTesting.rst b/dev-docs/source/Testing/MuonInterface/MuonTesting.rst
index 6b45d5057bfba97707fb175fe2cdbf09655e5a66..531f1c322263ef52182debc607d5d361a1d99741 100644
--- a/dev-docs/source/Testing/MuonInterface/MuonTesting.rst
+++ b/dev-docs/source/Testing/MuonInterface/MuonTesting.rst
@@ -10,12 +10,12 @@ Muon Testing
Preparation
-----------
-For these tests you will be using the files; ``EMU00051341-51343.nxs`` for
-:ref:`ionic_diffusion_test`, ``EMU00020882-20900.nxs`` for
-:ref:`superconducting_copper_test`, ``HIFI000134028-13439``
+For these tests you will be using the files; ``EMU00051341-51343.nxs`` for
+:ref:`ionic_diffusion_test`, ``EMU00020882-20900.nxs`` for
+:ref:`superconducting_copper_test`, ``HIFI000134028-13439``
for :ref:`hifi_transverse_field_simultaneous_fitting`, and ``MUSR62260`` for
-:ref:`transverse_field_asymmetry_test`. You will need access to the data
-archive for this which can be activated through
+:ref:`transverse_field_asymmetry_test`. You will need access to the data
+archive for this which can be activated through
:ref:`manage user directories <ManageUserDirectories>`.
-------------------------
@@ -31,16 +31,16 @@ Ionic Diffusion Test
- Change *Instrument* to **EMU**, found in the *Home* tab
- Load runs ``51341-3``
- Go to the **Fitting** tab
- - Check the **Simultaneous fit over** checkbox, and change from **Run**
+ - Check the **Simultaneous fit over** checkbox, and change from **Run**
to **Group/Pair**
- Right click the empty table area; Select **Add Function**
- Add a **Flat Background** (*Background* > *Flat Background*)
- - Similarly, add **DynamicKuboToyabe** (*Muon* > *MuonGeneric* >
+ - Similarly, add **DynamicKuboToyabe** (*Muon* > *MuonGeneric* >
*DynamicKuboToyabe*)
- - Check the **Global** checkbox for the parameters **A0**, **Asym**,
+ - Check the **Global** checkbox for the parameters **A0**, **Asym**,
**Delta** and **Nu**
- Set ``A0 = 0.05``, ``Asym = 0.15``, ``Delta = 0.2`` and ``Nu = 0.1``
- - Click the value for the **Field** parameter; A ``...`` should appear next
+ - Click the value for the **Field** parameter; A ``...`` should appear next
to it, click it. A new window should appear
- Check the box called **Log**
- Change the log to be **field_danfysik**
@@ -57,7 +57,7 @@ Ionic Diffusion Test
- **f1.Asym:** ``0.155``
- **f1.Delta:** ``0.389``
- **f1.Nu:** ``0.474``
-
+
- Back in the workspaces toolbox, click the workspace group for the fitted,
data (Name similar to *EMU51341; Pair Asym; long; MA+ ...; Fitted; FlatBackground,DynamicKuboToyabe*)
- Ctrl + Click all the Workspace 2D data, then right click **Plot** > **Spectrum ...**
@@ -83,7 +83,7 @@ Superconducting Copper Test
update each time)
- Go to the **Fitting** tab
- Right click the empty table area; Select **Add Function**
- - Add **ExpDecayMuon** (*Muon* > *MuonGeneric* >
+ - Add **ExpDecayMuon** (*Muon* > *MuonGeneric* >
*ExpDecMuon*)
- Go to the **Sequential Fitting** tab
- Click **Sequentially Fit All**
@@ -94,7 +94,7 @@ Superconducting Copper Test
- Ctrl-Click the **field_danfysik** and the **lambda** column
- Right click **lambda** column, click **Plot...** and then **Line**
- You should get something like the following plot:
-
+
.. figure:: ../../images/MuonAnalysisTests/Cu-fitting.png
:alt: Cu-fitting.png
@@ -112,37 +112,37 @@ HIFI Transverse Field Simultaneous Fitting
- Load runs ``134028-39``
- Go to the **Grouping** tab
- In the Pair table, click **Guess Alpha**
- - In the resulting dialog, change the run to ``HIFI134034`` to be used for
+ - In the resulting dialog, change the run to ``HIFI134034`` to be used for
the calculation
- A value close to ``1.3`` should appear
- Go to the **Fitting** tab
- - Check the **Simultaneous fit over** checkbox, and change from **Run**
+ - Check the **Simultaneous fit over** checkbox, and change from **Run**
to **Group/Pair**
- Right click the empty table area; Select **Add Function**
- Add a **Flat Background** (*Background* > *Flat Background*)
- - Similarly, add **ExpDecayOsc** (*Muon* > *MuonGeneric* >
+ - Similarly, add **ExpDecayOsc** (*Muon* > *MuonGeneric* >
*ExpDecOsc*)
- Set all parameters to **Global**, except **Frequency**
- Click **Fit**
- The fit should fail with a large **Chi** value (``>100``)
- Now to try the fit a different way.
- Click **Undo Fits**
- - Click the value for the **Frequency** parameter; A ``...`` should appear
+ - Click the value for the **Frequency** parameter; A ``...`` should appear
next to it, click it. A new window should appear
- - Enter values for each run in the table as from ``0.1`` to ``1.1`` in
+ - Enter values for each run in the table as from ``0.1`` to ``1.1`` in
steps of ``0.1``
- Click **Ok**
- Click **Fit**
-- This time the fit should work with a significantly lower value for **Chi
+- This time the fit should work with a significantly lower value for **Chi
squared** (``<10``)
-- Back in the main workbench window, expand the fitting workspace and pick one
+- Back in the main workbench window, expand the fitting workspace and pick one
of the fitted workspaces
- Double click and with plot type as **Individual**, click **Plot All**
- You should get plots that look like this:
.. figure:: ../../images/MuonAnalysisTests/HIFI-TF-Result.png
:alt: HIFI-TF-Result.png
-
+
------------------------------------
.. _transverse_field_asymmetry_test:
@@ -156,21 +156,21 @@ Transverse Field Asymmetry Test
- Change *Instrument* to **MUSR**, found in the *Home* tab
- Load run ``62260``
- Go to the **Fitting** tab
- - Change **Select Workspace** to workspace containing the **fwd** in the
- name
+ - Change **Select Workspace** to workspace containing the **fwd** in the
+ name
- Right click the empty table area; Select **Add Function**
- Add **GuasOsc** (*Muon* > *MuonGeneric* > *GausOsc*)
- Set ``Frequency = 1.3``
- In the bottom table, check **TF Asymmetry Mode** to be ``true``
- Click **Fit**
-
+
Possible Prolems
----------------
-- If at any point data cannot be loaded check your
+- If at any point data cannot be loaded check your
:ref:`manage user directories <ManageUserDirectories>` to see if you have
turned on archive search.
-- If you cannot see all the runs once you reach the ``...`` step for a
- simultaneous fit, go back to the **Fitting** tab and make sure
- **Simultaneous fit over** is checked and it is over **Group/Pair**, not
+- If you cannot see all the runs once you reach the ``...`` step for a
+ simultaneous fit, go back to the **Fitting** tab and make sure
+ **Simultaneous fit over** is checked and it is over **Group/Pair**, not
**Run**
diff --git a/dev-docs/source/Testing/ReflectometryGUI/ReflectometryGUITests.rst b/dev-docs/source/Testing/ReflectometryGUI/ReflectometryGUITests.rst
index aa43fc4248b46ed4da6537040752d42a3d050a54..f253e117d2bef3ef021de64891524c14d5618500 100644
--- a/dev-docs/source/Testing/ReflectometryGUI/ReflectometryGUITests.rst
+++ b/dev-docs/source/Testing/ReflectometryGUI/ReflectometryGUITests.rst
@@ -72,12 +72,12 @@ Generating Plots and the 'plot' button
There are two plotting buttons at the top of the interface - they look like little plots.
- Select a processed group:
-
+
- Plot the "unstitched" data; the left of the two plot buttons. This should produce a plot with two separate lines for the individual reduced runs.
- Plot the "stitched" data; the right of the two buttons. This should produce a plot with a single line for the stitched output.
- Select a processed row:
-
+
- Plot the "unstitched" data; the left of the two plot buttons. This should produce a plot with one lines for that reduced run.
- Plot the "stitched" data; this should do nothing for a row.
@@ -90,7 +90,7 @@ Polarisation corrections settings are under the Settings tab in the interface. T
- Switch to the Experiment Settings tab - the Polarisation corrections check box should be greyed out.
- Switch back to Runs and set the instrument to POLREF, CRISP or OFFSPEC.
- Switch back to Experiment Settings - the Polarisation corrections check box should now be enabled. Tick it and try processing something
-
+
- e.g. (this will require the archive) OFFSPEC run 44956, angle 0.4, transmission run 44937.
Search for an RB Number
@@ -98,10 +98,10 @@ Search for an RB Number
*You require a connection to the archives for this. Make sure the archive is mounted and is enabled in the Manage User Directories dialog.*.
- Find an experiment number e.g. INTER 1120015. There are a number of ways to find other experiment numbers:
-
+
- the `JournalViewer <https://www.projectaten.com/jv>`__ provides an easy way to browse experiments
- alternatively, in the archives, go to the ``\Instrument\logs\journal`` subdirectory of one of the instrument directories (named '**NDX{Instrument}**') and select an xml journal other than journal_main.xml. Look for a pair of ``experiment_identifier`` tags and note the number inside the tags. This is the RB number that the search functionality looks for.
-
+
- On the ISIS Reflectometry interface, change to the relevant instrument and enter the RB number in the Investigation Id textbox.
- Hit search, and enter your ICat login details if required.
- The search results list will fill with all the runs from ICat with that RB number.
@@ -117,7 +117,7 @@ Transfer Run Number and Transmission Runs
- Runs with the same title will appear in the same group.
- Runs in the same group with different angles will appear on different rows.
- Runs in the same group with the same angle will be combined into the same row with the ``Run(s)`` field showing as a sum of all runs for that angle, e.g. ``13460+13462``.
-
+
- Click Transfer again with the same selection. If the runs are already in the table, nothing should happen, because duplicates should not be added.
- Select some different runs and click Transfer. The new runs should be added to the table.
diff --git a/dev-docs/source/Testing/SliceViewer/SliceViewer.rst b/dev-docs/source/Testing/SliceViewer/SliceViewer.rst
index 2d59a80a4188df51061772e7afeab4f848ffb3c5..06819118f7693b3baf6de77a4de0288bde732412 100644
--- a/dev-docs/source/Testing/SliceViewer/SliceViewer.rst
+++ b/dev-docs/source/Testing/SliceViewer/SliceViewer.rst
@@ -37,7 +37,7 @@ Data
from mantid.simpleapi import *
# SXD23767.raw is available in the TrainingCourseData from the downloads page
- SXD23767 = Load(Filename='SXD23767.raw', LoadMonitors='Exclude')
+ SXD23767 = Load(Filename='SXD23767.raw', LoadMonitors='Exclude')
# Set some UB with angles we can play with
SetUB(SXD23767, 1,1,2,90,90,120)
md_non_ortho = ConvertToDiffractionMDWorkspace(InputWorkspace='SXD23767', OutputDimensions='HKL')
@@ -49,11 +49,11 @@ Data
- Create a PeaksWorkspace:
- - Open instrument viewer by right-clicking on the workspace``SXD23767``.
+ - Open instrument viewer by right-clicking on the workspace``SXD23767``.
- On the *Pick* tab, select the |PickTabAddPeakButton.png| "Add a single crystal peak" button.
- - Click on an intense bragg peak on the detectors, and then click on one or many of the intense peaks in the produced mini-plot. Repeat for a few different bragg peaks across the detectors.
+ - Click on an intense bragg peak on the detectors, and then click on one or many of the intense peaks in the produced mini-plot. Repeat for a few different bragg peaks across the detectors.
- Notice that this has produced a ``SingleCrystalPeakTable``.
- - Rename the above workspace to ``peaks`` and in instrument viewer, select more peaks for a second peaksworkspace.
+ - Rename the above workspace to ``peaks`` and in instrument viewer, select more peaks for a second peaksworkspace.
- Create an Integrated PeaksWorkspace:
@@ -103,11 +103,11 @@ For the data types above:
- Select the peak overlay button to choose which PeakWorkspace/s to overlay
- Click on different peaks in the peak sorting table to display them
- Try overlaying multiple peaks workspaces
-- Overlay Integrated peaks and observe the peak radius and background shell
+- Overlay Integrated peaks and observe the peak radius and background shell
(see *Calculations* section of :ref:`algm-IntegratePeaksMD`) as displayed in the image below.
- Click on a column title in the peak table to sort by that value, such as ``DetID``
-- Zooming in on peaks, and check that the data and peak move together
-- Repeat step 2. (Select Axes) with peaks shown
+- Zooming in on peaks, and check that the data and peak move together
+- Repeat step 2. (Select Axes) with peaks shown
- Peak overlay should not be shown for 2D data
.. figure:: ../../../../docs/source/images/wb-sliceviewer51-peaksoverlay.png
@@ -118,7 +118,7 @@ For the data types above:
5. Toolbar buttons for changing axis limits
###########################################
-- Home
+- Home
- Pan + Stretch
- Zoom (dynamic rebinning to ``_svrebinned`` workspace) - both by selecting region with mouse and scrolling
diff --git a/dev-docs/source/Testing/index.rst b/dev-docs/source/Testing/index.rst
index 9b700cea025581aa7b9f1df61f07f9998193ad60..dac2a44a1737f3bdc839683926c9f484fbd09b92 100644
--- a/dev-docs/source/Testing/index.rst
+++ b/dev-docs/source/Testing/index.rst
@@ -4,7 +4,7 @@
Testing
=======
-This is a series of tests for the different functionalities of Mantid. The tests are designed to
+This is a series of tests for the different functionalities of Mantid. The tests are designed to
try to capture real-life use scenarios as closely as possible, whilst minimising the data and
time required for each test. Hopefully if Mantid can pass these tests then it will be usable in
*at least* a basic sense.
diff --git a/dev-docs/source/ToolsOverview.rst b/dev-docs/source/ToolsOverview.rst
index 9ec2b39074eff1d7f2538db6228bc3a29a7901a9..e1d81baf008fa429ebdddfea737e460182a1c337 100644
--- a/dev-docs/source/ToolsOverview.rst
+++ b/dev-docs/source/ToolsOverview.rst
@@ -165,9 +165,9 @@ issues when a network interface is still active but very slow. More details can
Convert Wiki Docs to Sphinx
---------------------------
-``wiki2rst`` reads in mediawiki formatted webpages and converts them to ``.rst`` files, for use
-in ``Sphinx``. The code attempts to take all images and internal links and re-create the
-documentation structure in the ``Sphinx`` format.
+``wiki2rst`` reads in mediawiki formatted webpages and converts them to ``.rst`` files, for use
+in ``Sphinx``. The code attempts to take all images and internal links and re-create the
+documentation structure in the ``Sphinx`` format.
Use
~~~
@@ -258,15 +258,15 @@ For example, to convert all loops classified as *risky* or above, we would appen
CMake-format
---------------------
-`CMake-format <https://github.com/cheshirekow/cmake_format/>`__ is a tool which is used to format individual ``CMakeLists.txt`` to make them easier to read.
+`CMake-format <https://github.com/cheshirekow/cmake_format/>`__ is a tool which is used to format individual ``CMakeLists.txt`` to make them easier to read.
The package can be installed using ``pip install cmake_format`` or ``sudo pip install cmake_format``.
-To use cmake-format on a specific ``CMakeLists.txt`` file in the command line run
+To use cmake-format on a specific ``CMakeLists.txt`` file in the command line run
.. code::
python -m cmake_format -c /path/to/mantid/.cmake-format.json -i /path/to/CMakeLists.txt
-
+
This will format the file using the config file ``.cmake-format.json`` which can be found in the root of the mantid directory.
There is an official Visual Studio extension, details of which can be found `here <https://marketplace.visualstudio.com/items?itemName=cheshirekow.cmake-format>`__.
diff --git a/dev-docs/source/UserSupport.rst b/dev-docs/source/UserSupport.rst
index 60eeb949031cbf30100bc783e5c4f5076bd27e88..9d50a32833a473159fb83d3786fa303c444bf2a5 100644
--- a/dev-docs/source/UserSupport.rst
+++ b/dev-docs/source/UserSupport.rst
@@ -10,9 +10,9 @@ User Support
Introduction
############
-As Mantid continues to facilitate cutting-edge scientific research, for an
-increasing number of users, the support side of Mantid is growing more
-and more important. This can be in many circumstances and through
+As Mantid continues to facilitate cutting-edge scientific research, for an
+increasing number of users, the support side of Mantid is growing more
+and more important. This can be in many circumstances and through
different avenues; therefore, below is detailed our support procedures.
The main purpose of user support for the Mantid project, is to aide contact between the users and developers.
@@ -22,7 +22,7 @@ The main purpose of user support for the Mantid project, is to aide contact betw
:width: 700px
:align: right
:alt: Error reporter
-
+
*Error reporter sends details directly to Mantid support*
Bugs and Error Reports
@@ -41,7 +41,7 @@ Troubleshooting
This is a list designed to take a user through how to gain diagnostic information, particularly when Mantid (Workbench) fails to **launch**.
-For performance profiling check out our `recommended tools <http://developer.mantidproject.org/ToolsOverview.html#profiling>`_.
+For performance profiling check out our `recommended tools <http://developer.mantidproject.org/ToolsOverview.html#profiling>`_.
.. _Trouble_Windows:
@@ -63,7 +63,7 @@ For a full release, ``C:\MantidInstall\`` is likely the correct install path. Ta
C:\MantidInstall\bin\MantidWorkbench
-If this does not work, try launching with:
+If this does not work, try launching with:
.. code-block:: python
@@ -103,7 +103,7 @@ If this does not work, try launching with:
cd %APPDATA%\mantidproject
mv mantidproject.ini mantidproject.ini.backup
# Try again to start workbench, if that doesn't work ...
-
+
cd %APPDATA%\mantidproject
mv mantid mantidbackup
# Try again to start workbench
@@ -225,7 +225,7 @@ MacOS
/Applications/MantidWorkbench.app/Contents/MacOS/MantidWorkbench
-If this does not work, try launching with:
+If this does not work, try launching with:
.. code-block:: python
@@ -235,7 +235,7 @@ If this does not work, try launching with:
python3 -m workbench.app.main
-4. Does **Qt** import correctly?
+4. Does **Qt** import correctly?
.. code-block:: python
diff --git a/dev-docs/source/VisualStudioBuildImpact.rst b/dev-docs/source/VisualStudioBuildImpact.rst
index 2d8f5cb11ba74567b2f3c7c0028836c8b8a00025..10e9b00912ba6d0f08172f8d206527225e5da000 100644
--- a/dev-docs/source/VisualStudioBuildImpact.rst
+++ b/dev-docs/source/VisualStudioBuildImpact.rst
@@ -25,14 +25,14 @@ script.
::
Const BELOW_NORMAL = 16384
-
+
strComputer = "."
Set objWMIService = GetObject("winmgmts:\\" & strComputer & "\root\cimv2")
Set colProcesses = objWMIService.ExecQuery _
("Select * from Win32_Process Where Name = 'MSBuild.exe'")
For Each objProcess in colProcesses
- objProcess.SetPriority(BELOW_NORMAL)
+ objProcess.SetPriority(BELOW_NORMAL)
Next
Save it as Reduce_Build_Impact.vbs, and use when things are running like
@@ -47,14 +47,14 @@ that keeps a watch on your system every 5 seconds.
::
Const BELOW_NORMAL = 16384
-
+
strComputer = "."
Set objWMIService = GetObject("winmgmts:\\" & strComputer & "\root\cimv2")
Do While true
Set colProcesses = objWMIService.ExecQuery _
("Select * from Win32_Process Where Name = 'MSBuild.exe'")
For Each objProcess in colProcesses
- objProcess.SetPriority(BELOW_NORMAL)
+ objProcess.SetPriority(BELOW_NORMAL)
Next
WScript.Sleep 5000
loop
diff --git a/dev-docs/source/Workbench/ProjectSaveInterfaces.rst b/dev-docs/source/Workbench/ProjectSaveInterfaces.rst
index 467b6763447bb4d989f608be9729840d388f24e2..723615fcb15f74364fd312ea2d2f528db1463f2a 100644
--- a/dev-docs/source/Workbench/ProjectSaveInterfaces.rst
+++ b/dev-docs/source/Workbench/ProjectSaveInterfaces.rst
@@ -7,20 +7,20 @@ Project Save
Overview
########
-Project save is the attempt to allow all parts of a user's project to be saved, namely interfaces (C++ and Python), plots and workspaces.
+Project save is the attempt to allow all parts of a user's project to be saved, namely interfaces (C++ and Python), plots and workspaces.
Handy links
###########
- Python JSON Library - https://docs.python.org/2/library/json.html
- QMap - http://doc.qt.io/qt-5/qmap.html
-- QVariant - http://doc.qt.io/qt-5/QVariant.html
+- QVariant - http://doc.qt.io/qt-5/QVariant.html
- SIP (documentation on SIP is relatively limited) - http://pyqt.sourceforge.net/Docs/sip4/using.html
Implementation
##############
-Project save will save interfaces, plots and workspaces, this is achieved by using either dedicated classes, in the case of plots and workspaces, or by adding a encoder and decoder to the EncoderFactory and the DecoderFactory. The way in which the saving is currently achieved is by returning a dictionary containing only either primitive types (by far the most common approach) or by returning current the python JSON library's serializeable types. Examples of how types are converted to JSON and back can be found at https://docs.python.org/2/library/json.html under section 18.2.2 Encoders and Decoders.
+Project save will save interfaces, plots and workspaces, this is achieved by using either dedicated classes, in the case of plots and workspaces, or by adding a encoder and decoder to the EncoderFactory and the DecoderFactory. The way in which the saving is currently achieved is by returning a dictionary containing only either primitive types (by far the most common approach) or by returning current the python JSON library's serializeable types. Examples of how types are converted to JSON and back can be found at https://docs.python.org/2/library/json.html under section 18.2.2 Encoders and Decoders.
Saving and loading an interface (Python)
########################################
@@ -37,18 +37,18 @@ The basic template for an io file:
class InterfaceAttributes(object):
# WARNING: If you delete a tag from here instead of adding a new one, it will make old project files obsolete so
# just add an extra tag to the list e.g. ["InstrumentWidget", "IWidget"]
- # This list must contain the name of the class that will be found at the top level of Widgets, this is usually the view
+ # This list must contain the name of the class that will be found at the top level of Widgets, this is usually the view
# class
tags = ["Interface"]
class InterfaceEncoder(InterfaceAttributes):
def __init__(self):
super(InterfaceEncoder, self).__init__()
-
+
def encode(self, obj, project_path=None):
presenter = obj.presenter
return {"info": presenter.getInfo(), "state": presenter.getState()}
-
+
@classmethod
def has_tag(cls, tag):
return tag in cls.tags
@@ -67,7 +67,7 @@ The basic template for an io file:
# Return the view of the GUI or whatever object can have .show() called on it
return presenter.view
-
+
@classmethod
def has_tag(cls, tag):
return tag in cls.tags
@@ -79,7 +79,7 @@ Alongside the io file you will need to register the InterfaceEncoder and Interfa
from mantidqt.project.encoderfactory import EncoderFactory
from mantidqt.project.decoderfactory import DecoderFactory
from mantidqt.widget.interface.io import InterfaceEncoder, InterfaceDecoder
-
+
EncoderFactory.register_encoder(InterfaceEncoder)
DecoderFactory.register_decoder(InterfaceDecoder)
diff --git a/dev-docs/source/WritingAnAlgorithm.rst b/dev-docs/source/WritingAnAlgorithm.rst
index 3353a5edd84717abed355b1335fcadbaca8b5414..ef7f26810e8e2d5550689183194982aa22394fb3 100644
--- a/dev-docs/source/WritingAnAlgorithm.rst
+++ b/dev-docs/source/WritingAnAlgorithm.rst
@@ -9,30 +9,30 @@ Writing An Algorithm
Introduction
############
-Mantid's `plugin <https://www.mantidproject.org/Plugin>`__ architecture has been engineered so that it is easy for a user
-to write their own algorithm. This page is a primer for the user about to write their first algorithm and assumes no
-great knowledge of C++.
-It covers the basics, with links to more advanced options where appropriate. Note if you are looking to add a
-`plugin <https://www.mantidproject.org/Plugin>`__ fit function rather than an algorithm then see
-`Writing a Fit Function <https://www.mantidproject.org/Writing_a_Fit_Function>`__.
+Mantid's `plugin <https://www.mantidproject.org/Plugin>`__ architecture has been engineered so that it is easy for a user
+to write their own algorithm. This page is a primer for the user about to write their first algorithm and assumes no
+great knowledge of C++.
+It covers the basics, with links to more advanced options where appropriate. Note if you are looking to add a
+`plugin <https://www.mantidproject.org/Plugin>`__ fit function rather than an algorithm then see
+`Writing a Fit Function <https://www.mantidproject.org/Writing_a_Fit_Function>`__.
There is special description for the case when you are looking to add a custom `MD conversion plugin <WritingCustomConvertToMDTransformation>`__.
-Alternatively, you can implement your algorithm in `Python <https://www.mantidproject.org/Extending_Mantid_With_Python>`__.
-See `Python Vs C++ Algorithms <https://www.mantidproject.org/Python_Vs_C%2B%2B_Algorithms>`__ for a comparison of Mantid's
+Alternatively, you can implement your algorithm in `Python <https://www.mantidproject.org/Extending_Mantid_With_Python>`__.
+See `Python Vs C++ Algorithms <https://www.mantidproject.org/Python_Vs_C%2B%2B_Algorithms>`__ for a comparison of Mantid's
two programming languages.
-All `algorithms <https://www.mantidproject.org/Algorithm>`__ in Mantid `inherit <http://en.wikipedia.org/wiki/Inheritance_(computer_science)>`__
-from a base ``Algorithm`` class, which provides the support and services required for running a specific
+All `algorithms <https://www.mantidproject.org/Algorithm>`__ in Mantid `inherit <http://en.wikipedia.org/wiki/Inheritance_(computer_science)>`__
+from a base ``Algorithm`` class, which provides the support and services required for running a specific
algorithm and greatly simplifies the process of writing a new one.
Getting Started
###############
The first step is to create a new directory, with any name of your choice, under your MantidInstall directory
-(on Windows, probably located at ``C:\\MantidInstall``). Alternatively, you can just do everything in the
+(on Windows, probably located at ``C:\\MantidInstall``). Alternatively, you can just do everything in the
UserAlgorithms directory. The UserAlgorithms directory contains a simple Python script called ``createAlg.py``.
-This can be used to create a new 'empty' algorithm - to create one called 'MyAlg' you should type ``python
-createAlg.py myAlg category``, where category is an optional argument to set the algorithm's category.
-To do the same thing 'by hand', create files called ``MyAlg.h`` and ``MyAlg.cpp`` and paste in the following
+This can be used to create a new 'empty' algorithm - to create one called 'MyAlg' you should type ``python
+createAlg.py myAlg category``, where category is an optional argument to set the algorithm's category.
+To do the same thing 'by hand', create files called ``MyAlg.h`` and ``MyAlg.cpp`` and paste in the following
boilerplate C++ code (changing each occurrence of 'MyAlg' to your chosen algorithm name):
**Header file (MyAlg.h)**:
@@ -40,9 +40,9 @@ boilerplate C++ code (changing each occurrence of 'MyAlg' to your chosen algorit
.. code-block:: cpp
#pragma once
-
+
#include "MantidAPI/Algorithm.h"
-
+
class DLLExport MyAlg : public Mantid::API::Algorithm
{
public:
@@ -58,7 +58,7 @@ boilerplate C++ code (changing each occurrence of 'MyAlg' to your chosen algorit
int version() const override { return (1); }
/// Algorithm's category for identification
const std::string category() const override { return "UserDefined"; }
-
+
private:
/// Initialisation code
void init() override;
@@ -71,55 +71,55 @@ boilerplate C++ code (changing each occurrence of 'MyAlg' to your chosen algorit
.. code-block:: cpp
#include "MyAlg.h"
-
+
// Register the algorithm into the AlgorithmFactory
DECLARE_ALGORITHM(MyAlg);
-
+
void MyAlg::init()
{
}
-
- void MyAlg::exec()
- {
+
+ void MyAlg::exec()
+ {
}
-At this point you will already have something that will compile and run. To do so (on Windows), copy the files
-``build.bat`` & ``SConstruct`` from ``UserAlgorithms`` into the directory containing your code and execute ``build.bat``.
-If you then start MantidPlot your algorithm will appear in the list of available algorithms and could be run.
+At this point you will already have something that will compile and run. To do so (on Windows), copy the files
+``build.bat`` & ``SConstruct`` from ``UserAlgorithms`` into the directory containing your code and execute ``build.bat``.
+If you then start MantidPlot your algorithm will appear in the list of available algorithms and could be run.
But, of course, it won't do anything of interest until you have written some algorithm code...
Coding the Algorithm
####################
You will see that the algorithm skeletons set up in the last section contain two methods/functions/subroutines
-called ``init`` and ``exec``. It will be no surprise to discover that these will, respectively, contain the code to
-initialise and execute the algorithm, which goes in the ``.cpp`` file between the curly brackets of each method.
-Note that these are private methods (i.e. cannot be called directly); an algorithm is run by calling the base
-class's ``initialize()`` and ``execute()`` methods, which provide additional services such as the validation of properties,
+called ``init`` and ``exec``. It will be no surprise to discover that these will, respectively, contain the code to
+initialise and execute the algorithm, which goes in the ``.cpp`` file between the curly brackets of each method.
+Note that these are private methods (i.e. cannot be called directly); an algorithm is run by calling the base
+class's ``initialize()`` and ``execute()`` methods, which provide additional services such as the validation of properties,
fetching workspaces from the ``AnalysisDataService``, handling errors and filling the workspace histories.
Initialization
--------------
The initialization (init) method is executed by the ``FrameworkManager`` when an algorithm is requested and must
-contain the declaration of the properties required by the algorithm. Atypically, it can also contain other
-initialization code such as the calculation of constants used by the algorithm, so long as this does not
+contain the declaration of the properties required by the algorithm. Atypically, it can also contain other
+initialization code such as the calculation of constants used by the algorithm, so long as this does not
rely on the values of any of the properties.
Calls to the ``declareProperty`` method are used to add a property to this algorithm. See the properties page
-for more information on the types of properties supported and the example algorithms in ``UserAlgorithms``
+for more information on the types of properties supported and the example algorithms in ``UserAlgorithms``
(especially `PropertyAlgorithm <http://svn.mantidproject.org/mantid/trunk/Code/Mantid/UserAlgorithms/PropertyAlgorithm.cpp>`__
-and `WorkspaceAlgorithm <http://svn.mantidproject.org/mantid/trunk/Code/Mantid/UserAlgorithms/WorkspaceAlgorithm.cpp>`__)
+and `WorkspaceAlgorithm <http://svn.mantidproject.org/mantid/trunk/Code/Mantid/UserAlgorithms/WorkspaceAlgorithm.cpp>`__)
for further guidance on how to use them.
For the simple types (integer, double or string), the basic syntax is::
declareProperty("UniquePropertyName",value);
-An optional `validator <https://www.mantidproject.org/Properties#Validators>`__ or
+An optional `validator <https://www.mantidproject.org/Properties#Validators>`__ or
`directional argument <https://www.mantidproject.org/Properties#Direction>`__ (input, output or both)
-can also be appended. The syntax for other property types (``WorkspaceProperty`` & ``ArrayProperty``) is more
-complex - see the `properties <https://www.mantidproject.org/Properties#Direction>`__ page or the
+can also be appended. The syntax for other property types (``WorkspaceProperty`` & ``ArrayProperty``) is more
+complex - see the `properties <https://www.mantidproject.org/Properties#Direction>`__ page or the
example algorithms in `UserAlgorithms <https://www.mantidproject.org/UserAlgorithms>`__ for further details.
Execution
@@ -128,36 +128,36 @@ Execution
Fetching properties
-------------------
-Before the data can be processed, the first task is likely to be to fetch the values of the input properties.
+Before the data can be processed, the first task is likely to be to fetch the values of the input properties.
This uses the ``getProperty`` method as follows::
TYPE myProperty = getProperty("PropertyName");
-where ``TYPE`` is the type of the property (``int``, ``double``, ``std::string``, ``std::vector``...). Note that the
+where ``TYPE`` is the type of the property (``int``, ``double``, ``std::string``, ``std::vector``...). Note that the
value of a ``WorkspaceProperty`` is a `shared pointer <https://www.mantidproject.org/Shared_Pointer>`__
-to the workspace, which is referred to as ``Mantid::API::Workspace_sptr`` or ``Mantid::API::Workspace_const_sptr``.
+to the workspace, which is referred to as ``Mantid::API::Workspace_sptr`` or ``Mantid::API::Workspace_const_sptr``.
The latter should be used for input workspaces that will not need to be changed in the course of the algorithm.
If a handle is required on the property itself, rather than just its value, then the same method is used as follows::
Mantid::Kernel::Property* myProperty = getProperty("PropertyName");
-This is useful, for example, for checking whether or not an optional property has been set (using Property's
+This is useful, for example, for checking whether or not an optional property has been set (using Property's
``isDefault()`` method).
Creating the output workspace
-----------------------------
-Usually, the result of an algorithm will be stored in another new workspace and the algorithm
-will need to create that new workspace through a call to the ``WorkspaceFactory``. For the (common)
-example where the output workspace should be of the same type and size as the input one, the code
+Usually, the result of an algorithm will be stored in another new workspace and the algorithm
+will need to create that new workspace through a call to the ``WorkspaceFactory``. For the (common)
+example where the output workspace should be of the same type and size as the input one, the code
would read as follows::
Mantid::API::Workspace_sptr outputWorkspace = Mantid::API::WorkspaceFactory::Instance().create(inputWorkspace);
where ``inputWorkspace`` is a shared pointer to the input workspace.
-It is also important to, at some point, set the output workspace property to point at this workspace.
+It is also important to, at some point, set the output workspace property to point at this workspace.
This is achieved through a call to the ``setProperty`` method as follows::
setProperty("OutputWorkspacePropertyName",outputWorkspace);
@@ -167,9 +167,9 @@ where ``outputWorkspace`` is a shared pointer to the created output workspace.
Using workspaces
----------------
-The bulk of most algorithms will involve the manipulation of the data contained in workspaces
-and information on how to interact with these is given `here <https://www.mantidproject.org/Interacting_with_Workspaces>`__.
-The more advanced user may also want to refer to the full
+The bulk of most algorithms will involve the manipulation of the data contained in workspaces
+and information on how to interact with these is given `here <https://www.mantidproject.org/Interacting_with_Workspaces>`__.
+The more advanced user may also want to refer to the full
`workspace documentation <http://doxygen.mantidproject.org/nightly/d3/de9/classMantid_1_1API_1_1Workspace.html>`__.
Those familiar with C++ should make use of private methods and data members to break up the execution code into
@@ -179,15 +179,15 @@ Further Features
################
The advanced user is referred to the `full documentation page <http://doxygen.mantidproject.org/nightly/d3/de9/classMantid_1_1API_1_1Workspace.html>`__
-for the ``Algorithm`` base class to explore the full range of methods available for use within an algorithm.
+for the ``Algorithm`` base class to explore the full range of methods available for use within an algorithm.
A few aspects are highlighted below.
Child Algorithms
----------------
-Algorithms may wish to make use of the functionality of other algorithms as part of their execution.
-For example, if a units change is required the ``ConvertUnits`` algorithm could be used. Mantid therefore
-has the concept of a child algorithm and this is accessed through a call to the
+Algorithms may wish to make use of the functionality of other algorithms as part of their execution.
+For example, if a units change is required the ``ConvertUnits`` algorithm could be used. Mantid therefore
+has the concept of a child algorithm and this is accessed through a call to the
``createChildAlgorithm`` method as follows::
Mantid::API::Algorithm_sptr childAlg = createChildAlgorithm("AlgorithmName");
@@ -201,48 +201,48 @@ This call will also initialise the algorithm, so the algorithm's properties can
Logging
-------
-The ``g_log`` object enables access to the `logging <Logging>`__ facilities of Mantid, and is an invaluable
+The ``g_log`` object enables access to the `logging <Logging>`__ facilities of Mantid, and is an invaluable
tool in understanding the running of your algorithms.
Enhancing asynchronous running
------------------------------
-Any algorithm can be run asynchronously (e.g. by MantidPlot) without modification. However, some features
-are only enabled if code is added within the ``exec()`` method. ``Algorithm::interruption_point()`` should
-be called at appropriate intervals so that the algorithm's execution can be interrupted.
-``Algorithm::progress(double p)`` reports the progress of the algorithm. ``p`` must be between
+Any algorithm can be run asynchronously (e.g. by MantidPlot) without modification. However, some features
+are only enabled if code is added within the ``exec()`` method. ``Algorithm::interruption_point()`` should
+be called at appropriate intervals so that the algorithm's execution can be interrupted.
+``Algorithm::progress(double p)`` reports the progress of the algorithm. ``p`` must be between
0 (start) and 1 (finish).
Exceptions
----------
-It is fine to throw exceptions in your algorithms in the event of an unrecoverable failure.
+It is fine to throw exceptions in your algorithms in the event of an unrecoverable failure.
These will be caught in the base Algorithm class, which will report the failure of the algorithm.
Validation of inputs
--------------------
-`Validators <https://www.mantidproject.org/Properties#Validators>`__ allow you to give feedback
-to the user if the input of a property is incorrect (for example, typing non-numeric characters
+`Validators <https://www.mantidproject.org/Properties#Validators>`__ allow you to give feedback
+to the user if the input of a property is incorrect (for example, typing non-numeric characters
in a number field).
-For more advanced validation, override the ``Algorithm::validateInputs()`` method. This is a
+For more advanced validation, override the ``Algorithm::validateInputs()`` method. This is a
method that returns a map where:
- The key is the name of the property that is in error.
- The value is a string describing the error.
-This method allows you to provide validation that depends on several property values at once
-(something that cannot be done with ``IValidator``). Its default implementation returns an empty map,
+This method allows you to provide validation that depends on several property values at once
+(something that cannot be done with ``IValidator``). Its default implementation returns an empty map,
signifying no errors.
-It will be called in dialogs **after** parsing all inputs and setting the properties, but **before** executing.
+It will be called in dialogs **after** parsing all inputs and setting the properties, but **before** executing.
It is also called again in the ``execute()`` call, which will throw if this returns something.
-In the MantidPlot GUI, this will set a "star" ``*`` label next to each property that is reporting an error.
+In the MantidPlot GUI, this will set a "star" ``*`` label next to each property that is reporting an error.
This makes it easier for users to find where they went wrong.
-If your ``validateInputs()`` method validates an input workspace property, bear in mind that the user
-could provide a ``WorkspaceGroup`` (or an unexpected type of workspace) - when retrieving the property,
+If your ``validateInputs()`` method validates an input workspace property, bear in mind that the user
+could provide a ``WorkspaceGroup`` (or an unexpected type of workspace) - when retrieving the property,
check that casting it to its intended type succeeded before attempting to use it.
diff --git a/dev-docs/source/_templates/category.html b/dev-docs/source/_templates/category.html
index 084d0d034eca5fa3744b1b90e11314f37714efb1..aedbf97415ad0a044be002641d1904aab536c6d2 100644
--- a/dev-docs/source/_templates/category.html
+++ b/dev-docs/source/_templates/category.html
@@ -41,7 +41,7 @@
<h2> Pages </h2>
{{ split_to_three_columns(pages) }}
{% endif %}
-
+
{% if parentcategory %}
<p> {{ parentcategory }} </p>
{% endif %}
diff --git a/docs/source/algorithms/AbortRemoteJob-v1.rst b/docs/source/algorithms/AbortRemoteJob-v1.rst
index c921941466f4770e64d1392eb61dc87ae2dc63b1..1e511a99470d9078470552aff70d84f2fef2966d 100644
--- a/docs/source/algorithms/AbortRemoteJob-v1.rst
+++ b/docs/source/algorithms/AbortRemoteJob-v1.rst
@@ -15,6 +15,5 @@ For more details, see the `remote job submission API
docs <http://www.mantidproject.org/Remote_Job_Submission_API>`_.
.. categories::
-
+
.. sourcelink::
-
\ No newline at end of file
diff --git a/docs/source/algorithms/AccumulateMD-v1.rst b/docs/source/algorithms/AccumulateMD-v1.rst
index 8b8b2ccb4ad2a809b79c3f71ebb2a1bd7a96cf23..adce18c047ec9f27bb9b352ca91741dc1d2e448d 100644
--- a/docs/source/algorithms/AccumulateMD-v1.rst
+++ b/docs/source/algorithms/AccumulateMD-v1.rst
@@ -57,7 +57,7 @@ Usage
# acc_ws should have double the number of events that md_ws has
print("There are {} events in each of the two data workspaces.".format(md_ws.getNEvents()))
print("The accumulated data workspace contains {} events.".format(acc_ws.getNEvents()))
-
+
Output:
.. testoutput:: ExSimpleAccumulate
diff --git a/docs/source/algorithms/AddAbsorptionWeightedPathLengths-v1.rst b/docs/source/algorithms/AddAbsorptionWeightedPathLengths-v1.rst
index 7ea829ae26216abf4ba780ac46e775dcd0fbf4e8..fa75df51cc2a1e56578202a720a39ad8433a3705 100644
--- a/docs/source/algorithms/AddAbsorptionWeightedPathLengths-v1.rst
+++ b/docs/source/algorithms/AddAbsorptionWeightedPathLengths-v1.rst
@@ -48,7 +48,7 @@ The algorithm for calculating the attenuation factor A proceeds as follows. For
from the selected position on the beam face to the scatter point
* test for intersections of the track & sample object, giving the number of subsections
- and corresponding distances within the object for each section, call them :math:`l_{1i}`. There will typically
+ and corresponding distances within the object for each section, call them :math:`l_{1i}`. There will typically
be a single intersection and subsection but for complex sample shapes it could in theory be more
* form a second `Track` with the scatter position as the starting point and the direction defined by
@@ -79,10 +79,10 @@ Usage
# load a peaks workspace from file
peaks = LoadIsawPeaks(Filename=r'Peaks5637.integrate')
- SetSample(peaks,Geometry={'Shape': 'Cylinder','Height': 5.0,'Radius': 1.0,'Center': [0.,0.,0.]},
+ SetSample(peaks,Geometry={'Shape': 'Cylinder','Height': 5.0,'Radius': 1.0,'Center': [0.,0.,0.]},
Material={'ChemicalFormula': 'V'})
- # populate the t bar column in the peaks workspace
+ # populate the t bar column in the peaks workspace
AddAbsorptionWeightedPathLengths(peaks)
print("Tbar for first peak {:.11f} cm".format(peaks.getPeak(0).getAbsorptionWeightedPathLength()))
diff --git a/docs/source/algorithms/AddLogDerivative-v1.rst b/docs/source/algorithms/AddLogDerivative-v1.rst
index dbb72ea38368f795c4a69d8f7a63812eb2c8d93f..63c1cc7caaa559f6ad1d12397c8d3f581650a586 100644
--- a/docs/source/algorithms/AddLogDerivative-v1.rst
+++ b/docs/source/algorithms/AddLogDerivative-v1.rst
@@ -29,7 +29,7 @@ Usage
**Example: Taking the derivative of logs**
.. testcode:: AddLogDerivative
-
+
ws = CreateSampleWorkspace()
AddTimeSeriesLog(ws,"MyLog","2010-01-01T00:00:00",1.0,DeleteExisting=False)
AddTimeSeriesLog(ws,"MyLog","2010-01-01T00:00:10",2.0,DeleteExisting=False)
diff --git a/docs/source/algorithms/AddSampleLog-v1.rst b/docs/source/algorithms/AddSampleLog-v1.rst
index 86bcde338ab550f029561f0cc4ea172f52820bc8..1b61611cbbd116a34b8e1abb32a23262ea54ff2c 100644
--- a/docs/source/algorithms/AddSampleLog-v1.rst
+++ b/docs/source/algorithms/AddSampleLog-v1.rst
@@ -21,12 +21,12 @@ If the LogText contains a numeric value, the created log will be of
integer type if an integer is passed and floating point (double)
otherwise. This applies to both the Number & Number Series options.
-The algorithm can be forced to create a log of integer or floating point
-type by using the optional NumberType property as 'Int' or 'Double'. For
-example, with NumberType='Double' the log for LogText='12' would be
+The algorithm can be forced to create a log of integer or floating point
+type by using the optional NumberType property as 'Int' or 'Double'. For
+example, with NumberType='Double' the log for LogText='12' would be
created as a floating point (double) rather than an integer. NumberType defaults
to 'AutoDetect' which decides whether to use integer or floating point based
-on the format of the string, e.g. LogText='12' would create an integer type
+on the format of the string, e.g. LogText='12' would create an integer type
log and LogText='12.0' would create a floating point type log.
To add logs that vary over time (Time Series Logs) use :ref:`algm-AddTimeSeriesLog`.
@@ -59,7 +59,7 @@ Usage
Output:
-.. testoutput:: AddSampleLogExample
+.. testoutput:: AddSampleLogExample
hello world
1
diff --git a/docs/source/algorithms/ApplyCalibration-v1.rst b/docs/source/algorithms/ApplyCalibration-v1.rst
index 92a1b627f2fe9263089df6ffbc4614f13ed3b8e9..dd0b5b850504f1cff491b4dd9536a63e07bde96d 100644
--- a/docs/source/algorithms/ApplyCalibration-v1.rst
+++ b/docs/source/algorithms/ApplyCalibration-v1.rst
@@ -28,7 +28,7 @@ Usage
-----
**Example - move three detectors to specified positions that would be got from calibration**
-.. include:: ../usagedata-note.txt
+.. include:: ../usagedata-note.txt
.. testcode:: ExApplyCalibSimple
diff --git a/docs/source/algorithms/ApplyDeadTimeCorr-v1.rst b/docs/source/algorithms/ApplyDeadTimeCorr-v1.rst
index ddf093972d1c6bb7f9a242fc54200da12c5a4925..8825e255de92e4096ba79dc3e2567d4533f0c067 100644
--- a/docs/source/algorithms/ApplyDeadTimeCorr-v1.rst
+++ b/docs/source/algorithms/ApplyDeadTimeCorr-v1.rst
@@ -29,8 +29,8 @@ where
1. Integer type, containing spectrum number (not index)
2. Double type, containing :math:`t_{\mathrm{dead}}` value of the spectrum
-It is assumed that all bins in the *InputWorkspace* are the same
-size (to within reasonable rounding error).
+It is assumed that all bins in the *InputWorkspace* are the same
+size (to within reasonable rounding error).
If they are not, the algorithm will exit with an error.
The *InputWorkspace* must contain a sample log ``goodfrm`` (number of good frames) for the algorithm to run successfully.
diff --git a/docs/source/algorithms/ApplyDetailedBalance-v1.rst b/docs/source/algorithms/ApplyDetailedBalance-v1.rst
index 4c7e957b96a4a97e6fe019fa35d39c38e09dd605..ee8013d4a4927ed62ef1b5f35ac3c1ca038da31b 100644
--- a/docs/source/algorithms/ApplyDetailedBalance-v1.rst
+++ b/docs/source/algorithms/ApplyDetailedBalance-v1.rst
@@ -40,7 +40,7 @@ Usage
print("The Y values in the Output Workspace are")
print(ows.readY(0)[0:5])
print(ows.readY(0)[5:10])
-
+
Output:
.. testoutput:: ExApplyDetailedBalanceSimple
diff --git a/docs/source/algorithms/ApplyMuonDetectorGroupPairing-v1.rst b/docs/source/algorithms/ApplyMuonDetectorGroupPairing-v1.rst
index 92be5dba7dbf9a02bc2727590cad339506acc653..8830990d882499b27d8d832d5884bfcffd604456 100644
--- a/docs/source/algorithms/ApplyMuonDetectorGroupPairing-v1.rst
+++ b/docs/source/algorithms/ApplyMuonDetectorGroupPairing-v1.rst
@@ -18,9 +18,9 @@ Analysis
This algorithm performs the *PairAsymmetry* option of the :ref:`algm-MuonProcess` algorithm, requiring two items of data; spectra corresponding to the groups of detector IDs. This can be given directly to the algorithm via the **InputWorkspace1** and **InputWorkspace2** properties, which accept MatrixWorkspaces with single spectra and identical binning. The pair asymmetry is calculated between the times **TimeMin** and **TimeMax**, and using the **Alpha** parameter (see :ref:`algm-CalculateMuonAsymmetry` for details).
-Alternatively by checking setting **SpecifyGroupsManually** to true the groupings can be performed as part of the algorithm (requiring the full, ungrouped, data in **InputWorkspace**).
+Alternatively by checking setting **SpecifyGroupsManually** to true the groupings can be performed as part of the algorithm (requiring the full, ungrouped, data in **InputWorkspace**).
-In this case **Group1** and **Group2** are separator or range based lists (e.g. "1,2,3-6,7") of detector IDs.
+In this case **Group1** and **Group2** are separator or range based lists (e.g. "1,2,3-6,7") of detector IDs.
Rebbing is optional and can be achieved through the **Rebin** property (using syntax as in :ref:`algm-Rebin`).
@@ -69,26 +69,26 @@ Usage
# Create the workspace group in which the analysed workspaces will be placed
ws = CreateSampleWorkspace()
wsGroup = GroupWorkspaces("ws")
- RenameWorkspace(
- InputWorkspace="wsGroup",
- OutputWorkspace='MUSR00015193',
+ RenameWorkspace(
+ InputWorkspace="wsGroup",
+ OutputWorkspace='MUSR00015193',
OverwriteExisting=True)
# Load the data
- LoadMuonNexus( Filename='MUSR00015193.nxs',
+ LoadMuonNexus( Filename='MUSR00015193.nxs',
OutputWorkspace='MuonAnalysis')
# Create two detector groupings
ApplyMuonDetectorGrouping(
- InputWorkspace='MuonAnalysis',
- InputWorkspaceGroup='MUSR00015193',
- GroupName='fwd',
+ InputWorkspace='MuonAnalysis',
+ InputWorkspaceGroup='MUSR00015193',
+ GroupName='fwd',
Grouping='1-32'
)
ApplyMuonDetectorGrouping(
- InputWorkspace='MuonAnalysis',
- InputWorkspaceGroup='MUSR00015193',
- GroupName='bwd',
+ InputWorkspace='MuonAnalysis',
+ InputWorkspaceGroup='MUSR00015193',
+ GroupName='bwd',
Grouping='33-64'
)
# Add the groupings to the group workspace
@@ -97,11 +97,11 @@ Usage
# Apply the pairing algorithm to the two groups
ApplyMuonDetectorGroupPairing(
- InputWorkspaceGroup='MUSR00015193',
+ InputWorkspaceGroup='MUSR00015193',
PairName='pairTest',
Alpha=1.0,
SpecifyGroupsManually=False,
- InputWorkspace1='MUSR00015193; Group; fwd; Counts; #1_Raw',
+ InputWorkspace1='MUSR00015193; Group; fwd; Counts; #1_Raw',
InputWorkspace2='MUSR00015193; Group; bwd; Counts; #1_Raw'
)
diff --git a/docs/source/algorithms/ApplyMuonDetectorGrouping-v1.rst b/docs/source/algorithms/ApplyMuonDetectorGrouping-v1.rst
index 9f5595498a7576e7e563108461382472ca80b0a7..a5e37c99eb131b1b7a2a2f397f9dddad9628a865 100644
--- a/docs/source/algorithms/ApplyMuonDetectorGrouping-v1.rst
+++ b/docs/source/algorithms/ApplyMuonDetectorGrouping-v1.rst
@@ -18,7 +18,7 @@ Analysis
The algorithm supports two analysis types:
-- *Counts* - The spectra associated to the given detector IDs via **Grouping** are summed (with errors added in quadrature), see :ref:`algm-MuonGroupDetectors`. Note that if several detector IDs are associated to the same spectra, the spectra will be counted **once for each ID**.
+- *Counts* - The spectra associated to the given detector IDs via **Grouping** are summed (with errors added in quadrature), see :ref:`algm-MuonGroupDetectors`. Note that if several detector IDs are associated to the same spectra, the spectra will be counted **once for each ID**.
- *Asymmetry* - The summation from Counts is performed. Then the asymmetry between the given group and muon exponential decay is calculated (see :ref:`algm-EstimateMuonAsymmetryFromCounts`), between the times **TimeMin** and **TimeMax**.
The way in which period data is combined before the analysis is determined by
@@ -65,19 +65,19 @@ Usage
# Create the workspace group in which the analysed workspaces will be placed
ws = CreateSampleWorkspace()
wsGroup = GroupWorkspaces("ws")
- RenameWorkspace( InputWorkspace="wsGroup",
- OutputWorkspace='MUSR00015193',
+ RenameWorkspace( InputWorkspace="wsGroup",
+ OutputWorkspace='MUSR00015193',
OverwriteExisting=True)
# Load the data
- LoadMuonNexus( Filename='MUSR00015193.nxs',
+ LoadMuonNexus( Filename='MUSR00015193.nxs',
OutputWorkspace='MuonAnalysis')
ApplyMuonDetectorGrouping(
- InputWorkspace='MuonAnalysis',
- InputWorkspaceGroup='MUSR00015193',
- GroupName='Test',
- Grouping='1,2,3,5-10',
+ InputWorkspace='MuonAnalysis',
+ InputWorkspaceGroup='MUSR00015193',
+ GroupName='Test',
+ Grouping='1,2,3,5-10',
TimeOffset=0.0,
RebinArgs = "0.2")
diff --git a/docs/source/algorithms/AverageLogData-v1.rst b/docs/source/algorithms/AverageLogData-v1.rst
index bec9ee6bc2daa6400f862797e837657234b79944..80a50f45c6a4715e1faee5ba9510125ac4e59383 100644
--- a/docs/source/algorithms/AverageLogData-v1.rst
+++ b/docs/source/algorithms/AverageLogData-v1.rst
@@ -33,7 +33,7 @@ Usage
#print the values
print("ChopperStatus5 : %1.3f +/- %1.3f"%(value,error))
-
+
.. testcleanup:: AverageLogData
@@ -42,7 +42,7 @@ Usage
Output:
.. testoutput:: AverageLogData
-
+
ChopperStatus5 : 3.942 +/- 0.309
.. categories::
diff --git a/docs/source/algorithms/BinWidthAtX-v1.rst b/docs/source/algorithms/BinWidthAtX-v1.rst
index 23434ef27e59a7ac391f18dff1a4b85612309bec..cca71041158d18303302bf5c5183d4167b6af64a 100644
--- a/docs/source/algorithms/BinWidthAtX-v1.rst
+++ b/docs/source/algorithms/BinWidthAtX-v1.rst
@@ -5,10 +5,10 @@
.. relatedalgorithms::
.. properties::
-
+
Description
-----------
-
+
This algorithm takes the bin width at *X* of each histogram in *InputWorkspace* and calculates the average. This value is then placed in the *BinWidth* output property.
Rounding
@@ -23,13 +23,13 @@ The *InputWorkspace* has to contain histogram data. For point data, :ref:`algm-C
Usage
-----
-
+
**Example: rebin a workspace to equidistant bin boundaries.**
.. testcode:: ExBinWidthAtX
import numpy
-
+
# Create non-equidistant bin boundaries.
xs = [x * x for x in numpy.arange(0.0, 10.0, 0.05)]
# Convert xs to numpy array.
@@ -37,18 +37,18 @@ Usage
# There is one less bin than the number of boundaries.
ys = numpy.zeros(len(xs) - 1)
ws = CreateWorkspace(DataX=xs, DataY=ys)
-
+
newWidth = BinWidthAtX(InputWorkspace=ws, X=1.0, Rounding='10^n')
print('New bin width: {0}'.format(newWidth))
-
+
# Rebin to equidistant grid
rebinned = Rebin(InputWorkspace=ws, Params=[newWidth], FullBinsOnly=True)
-
+
def firstAndLastBinWidths(workspace):
first = workspace.readX(0)[1] - workspace.readX(0)[0]
last = workspace.readX(0)[-1] - workspace.readX(0)[-2]
return (first, last)
-
+
first, last = firstAndLastBinWidths(ws)
print('Bin widths before rebinning, first: {0:.4f}, last: {1:.4f}'.format(first, last))
first, last = firstAndLastBinWidths(rebinned)
diff --git a/docs/source/algorithms/BinaryOperateMasks-v1.rst b/docs/source/algorithms/BinaryOperateMasks-v1.rst
index e43c307252275c1c8091a8a95666f16cf79dd057..3b32d0f1f7194e07a0e9b042dba256898fd99fcf 100644
--- a/docs/source/algorithms/BinaryOperateMasks-v1.rst
+++ b/docs/source/algorithms/BinaryOperateMasks-v1.rst
@@ -40,18 +40,18 @@ Usage
MaskDetectors(ws2, WorkspaceIndexList=0)
a, list = ExtractMask(ws1)
b, list = ExtractMask(ws2)
-
+
# Run using AND
_and = BinaryOperateMasks(a, b, OperationType='AND')
# Run using OR
_or = BinaryOperateMasks(a, b, OperationType='OR')
# Run using XOR
_xor = BinaryOperateMasks(a, b, OperationType='XOR')
-
+
print(_and.readY(0))
print(_or.readY(0))
print(_xor.readY(0))
-
+
Output:
.. testoutput:: BinaryOperateMasksExample
diff --git a/docs/source/algorithms/CalMuonDeadTime-v1.rst b/docs/source/algorithms/CalMuonDeadTime-v1.rst
index b1684486626c5880b83f3b9a031f9338edb4e61f..741852ccfd902ca4027a4d0532f19d78ba78ddf7 100644
--- a/docs/source/algorithms/CalMuonDeadTime-v1.rst
+++ b/docs/source/algorithms/CalMuonDeadTime-v1.rst
@@ -34,7 +34,7 @@ Usage
.. include:: ../usagedata-note.txt
-**Example - Calculating dead times for a file**
+**Example - Calculating dead times for a file**
.. testcode:: CalMuonDeadTime
diff --git a/docs/source/algorithms/CalMuonDetectorPhases-v1.rst b/docs/source/algorithms/CalMuonDetectorPhases-v1.rst
index f4ffb7f8438a0c704672f8afac6b19a90faf77eb..cbc726e40c952f02799c882863d4ee5b11d51755 100644
--- a/docs/source/algorithms/CalMuonDetectorPhases-v1.rst
+++ b/docs/source/algorithms/CalMuonDetectorPhases-v1.rst
@@ -24,8 +24,8 @@ is then treated as a fixed constant when fitting the spectra to the function abo
The algorithm outputs a table workspace containing the spectrum number, the asymmetry and the phase.
This table is intended to be used as the input
-*PhaseTable* to :ref:`PhaseQuad <algm-PhaseQuad>`.
-Usually for muon instruments, each spectrum will correspond to one detector (spectrum number = detector ID).If a spectrum is empty (i.e. the detector is dead) then the phase and asymmetry are recorded as zero and :math:`999` respectively.
+*PhaseTable* to :ref:`PhaseQuad <algm-PhaseQuad>`.
+Usually for muon instruments, each spectrum will correspond to one detector (spectrum number = detector ID).If a spectrum is empty (i.e. the detector is dead) then the phase and asymmetry are recorded as zero and :math:`999` respectively.
In addition, the fitting results are returned
in a workspace group, where each of the items stores the original data (after removing the
@@ -35,10 +35,10 @@ and fit as spectra 0, 1 and 2 respectively.
There are five optional input properties: *FirstGoodData* and *LastGoodData* define the fitting range.
When left blank, *FirstGoodData* is set to the value stored in the input workspace and *LastGoodData*
is set to the last available bin. The optional property *Frequency* allows the user to select an
-initial value for :math:`\omega` (a starting value for the fit). If this property is not supplied, the
+initial value for :math:`\omega` (a starting value for the fit). If this property is not supplied, the
algorithm takes this value from the *sample_magn_field* log multiplied by :math:`2\pi\cdot g_\mu`, where
:math:`g_\mu` is the muon gyromagnetic ratio (0.01355 MHz/G).
-Finally, the optional properties *ForwardSpectra* and *BackwardSpectra* are the sets of spectra in the
+Finally, the optional properties *ForwardSpectra* and *BackwardSpectra* are the sets of spectra in the
forward and backward groups. If these are not supplied, the algorithm will find the instrument from the
input workspace and use the default grouping for this instrument.
@@ -78,7 +78,7 @@ Output:
def isItDead(phase,amplitude):
if phase == 0.0 and amplitude == 999.0:
- return True
+ return True
else:
return False
@@ -92,7 +92,7 @@ Output:
#make y data
def genYData(x,phi):
return np.sin(5.0*x+phi)
-
+
yData = np.append(genYData(x, 0.0), genYData(x, 1.2))
yData = np.append(yData, np.zeros(len(x))) # dead detector
yData = np.append(yData, genYData(x, 3.4))
@@ -109,7 +109,7 @@ Output:
print("Detector {} is dead".format(detectorTable.cell(i,0)))
else:
print("Detector {} is working".format(detectorTable.cell(i,0)))
-
+
Output:
.. testoutput:: CalMuonDetectorPhasesDeadExample
diff --git a/docs/source/algorithms/CalculateCarpenterSampleCorrection-v1.rst b/docs/source/algorithms/CalculateCarpenterSampleCorrection-v1.rst
index 8d2e6836c6a285d02b3221a949f24fda871afcd7..ef5bc3be21cae79b3060ae401f5b774c8c5e0e9f 100644
--- a/docs/source/algorithms/CalculateCarpenterSampleCorrection-v1.rst
+++ b/docs/source/algorithms/CalculateCarpenterSampleCorrection-v1.rst
@@ -17,9 +17,9 @@ Mikkelson.
* Elastic scattering is assumed
-In [1]_ we see that the calculation of the attenuation factor F involves
-an integral over the sample cylinder. By expanding the integrands as a power series,
-we can factor out any dependence on scattering cross section and radius.
+In [1]_ we see that the calculation of the attenuation factor F involves
+an integral over the sample cylinder. By expanding the integrands as a power series,
+we can factor out any dependence on scattering cross section and radius.
These integral terms are denoted by :math:`Z_{mn}` and so we may write:
.. math::
@@ -27,13 +27,13 @@ These integral terms are denoted by :math:`Z_{mn}` and so we may write:
where :math:`\mu` is the inverse scattering length.
-The functions :math:`Z_{mn}(\theta)` are written in terms of Chebyshev
+The functions :math:`Z_{mn}(\theta)` are written in terms of Chebyshev
expansion coefficients:
.. math::
Z_{mn}(\theta) = \sum_{s=0}^\infty c_{s}(m,n)cos(s\theta)
-
-where the Chebyshev coefficients :math:`c_{s}(m,n)` up to m + n
+
+where the Chebyshev coefficients :math:`c_{s}(m,n)` up to m + n
:math:`\leqslant` 5 have been tabulated and are stored as an array by the algorithm.
This version of the correction follows the implementation in [1]_ in that it only calculates for the correction in-plane, unlike [2]_, [3]_ that generalizes the correction to out-of-plane.
@@ -41,7 +41,7 @@ This version of the correction follows the implementation in [1]_ in that it onl
This algorithm calculates and outputs the absorption and/or multiple scattering correction workspaces to be applied to the InputWorkspace. Thus, there are, at most, two workspaces in the OutputWorkspaceBaseName group workspace. This allows for flexibility of applying either correction to a workspace without having to apply both (as is the case with :ref:`algm-CarpenterSampleCorrection`). For the case where both corrections are calculated, the output will be the following:
1. The absorption correction workspace will be OutputWorkspaceBaseName + `_abs` and will be in `.getItem(0)`.
-
+
2. The multiple scattering correction workspace will be OutputWorkspaceBaseName + `_ms` and will be in `.getItem(1)`.
This is the child algorithm that :ref:`algm-CarpenterSampleCorrection` (previously known as *MultipleScatteringCylinderAbsorption*) uses to calculate and apply the correction to a sample workspace.
@@ -126,7 +126,7 @@ Output:
#restrict the number of wavelength points to speed up the example
basename = "corrections"
- CalculateCarpenterSampleCorrection(ws,OutputWorkspaceBaseName=basename,
+ CalculateCarpenterSampleCorrection(ws,OutputWorkspaceBaseName=basename,
CylinderSampleRadius=0.2)
# Get absorption correction
diff --git a/docs/source/algorithms/CalculateCountRate-v1.rst b/docs/source/algorithms/CalculateCountRate-v1.rst
index a52182f29db9c62b7207ee3b9bf2072aaddc6b30..0992f1f027d44f229167812cb4ff5b4c12b01e2a 100644
--- a/docs/source/algorithms/CalculateCountRate-v1.rst
+++ b/docs/source/algorithms/CalculateCountRate-v1.rst
@@ -10,34 +10,34 @@ Description
-----------
The algorithm works with event workspaces produced by instruments operating in event mode and calculates the rate at which an instrument counts
-neutrons as function of the experiment time.
-Then it adds the time series log containing this rate, with the name, defined by
-**CountRateLogName** property to the source workspace.
+neutrons as function of the experiment time.
+Then it adds the time series log containing this rate, with the name, defined by
+**CountRateLogName** property to the source workspace.
-Additionally it can also calculate 2D matrix workspace, which contains count rate as function of
-experiment time and neutrons time of flight or energy or other neutron property related to the time of flight in the range **XMin-XMax**
-in the units defined by **RangeUnits** property.
+Additionally it can also calculate 2D matrix workspace, which contains count rate as function of
+experiment time and neutrons time of flight or energy or other neutron property related to the time of flight in the range **XMin-XMax**
+in the units defined by **RangeUnits** property.
-In normal circumstances the instrument count rate does not change. Unfortunately, Data Acquisition Electronics sometimes randomly generates spurious signals,
-appearing randomly at some moments of the experiment time. Such signals distort real physical image, obtained in experiment and should be removed.
+In normal circumstances the instrument count rate does not change. Unfortunately, Data Acquisition Electronics sometimes randomly generates spurious signals,
+appearing randomly at some moments of the experiment time. Such signals distort real physical image, obtained in experiment and should be removed.
-The picture below gives example of counting rate log, calculated by the algorithm together with image of the visualization workspace,
+The picture below gives example of counting rate log, calculated by the algorithm together with image of the visualization workspace,
which shows the spurious signal as function of experiment time and neutron energy.
-.. image:: /images/SpurionReal.png
+.. image:: /images/SpurionReal.png
The calculated log above can be used as input for :ref:`algm-FilterByLogValue` algorithm to filter events recorded around 200sec of experiment time to
remove spurious signal at 2.9mEv.
-The algorithm can also be used to evaluate changes of sample reflectivity as function of some slow changing experiment's
+The algorithm can also be used to evaluate changes of sample reflectivity as function of some slow changing experiment's
parameter e.g. temperature, magnetic field or pressure.
-**NOTE:** Normally one wants to divide the count rate by a value, proportional to incident neutron flux to avoid count rate dependency from changing incident beam intensity.
-Usually algorithm just divides the neutron counts by *proton_charge* log values, normally recorded per frame basis.
-If this log is not available, other logs can be used to estimate incident beam intensity.
-Visualization workspace is usually calculated with much more coarse time step than the count_rate log, so the normalization used in visualization workspace
-is just the sum of all values of the log used for normalization falling within the visualization time step.
+**NOTE:** Normally one wants to divide the count rate by a value, proportional to incident neutron flux to avoid count rate dependency from changing incident beam intensity.
+Usually algorithm just divides the neutron counts by *proton_charge* log values, normally recorded per frame basis.
+If this log is not available, other logs can be used to estimate incident beam intensity.
+Visualization workspace is usually calculated with much more coarse time step than the count_rate log, so the normalization used in visualization workspace
+is just the sum of all values of the log used for normalization falling within the visualization time step.
@@ -51,20 +51,20 @@ Usage
if "LogTest" in mtd:
DeleteWorkspace("LogTest")
- # Create sample workspace with events
+ # Create sample workspace with events
LogTest=CreateSampleWorkspace(WorkspaceType='Event', Function='Flat background')
log_name = 'block_count_rate';
-
+
# no rate log found:
rez = CheckForSampleLogs(LogTest,log_name)
print("Initially, {0}".format(rez))
-
+
# calculate number of events in the workspace
CalculateCountRate(LogTest,CountRateLogName= log_name)
-
- rez = CheckForSampleLogs(LogTest,log_name)
+
+ rez = CheckForSampleLogs(LogTest,log_name)
if len(rez)==0:
- print("The Algorithm produced log: {0}".format(log_name))
+ print("The Algorithm produced log: {0}".format(log_name))
log = LogTest.run().getLogData(log_name)
print("log {0} contains {1} entries".format(log_name, log.size()))
print("log starts at {0} and records value: {1}".format(log.firstTime(), log.firstValue()))
@@ -72,7 +72,7 @@ Usage
else:
print("{0}".format(rez))
-
+
.. testoutput:: ExCalcCountRate
:options: +ELLIPSIS, +NORMALIZE_WHITESPACE
@@ -81,7 +81,7 @@ Usage
log block_count_rate contains 200 entries
log starts at 2010-01-01T00:00:09... and records value: ...
log ends at 2010-01-01T00:59:50... and records value: ...
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/CalculateMuonAsymmetry-v1.rst b/docs/source/algorithms/CalculateMuonAsymmetry-v1.rst
index e79c6f76ca8feeb59dfea26597d3c6b35ce711c8..5db09f8e2ed0e10d420207465fc50a18d5d36fa1 100644
--- a/docs/source/algorithms/CalculateMuonAsymmetry-v1.rst
+++ b/docs/source/algorithms/CalculateMuonAsymmetry-v1.rst
@@ -28,7 +28,7 @@ and the fitting function is given by
and the renormalized data is transformed via the equation:
-.. math:: \textrm{NewData} = (\textrm{NormalisedCounts}/(N_0) - 1.0.
+.. math:: \textrm{NewData} = (\textrm{NormalisedCounts}/(N_0) - 1.0.
Usage
-----
@@ -56,11 +56,11 @@ This example is for calculating the Asymmetry for a single data set.
tab.addRow([11.,"a","Estimate"])
tab.addRow([22.,"b","Estimate"])
-
+
ws= makeData("a",2.30)
ws2= makeData("b",1.10)
-
- myFunc='name=GausOsc,$domains=i,Frequency=5.;'
+
+ myFunc='name=GausOsc,$domains=i,Frequency=5.;'
TFFunc = ConvertFitFunctionForMuonTFAsymmetry(InputFunction=myFunc,NormalizationTable=tab,WorkspaceList=["a"],Mode="Construct")
CalculateMuonAsymmetry(NormalizationTable=tab, unNormalizedWorkspaceList=["a"],
diff --git a/docs/source/algorithms/CalculatePolynomialBackground-v1.rst b/docs/source/algorithms/CalculatePolynomialBackground-v1.rst
index 281e9e4a6eb58f34746cc0fb1630cf34c0574b3a..d2f92056e60d344de3534512bc3570a4c13fafe9 100644
--- a/docs/source/algorithms/CalculatePolynomialBackground-v1.rst
+++ b/docs/source/algorithms/CalculatePolynomialBackground-v1.rst
@@ -24,7 +24,7 @@ Usage
.. testcode:: CalculatePolynomialBackgroundExample
import numpy
-
+
ws = CreateSampleWorkspace(Function='One Peak')
# ws has a background of 0.3
# There is a single peak around X = 10000 micro-s. Lets exclude it from
diff --git a/docs/source/algorithms/CalculateSlits-v1.rst b/docs/source/algorithms/CalculateSlits-v1.rst
index 1b2967b0baa9a12b79ca56c2bfad365c806dd17a..67ef29e1fe8ea20691e8828793178c32ba0df58c 100644
--- a/docs/source/algorithms/CalculateSlits-v1.rst
+++ b/docs/source/algorithms/CalculateSlits-v1.rst
@@ -28,7 +28,7 @@ Footprint
The footprint of the experiment is not necessarily instrument specific and can be thought of as the area of the sample
that is reach by the beam during the experiment. When providing the value of the footprint to the algorithm it should be
based on the footprint that you would wish to use for the experiment as this information cannot be taken directly from
-the instrument definition and is experiment-dependant.
+the instrument definition and is experiment-dependant.
Usage
-----
diff --git a/docs/source/algorithms/CalibrateRectangularDetectors-v1.rst b/docs/source/algorithms/CalibrateRectangularDetectors-v1.rst
index 21b98f4b4200415d96ee1845f5bb4e7d25c2cb95..604cf8578a3a0a38bf3b09c2ab5ca5be2c0c3345 100644
--- a/docs/source/algorithms/CalibrateRectangularDetectors-v1.rst
+++ b/docs/source/algorithms/CalibrateRectangularDetectors-v1.rst
@@ -25,7 +25,7 @@ detectors to be calibrated with one peak and the next n detectors to be
calibrated with the second peak. If a color fill plot of the calibrated
workspace does not look good, do a color fill plot of the workspace that
ends in cc (cross correlation) to see if the ``CrossCorrelationPoints``
-and/or ``PeakHalfWidth`` should be increased or decreased. Also plot the
+and/or ``PeakHalfWidth`` should be increased or decreased. Also plot the
reference spectra from the cc workspace.
Features to improve performance of peak finding
@@ -36,9 +36,9 @@ Define peak fit-window
There are two exclusive approaches to define peak's fit-window.
-- ``PeakWindowMax`` All peaks will use this value to define their fitting
+- ``PeakWindowMax`` All peaks will use this value to define their fitting
range.
-- ``FitwindowTableWorkspace`` This is a table workspace by which each peak
+- ``FitwindowTableWorkspace`` This is a table workspace by which each peak
will have its individual fit window defined.
Define accepted range of peak's width
diff --git a/docs/source/algorithms/CarpenterSampleCorrection-v1.rst b/docs/source/algorithms/CarpenterSampleCorrection-v1.rst
index 33b7c4239994638cefc19b1c987be7c8ffd427c0..0ea853d200e39d7349dad1f73a8791094fb17a24 100644
--- a/docs/source/algorithms/CarpenterSampleCorrection-v1.rst
+++ b/docs/source/algorithms/CarpenterSampleCorrection-v1.rst
@@ -17,9 +17,9 @@ Mikkelson.
* Elastic scattering is assumed
-In [1]_ we see that the calculation of the attenuation factor F involves
-an integral over the sample cylinder. By expanding the integrands as a power series,
-we can factor out any dependence on scattering cross section and radius.
+In [1]_ we see that the calculation of the attenuation factor F involves
+an integral over the sample cylinder. By expanding the integrands as a power series,
+we can factor out any dependence on scattering cross section and radius.
These integral terms are denoted by :math:`Z_{mn}` and so we may write:
.. math::
@@ -27,13 +27,13 @@ These integral terms are denoted by :math:`Z_{mn}` and so we may write:
where :math:`\mu` is the inverse scattering length.
-The functions :math:`Z_{mn}(\theta)` are written in terms of Chebyshev
+The functions :math:`Z_{mn}(\theta)` are written in terms of Chebyshev
expansion coefficients:
.. math::
Z_{mn}(\theta) = \sum_{s=0}^\infty c_{s}(m,n)cos(s\theta)
-
-where the Chebyshev coefficients :math:`c_{s}(m,n)` up to m + n
+
+where the Chebyshev coefficients :math:`c_{s}(m,n)` up to m + n
:math:`\leqslant` 5 have been tabulated and are stored as an array by the algorithm.
This version of the correction follows the implementation in [1]_ in that it only calculates for the correction in-plane, unlike [2]_, [3]_ that generalizes the correction to out-of-plane.
diff --git a/docs/source/algorithms/CentroidPeaksMD-v1.rst b/docs/source/algorithms/CentroidPeaksMD-v1.rst
index fe919f273ecd1566a3d3325a563b6f67113d4e73..1b4043418cef8f1b924a6e3e744abd86b50a74a2 100644
--- a/docs/source/algorithms/CentroidPeaksMD-v1.rst
+++ b/docs/source/algorithms/CentroidPeaksMD-v1.rst
@@ -15,8 +15,8 @@ the peak by calculating the average of the coordinates of all events
within a given radius of the peak, weighted by the weight (signal) of
the event.
-The V1 of the algorithm is deprecated and left for compartibility with the scripts,
-which have the property *CoordinatesToUse* set.
+The V1 of the algorithm is deprecated and left for compartibility with the scripts,
+which have the property *CoordinatesToUse* set.
Use :ref:`algm-CentroidPeaksMD-v2` for any new scripts.
diff --git a/docs/source/algorithms/CentroidPeaksMD-v2.rst b/docs/source/algorithms/CentroidPeaksMD-v2.rst
index 1b813583a0eebdaf5b146190e70ebe953155728a..673ce10bae2e18d734041fe55d9036a8e0420676 100644
--- a/docs/source/algorithms/CentroidPeaksMD-v2.rst
+++ b/docs/source/algorithms/CentroidPeaksMD-v2.rst
@@ -22,11 +22,11 @@ Usage
**Example - CentroidPeaksMD:**
-The code iteslef works but disabled from doc tests as takes too long to complete. User should provide its own
+The code iteslef works but disabled from doc tests as takes too long to complete. User should provide its own
event nexus file instead of **TOPAZ_3132_event.nxs** used within this example. The original **TOPAZ_3132_event.nxs**
file is available in `Mantid system tests repository <https://github.com/mantidproject/systemtests/tree/master/Data/TOPAZ_3132_event.nxs>`_.
-The example shows how applying centroid peaks changes the peak posisions previously calculated by
+The example shows how applying centroid peaks changes the peak posisions previously calculated by
FindPeaksMD algorithm.
@@ -38,11 +38,11 @@ FindPeaksMD algorithm.
def print_WSDifference(pTWS1,pTWS2,nRows):
''' Method to print difference between two table workspaces before and after applying CentroidPeaks '''
# columns to compare
- tab_names=['RunNumber','DetID','Energy','DSpacing','QLab','QSample']
+ tab_names=['RunNumber','DetID','Energy','DSpacing','QLab','QSample']
common = tab_names[0:2];
long = tab_names[-2:];
-
+
for name in tab_names:
if name in common :
print("| {0:>10} ".format(name))
@@ -55,7 +55,7 @@ FindPeaksMD algorithm.
ntp = ntp[0:6]
print("| old {0:>6} | new {0:>6} ".format(ntp))
print("|\n" )
-
+
for i in xrange(0,nRows):
for name in tab_names:
col1 = pTWS1.column(name);
@@ -69,34 +69,34 @@ FindPeaksMD algorithm.
print("| {0:>30} | {1:>30} ".format(data1_toPr,data2_toPr))
else:
print("| {0:>10.2f} | {1:>10.2f} ".format(data1_toPr,data2_toPr))
-
+
print("|\n ")
-
+
# load test workspace
Load(Filename=r'TOPAZ_3132_event.nxs',OutputWorkspace='TOPAZ_3132_event',LoadMonitors='1')
-
+
# build peak workspace necessary for IntegrateEllipsoids algorithm to work
ConvertToMD(InputWorkspace='TOPAZ_3132_event',QDimensions='Q3D',dEAnalysisMode='Elastic',Q3DFrames='Q_sample',LorentzCorrection='1',OutputWorkspace='TOPAZ_3132_md',\
MinValues='-25,-25,-25',MaxValues='25,25,25',SplitInto='2',SplitThreshold='50',MaxRecursionDepth='13',MinRecursionDepth='7')
-
+
# get initial peak workspace
- peaks=FindPeaksMD(InputWorkspace='TOPAZ_3132_md',PeakDistanceThreshold='0.37680',MaxPeaks='50',DensityThresholdFactor='100',OutputWorkspace='TOPAZ_3132_peaks')
-
+ peaks=FindPeaksMD(InputWorkspace='TOPAZ_3132_md',PeakDistanceThreshold='0.37680',MaxPeaks='50',DensityThresholdFactor='100',OutputWorkspace='TOPAZ_3132_peaks')
+
# refine peaks position with centroid peaks
peaks2=CentroidPeaksMD(InputWorkspace='TOPAZ_3132_md', PeaksWorkspace='TOPAZ_3132_peaks', OutputWorkspace='TOPAZ_3132_peaks2')
-
+
print_WSDifference(peaks,peaks2,10)
-
-
+
+
**Output:**
-
+
.. code-block:: python
:linenos:
-
+
#.. testoutput:: exCentroidPeaksMD
-
-
+
+
| RunNumber | DetID | old Energy | new Energy | old DSpaci | new DSpaci |FindPeaksMD found (old): QLab |IntegrEllipsoids (new): QLab |FindPeaksMD found (old):QSample |IntegrEllipsoids (new): QSample |
| 3132 | 1124984 | 8.49 | 10.39 | 2.02 | 1.93 | [1.57771,1.21779,2.37854] | [1.9157,1.15022,2.37669] | [2.99396,0.815958,0.00317344] | [3.13041,0.861402,0.316416] |
| 3132 | 1156753 | 18.82 | 18.87 | 1.30 | 1.29 | [2.48964,1.45725,3.88666] | [2.50792,1.41823,3.91448] | [4.52618,1.71025,0.129461] | [4.52916,1.75746,0.149293] |
@@ -108,8 +108,8 @@ FindPeaksMD algorithm.
| 3132 | 1232949 | 53.28 | 57.02 | 0.93 | 0.93 | [4.29033,2.63319,4.46168] | [4.40869,2.69431,4.34027] | [6.52658,1.27985,1.00646] | [6.5525,1.15043,1.12919] |
| 3132 | 1189484 | 63.42 | 60.85 | 0.96 | 0.96 | [4.02414,3.39659,3.83664] | [4.15914,3.15181,3.95843] | [6.4679,0.298896,0.726133] | [6.46553,0.557683,0.887368] |
| 3132 | 1218337 | 79.81 | 87.16 | 0.77 | 0.77 | [4.96622,3.61607,5.32554] | [5.17998,3.67105,5.16175] | [7.99244,1.19363,0.892655] | [8.03942,1.03829,1.11448] |
-
-
+
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/ChangePulsetime-v1.rst b/docs/source/algorithms/ChangePulsetime-v1.rst
index 0ce29e0158ce386e810dc50cb9ecd887b9fb9521..1ddc644e205dfb8ae9126ac6a7e532773b0e7e81 100644
--- a/docs/source/algorithms/ChangePulsetime-v1.rst
+++ b/docs/source/algorithms/ChangePulsetime-v1.rst
@@ -9,8 +9,8 @@
Description
-----------
-Modifies the pulse time (wall-clock time) of all the events in the specified
-spectra of an :ref:`EventWorkspace <EventWorkspace>`, by adding the given number
+Modifies the pulse time (wall-clock time) of all the events in the specified
+spectra of an :ref:`EventWorkspace <EventWorkspace>`, by adding the given number
of seconds as specified with ``TimeOffset``.
.. categories::
diff --git a/docs/source/algorithms/ChangeQConvention-v1.rst b/docs/source/algorithms/ChangeQConvention-v1.rst
index bef585d464e0cce34a8e7c3785c7d190331ec699..e1dfb04e57b920c703cb99e9a3579e97044a1d5b 100644
--- a/docs/source/algorithms/ChangeQConvention-v1.rst
+++ b/docs/source/algorithms/ChangeQConvention-v1.rst
@@ -10,7 +10,7 @@ Description
-----------
This algorithm changes the sign of Q and the label of the workspace convention.
This should only be used on MD workspaces that contain only Q or HKL dimensions. If there are other dimensions,
-user should still run this algorithm (so that the convention flag is changed), but then run TransformMD with -1
+user should still run this algorithm (so that the convention flag is changed), but then run TransformMD with -1
for the non-Q dimensions.
diff --git a/docs/source/algorithms/ChangeTimeZero-v1.rst b/docs/source/algorithms/ChangeTimeZero-v1.rst
index 8032701f1cad8f8d37ec2018f4a20bfb1a0905c6..e61a2b80e53b8cdbf7aa2d7ed5eee72a6129045e 100644
--- a/docs/source/algorithms/ChangeTimeZero-v1.rst
+++ b/docs/source/algorithms/ChangeTimeZero-v1.rst
@@ -9,16 +9,16 @@
Description
-----------
-The algorithm modifies the time signatures of a :ref:`MatrixWorkspace <MatrixWorkspace>`. The new time signature
-alters the logs and in case of an :ref:`EventWorkspace <EventWorkspace>` the neutron times as well.
+The algorithm modifies the time signatures of a :ref:`MatrixWorkspace <MatrixWorkspace>`. The new time signature
+alters the logs and in case of an :ref:`EventWorkspace <EventWorkspace>` the neutron times as well.
The time offset can be specified in one of the two following ways:
* A time offset in seconds: In this case all time stamps in the workspace are shifted by the specified amount. A positive entry creates a shift into the future and a negative one creates a shift into the past relative to the original time.
* An ISO8601 time stamp (YYYY-MM-DDTHH:MM:SS, eg 2003-11-30T03:23:54). The logs need to contain a proton_charge time series property for this shift to work. The first time entry of the proton_charge time series is used as a reference time stamp and all times will be shifted according to the difference between this time stamp and the newly specified value.
-
+
Only one of the two ways of shifting the time can be specified.
-
+
Usage
-----
@@ -27,8 +27,8 @@ Usage
**Example - Relative Time Shift for an EventWorkspace:**
.. testcode:: ExRelativeChangeTimeZero
-
- # Load an event workspace
+
+ # Load an event workspace
original_ws = Load('CNCS_7860_event.nxs')
# Specify the time shift
@@ -37,7 +37,7 @@ Usage
# Change the zero time
shifted_ws = ChangeTimeZero(InputWorkspace = original_ws , RelativeTimeOffset = time_shift)
- # Check some logs
+ # Check some logs
original_proton_charge = original_ws.getRun()['proton_charge']
shifted_proton_charge = shifted_ws .getRun()['proton_charge']
@@ -50,7 +50,7 @@ Usage
print("Original pulse times: {} , {} , ...".format(original_pulse_times[0], original_pulse_times[1]))
print("Shifted pulse times: {} , {} , ...".format(shifted_pulse_times[0], shifted_pulse_times[1]))
-
+
.. testcleanup:: ExRelativeChangeTimeZero
DeleteWorkspace('original_ws')
@@ -64,12 +64,12 @@ Output:
Shifted proton_charge time: 2010-03-25T18:55:17.500000000 , 2010-03-25T18:55:17.516667999 , ...
Original pulse times: 2010-03-25T16:09:57.474029541 , 2010-03-25T16:10:33.529106140 , ...
Shifted pulse times: 2010-03-25T18:56:37.974029541 , 2010-03-25T18:57:14.029106140 , ...
-
+
**Example - Absolute Time Shift for an EventWorkspace:**
.. testcode:: ExAbsoluteChangeTimeZero
- # Load an event workspace
+ # Load an event workspace
original_ws = Load('CNCS_7860_event.nxs')
# Specify the time shift
@@ -78,7 +78,7 @@ Output:
# Change the zero time
shifted_ws = ChangeTimeZero(InputWorkspace = original_ws , AbsoluteTimeOffset = time_shift)
- # Check some logs
+ # Check some logs
original_proton_charge = original_ws.getRun()['proton_charge']
shifted_proton_charge = shifted_ws .getRun()['proton_charge']
@@ -100,12 +100,12 @@ Output:
Output:
.. testoutput:: ExAbsoluteChangeTimeZero
-
+
Original proton_charge time: 2010-03-25T16:08:37 , 2010-03-25T16:08:37.016667999 , ...
Shifted proton_charge time: 2002-07-13T14:00:01 , 2002-07-13T14:00:01.016667999 , ...
Original pulse times: 2010-03-25T16:09:57.474029541 , 2010-03-25T16:10:33.529106140 , ...
Shifted pulse times: 2002-07-13T14:01:21.474029541 , 2002-07-13T14:01:57.529106140 , ...
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/CheckForSampleLogs-v1.rst b/docs/source/algorithms/CheckForSampleLogs-v1.rst
index de24be8a0079e53a6b508f203944406897f05415..4ba048388887b8a3e473ce44e71c6a4db1d6fed9 100644
--- a/docs/source/algorithms/CheckForSampleLogs-v1.rst
+++ b/docs/source/algorithms/CheckForSampleLogs-v1.rst
@@ -9,7 +9,7 @@
Description
-----------
-Check if the workspace has some given sample logs. An empty string will be returned if all the logs are found, otherwise the result is an error message
+Check if the workspace has some given sample logs. An empty string will be returned if all the logs are found, otherwise the result is an error message
Usage
@@ -21,7 +21,7 @@ Usage
#load a workspace with logs
ws=Load("CNCS_7860")
-
+
sampleLogs="Phase1,Phase3"
result=CheckForSampleLogs(ws,sampleLogs)
if len(result)==0:
diff --git a/docs/source/algorithms/CheckWorkspacesMatch-v1.rst b/docs/source/algorithms/CheckWorkspacesMatch-v1.rst
index 34ba2f073a1614ed6559d3df52da86da0567ee49..ae88abd1f0437d288a7c865857e0b9bb93651417 100644
--- a/docs/source/algorithms/CheckWorkspacesMatch-v1.rst
+++ b/docs/source/algorithms/CheckWorkspacesMatch-v1.rst
@@ -26,7 +26,7 @@ Workspace2D always fail.
Usage
-----
-**Example - check that two workspaces are equal to one another:**
+**Example - check that two workspaces are equal to one another:**
.. testcode:: ExCheckWorkspacesMatchSimple
@@ -43,10 +43,10 @@ Usage
Output:
.. testoutput:: ExCheckWorkspacesMatchSimple
-
+
Success!
-**Example - check that two workspaces match within a certain tolerance:**
+**Example - check that two workspaces match within a certain tolerance:**
.. testcode:: ExCheckWorkspacesMatchTolerance
@@ -68,7 +68,7 @@ Output:
Output:
.. testoutput:: ExCheckWorkspacesMatchTolerance
-
+
Data mismatch
Success!
diff --git a/docs/source/algorithms/CompactMD-v1.rst b/docs/source/algorithms/CompactMD-v1.rst
index 940518f0793b073329b5aae4e55e525619afadf4..f25bfefbb075d1ecf948fffa35ebfce0335598a8 100644
--- a/docs/source/algorithms/CompactMD-v1.rst
+++ b/docs/source/algorithms/CompactMD-v1.rst
@@ -31,12 +31,12 @@ Usage
FakeMDEventData(InputWorkspace=mdws, PeakParams='100000,5,5,0,1')
#Rebin mdws to create an MDHistoWorkspace
binned_ws = BinMD(InputWorkspace=mdws, AxisAligned=False, BasisVector0='a,unit,1,1,0',BasisVector1='b,unit,-1,1,0',BasisVector2='c,unit,0,0,1',NormalizeBasisVectors=True,Translation=[-10,-10,0], OutputExtents=[0,math.sqrt(2*20*20),-2,2,-10,10], OutputBins=[100, 100, 1] )
-
+
#A visualisation of the rebinned_ws can be found in the 'Input' section below.
-
- #run CompactMD on the rebinned workspace
+
+ #run CompactMD on the rebinned workspace
compact_output = CompactMD(binned_ws)
-
+
#A visualisation of the compacted workspace can be found in the 'Output' section below.
Input:
@@ -46,7 +46,7 @@ Input:
:width: 400px
:align: center
-
+
Output:
.. figure:: /images/RebinnedWorkspaceWithCompactMDApplied.png
diff --git a/docs/source/algorithms/CompareMDWorkspaces-v1.rst b/docs/source/algorithms/CompareMDWorkspaces-v1.rst
index ed72bc0cb4949ae6f65413a04076711f48cee800..223416024ecbba6fd7630e09b86b77bf200eb5b3 100644
--- a/docs/source/algorithms/CompareMDWorkspaces-v1.rst
+++ b/docs/source/algorithms/CompareMDWorkspaces-v1.rst
@@ -27,12 +27,12 @@ Usage
.. testcode:: ExCompareMDWorkspaces
- # create sample inelastic workspace for MARI instrument containing 1 at all spectra
+ # create sample inelastic workspace for MARI instrument containing 1 at all spectra
ws1=CreateSimulationWorkspace(Instrument='MAR',BinParams='-10,1,10',UnitX='DeltaE')
AddSampleLog(ws1,'Ei','12.','Number')
# create the copy of first workspace
ws1a=ws1
- # create second workspace which has different signals
+ # create second workspace which has different signals
ws2=ws1*2;
# Convert to MD
mdWs1 =ConvertToMD(InputWorkspace=ws1,QDimensions='|Q|',QConversionScales='Q in A^-1',SplitInto='100,100',MaxRecursionDepth='1')
@@ -40,7 +40,7 @@ Usage
mdWs2=ConvertToMD(InputWorkspace=ws2,QDimensions='|Q|',QConversionScales='Q in A^-1',SplitInto='100,100',MaxRecursionDepth='1')
# compare the workspaces
comp_rez1=CompareMDWorkspaces(mdWs1,mdWs1a)
- comp_rez2=CompareMDWorkspaces(mdWs1,mdWs2)
+ comp_rez2=CompareMDWorkspaces(mdWs1,mdWs2)
# print comparison results
print("Workspaces mdWs1 and mdWs1a are equal? : {0} : Comparison result: {1}".format(comp_rez1[0], comp_rez1[1]))
@@ -48,7 +48,7 @@ Usage
-
+
**Output:**
.. testoutput:: ExCompareMDWorkspaces
diff --git a/docs/source/algorithms/CompareSampleLogs-v1.rst b/docs/source/algorithms/CompareSampleLogs-v1.rst
index 6ba35f8a55eab816cc9a685668c00b841419ac9f..2f8d64b50615273ded3ad6a4fb21cb1c552b07a8 100644
--- a/docs/source/algorithms/CompareSampleLogs-v1.rst
+++ b/docs/source/algorithms/CompareSampleLogs-v1.rst
@@ -11,7 +11,7 @@ Description
Utility algorithm. Compares specified sample logs for a given list of workspaces or workspace groups. If sample logs match, no output will be produced. If sample logs do not match or do not exist, comma separated list of these sample logs will be returned. This list can be used as an input for :ref:`algm-CreateLogPropertyTable` algorithm to get a TableWorkspace with not identical properties.
-For the moment, algorithm does not support comparison of the time series logs.
+For the moment, algorithm does not support comparison of the time series logs.
Usage
diff --git a/docs/source/algorithms/CompareWorkspaces-v1.rst b/docs/source/algorithms/CompareWorkspaces-v1.rst
index c590bcc2769a8c51fe0f27b88f5d74bd67410238..e48baa86da34a2547301f587ccc7ad2eceb1f35f 100644
--- a/docs/source/algorithms/CompareWorkspaces-v1.rst
+++ b/docs/source/algorithms/CompareWorkspaces-v1.rst
@@ -24,10 +24,10 @@ Workspace2D always fail.
This algorithm has two outputs: A boolean "Result" that indicates whether
the workspaces matched (true) or not (false), and a TableWorkspace property
-named "Messages" (workspace name defaults to "compare_msgs") with three
-columns. The first column contains messages about any mismatches that were
+named "Messages" (workspace name defaults to "compare_msgs") with three
+columns. The first column contains messages about any mismatches that were
detected. The second and third columns are the names of the workspaces that
-were being compared when the mismatch message was issues. If all the input
+were being compared when the mismatch message was issues. If all the input
workspaces matched, the message workspace will be empty.
Please note that details about the comparisons will be only available when the log level is set to debug.
@@ -44,7 +44,7 @@ in each of the two workspaces:
Usage
-----
-**Example - Check that two workspaces are equal to one another:**
+**Example - Check that two workspaces are equal to one another:**
.. testcode:: ExCompareWorkspacesSimple
@@ -69,7 +69,7 @@ Output:
0
-**Example - Check that two workspaces match within a certain tolerance:**
+**Example - Check that two workspaces match within a certain tolerance:**
.. testcode:: ExCompareWorkspacesTolerance
diff --git a/docs/source/algorithms/ComputeIncoherentDOS-v1.rst b/docs/source/algorithms/ComputeIncoherentDOS-v1.rst
index 5a756328c8f7a86e16cb15f37aebfd3adabc4517..67d5c7e928fdd1d2632a5725bd8989ec01ad534a 100644
--- a/docs/source/algorithms/ComputeIncoherentDOS-v1.rst
+++ b/docs/source/algorithms/ComputeIncoherentDOS-v1.rst
@@ -9,7 +9,7 @@
Description
-----------
-Computes the phonon density of states from an inelastic neutron
+Computes the phonon density of states from an inelastic neutron
scattering measurement of a powder or polycrystalline sample,
assuming that all scattering is incoherent, using the formula
for the 1-phonon incoherent scattering function [#CHAPLOT]_:
@@ -18,7 +18,7 @@ for the 1-phonon incoherent scattering function [#CHAPLOT]_:
S^{(1)}_{\mathrm{inc}}(Q,E) = \exp\left(-2\bar{W}(Q)\right) \frac{Q^2}{E} \langle n+\frac{1}{2}\pm\frac{1}{2} \rangle \left[ \sum_k \frac{\sigma_k^{\mathrm{scatt}}}{2m_k} g_k(E) \right],
-where the term in square brackets is the neutron weighted density of
+where the term in square brackets is the neutron weighted density of
states which is calculated by this algorithm, and :math:`g_k(E)` is
the partial density of states for each component (element or isotope)
:math:`k` in the material. :math:`m_k` is the relative atomic mass of the
@@ -26,7 +26,7 @@ component.
The average Debye-Waller factor :math:`\exp\left(-2\bar{W}(Q)\right)` is
calculated using an average mean-square displacement :math:`\langle u^2 \rangle`,
-using :math:`W=Q^2\langle u^2\rangle/2`.
+using :math:`W=Q^2\langle u^2\rangle/2`.
The algorithm accepts both :math:`S(Q,E)` workspaces as well as
:math:`S(2\theta,E)` workspaces. In the latter case :math:`Q` values are
@@ -38,7 +38,7 @@ If the data has been normalised to a Vanadium standard measurement, the
output of this algorithm is the neutron weighted density of states in
milibarns/steradians per formula unit per meV (or per cm^-1). If the sample
material has been set and is found to be a pure element, then an additional
-option will be enabled to calculate the DOS in states per meV (states per
+option will be enabled to calculate the DOS in states per meV (states per
cm^-1) by dividing by the scattering cross-section and multiplying by the
relative atomic mass.
@@ -57,7 +57,7 @@ Usage
The following code will run a reduction on a MARI (ISIS) dataset and apply
the algorithm to the reduced data. The datafiles (runs 21334, 21335, 21347) and
-map file 'mari_res2013.map' should be in your path. Run number 21335 is a
+map file 'mari_res2013.map' should be in your path. Run number 21335 is a
measurement of a large Aluminium sample from the neutron training course.
.. code:: python
@@ -65,7 +65,7 @@ measurement of a large Aluminium sample from the neutron training course.
from Direct import DirectEnergyConversion
from mantid.simpleapi import *
rd = DirectEnergyConversion.DirectEnergyConversion('MARI')
- ws = rd.convert_to_energy(21334, 21335, 60, [-55,0.05,55], 'mari_res2013.map',
+ ws = rd.convert_to_energy(21334, 21335, 60, [-55,0.05,55], 'mari_res2013.map',
monovan_run=21347, sample_mass=106.4, sample_rmm=27, monovan_mapfile='mari_res2013.map')
ws_sqw = SofQW3(ws, [0,0.1,12], 'Direct', 60)
SetSampleMaterial(ws_sqw,'Al')
@@ -79,12 +79,12 @@ measurement of a large Aluminium sample from the neutron training course.
from mantid import mtd
from mantid.simpleapi import *
import matplotlib.pyplot as plt
-
+
ws = DirectILLCollectData('ILL/IN4/087294.nxs')
DirectILLReduction(ws, OutputWorkspace='sqw', OutputSofThetaEnergyWorkspace='stw')
temperature = ws.run().getProperty('sample.temperature').value
dos = ComputeIncoherentDOS('stw', Temperature=temperature, EnergyBinning='0, Emax')
-
+
fig, axis = plt.subplots(subplot_kw={'projection':'mantid'})
axis.errorbar(dos)
axis.set_title('Density of states from $S(2\\theta,W)$')
diff --git a/docs/source/algorithms/ConjoinSpectra-v1.rst b/docs/source/algorithms/ConjoinSpectra-v1.rst
index 1de5a0aff85ac9eab4d1e70c164fa1681114ece7..fab4165baf604fc63081abbffac2055d3ec08fd0 100644
--- a/docs/source/algorithms/ConjoinSpectra-v1.rst
+++ b/docs/source/algorithms/ConjoinSpectra-v1.rst
@@ -30,7 +30,7 @@ ConjoinSpectra operation
Usage
-----
-**Example - Join workspace index 1 from three workspaces**
+**Example - Join workspace index 1 from three workspaces**
.. testcode:: simple_join
@@ -49,7 +49,7 @@ Output:
Creates a workspace with 3 spectra labelled as
['ws_1', 'ws2_1', 'ws3_1']
-**Example - Join spectra from three workspaces using a log value**
+**Example - Join spectra from three workspaces using a log value**
.. testcode:: log
@@ -63,7 +63,7 @@ Output:
wsIndex += 1
for minute in range(60):
time_string = "2010-01-01T00:%02i:00" % minute
- AddTimeSeriesLog(w, Name="myLog", Time=time_string, Value=(wsIndex*100)+minute)
+ AddTimeSeriesLog(w, Name="myLog", Time=time_string, Value=(wsIndex*100)+minute)
wsOut = ConjoinSpectra("ws,ws2,ws3",WorkspaceIndex=0,LabelUsing="myLog",LabelValue="Mean")
print("Creates a workspace with {} spectra labelled using the Mean of myLog.".format(wsOut.getNumberHistograms()))
diff --git a/docs/source/algorithms/ConjoinWorkspaces-v1.rst b/docs/source/algorithms/ConjoinWorkspaces-v1.rst
index a29f7aa4ffa2383a61b53b654098fcd24083c46c..3f504f3287dedd189ff2395101e5daa52b830881 100644
--- a/docs/source/algorithms/ConjoinWorkspaces-v1.rst
+++ b/docs/source/algorithms/ConjoinWorkspaces-v1.rst
@@ -63,7 +63,7 @@ Y axis units and labels
The optional parameters YAxisUnit and YAxisLabel can be used to change the
y axis unit and label when conjoining workspaces. Changing YAxisUnit updates
-YAxisLabel automatically with the value of YAxisUnit, unless a separate value
+YAxisLabel automatically with the value of YAxisUnit, unless a separate value
is supplied.
Exception
diff --git a/docs/source/algorithms/ConvertAxesToRealSpace-v1.rst b/docs/source/algorithms/ConvertAxesToRealSpace-v1.rst
index 018ae20ab4a5c5fb45d6d55d996d0b27ae091007..296d54a1604dd1fcbabc75a0707baf3d44bd814a 100644
--- a/docs/source/algorithms/ConvertAxesToRealSpace-v1.rst
+++ b/docs/source/algorithms/ConvertAxesToRealSpace-v1.rst
@@ -18,8 +18,8 @@ Description
-----------
This converts the workspace into a 2D view of real space detector positions based on the detector positions. This is intended for rapid visualization and has been optimized for speed for use in Live data streams.
-If the data provided has data binned in Time of flight or any other unit this will be integrated into a single value per detector, before converting to the selected detector and rebinning to the new grid.
-The output grid is based in the maximum and minimum values of the detectors for axes selected, and the number of bins selected. The rebinning is simply based on centre point rebinning,
+If the data provided has data binned in Time of flight or any other unit this will be integrated into a single value per detector, before converting to the selected detector and rebinning to the new grid.
+The output grid is based in the maximum and minimum values of the detectors for axes selected, and the number of bins selected. The rebinning is simply based on centre point rebinning,
and as such can be prone to moire based artefacts, however it is fast.
As the rebinning approach is simple centre point rebinning then the quality of the final plot is sensitive to the number of bins selected for each axis, too many will cause gaps between the detectors, and too few will cause overlap in certain bins.
@@ -64,7 +64,7 @@ Usage
ws = CreateSampleWorkspace(BankPixelWidth=20)
#move the 2nd bank to a better position
MoveInstrumentComponent(ws,"bank2",X=0.2,Z=-5,RelativePosition=True)
-
+
wsOut = ConvertAxesToRealSpace(ws,"y","2theta",20,20)
# Print the result
@@ -77,7 +77,7 @@ Usage
Output:
-.. testoutput:: ConvertAxesToRealSpaceExample
+.. testoutput:: ConvertAxesToRealSpaceExample
The output workspace has axes of y with 20 bins
and 2theta with 20 bins.
diff --git a/docs/source/algorithms/ConvertAxisByFormula-v1.rst b/docs/source/algorithms/ConvertAxisByFormula-v1.rst
index a393d65ca87cbd0ac4029aed4c5fc98f69d65b63..bbe8e5c1cbdfb9ec6f75fd9b044befd5767c6a72 100644
--- a/docs/source/algorithms/ConvertAxisByFormula-v1.rst
+++ b/docs/source/algorithms/ConvertAxisByFormula-v1.rst
@@ -11,7 +11,7 @@ Description
This algorithm allows users to adjust the axes of a workspace by a user
defined math formula. It will adjust the data values
-(other than in one case the X values) of a workspace, although it will
+(other than in one case the X values) of a workspace, although it will
reverse the spectra if needed to keep the X values increasing across the workspace.
This only works for MatrixWorkspaces, so will not work on
Multi Dimensional Workspaces or Table Workspaces. If you specify one of the
diff --git a/docs/source/algorithms/ConvertCWPDMDToSpectra-v1.rst b/docs/source/algorithms/ConvertCWPDMDToSpectra-v1.rst
index 74588c765bdc9f437f95ed97f520c23dd61dfd62..e7f913915fb00b41661d04e48973b3308b8e8861 100644
--- a/docs/source/algorithms/ConvertCWPDMDToSpectra-v1.rst
+++ b/docs/source/algorithms/ConvertCWPDMDToSpectra-v1.rst
@@ -11,131 +11,131 @@ Description
This algorithms is to collect the all the counts on the detectors among
a set of measurements, which belong to a same experiment run,
-and bin them according to detector's position, i.e., :math:`2\theta`.
+and bin them according to detector's position, i.e., :math:`2\theta`.
-In this algorithm's name, ConvertCWPDMDToSpectra, *CW* stands for constant wave
-(reactor-source instrument); *PD* stands for powder diffraction; and *MD*
-stands for MDEventWorkspace because the input of this algorithms are two
-MDEventWorkspaces.
+In this algorithm's name, ConvertCWPDMDToSpectra, *CW* stands for constant wave
+(reactor-source instrument); *PD* stands for powder diffraction; and *MD*
+stands for MDEventWorkspace because the input of this algorithms are two
+MDEventWorkspaces.
-This algorithm takes 2 MDEventWorkspaces as inputs.
+This algorithm takes 2 MDEventWorkspaces as inputs.
One stores the detectors' counts;
-and the other stores the monitors' counts.
-These two MDEventWorkspaces are generated from algorithm ConvertSpiceToRealSpace.
+and the other stores the monitors' counts.
+These two MDEventWorkspaces are generated from algorithm ConvertSpiceToRealSpace.
-Furthermore, the unit of the output matrix workspace can be converted to
-d-spacing and momentum transfer (:math:`Q`).
+Furthermore, the unit of the output matrix workspace can be converted to
+d-spacing and momentum transfer (:math:`Q`).
Input Workspaces
################
-Two input MDEventWorkspaces that are required.
+Two input MDEventWorkspaces that are required.
-{\it InputWorkspace} is an MDEventWorkspace stores detectors counts and sample logs.
-Each run in this MDEventWorkspace corresponds to an individual measurement point in experiment run.
-Each run has its own instrument object.
+{\it InputWorkspace} is an MDEventWorkspace stores detectors counts and sample logs.
+Each run in this MDEventWorkspace corresponds to an individual measurement point in experiment run.
+Each run has its own instrument object.
-The other input MDEventWorkspace, i.e., {\it InputMonitorWorkspace} contains the monitor counts of each measurement point.
+The other input MDEventWorkspace, i.e., {\it InputMonitorWorkspace} contains the monitor counts of each measurement point.
The signal value of each MDEvent in this workspace is the monitor counts
-corresponding to an individual detector.
+corresponding to an individual detector.
-These two MDEventWorkspace should have the same number of runs and same number of MDEvent.
+These two MDEventWorkspace should have the same number of runs and same number of MDEvent.
Outputs
#######
-The output is a MatrixWorkspace containing the reduced powder diffraction data from a SPICE file for
-powder diffractometers in HFIR.
+The output is a MatrixWorkspace containing the reduced powder diffraction data from a SPICE file for
+powder diffractometers in HFIR.
-Besides the data, it also has the sample logs' copied from the input workspace.
+Besides the data, it also has the sample logs' copied from the input workspace.
Sample Logs
###########
The sample logs of the reduced HFIR powder diffraction data are aggregrated from all measurements points
-in the experiment run.
+in the experiment run.
-They are copied from the last ExperimentInfo object of the input MDWorkspace {\it InputWorkspace}.
+They are copied from the last ExperimentInfo object of the input MDWorkspace {\it InputWorkspace}.
Target Units
############
-Three units are supported by this algorithm via property *UnitOutput*.
-They are :math:`2\theta`, dSpacing and MomentumTransfer(Q).
+Three units are supported by this algorithm via property *UnitOutput*.
+They are :math:`2\theta`, dSpacing and MomentumTransfer(Q).
-The following equations are used to convert the units.
+The following equations are used to convert the units.
.. math:: \lambda = 2d\sin(\theta)
.. math:: d = \frac{4\pi}{Q}
Therefore neutron wavelength :math:`\lambda` must be given either in sample log or via input property
-if the unit of the output workspace is targeted to be dSpacing or MomentumTransfer.
+if the unit of the output workspace is targeted to be dSpacing or MomentumTransfer.
Binning, Normalization and Error
################################
According to the input binning parameters, the bins in :math:`2\theta` are created as
-:math:`2\theta_{min}, 2\theta_{min}+\Delta, 2\theta_{min}+2\Delta, \cdots`.
+:math:`2\theta_{min}, 2\theta_{min}+\Delta, 2\theta_{min}+2\Delta, \cdots`.
If the unit of output workspace is specified as dSpacing or MomentrumTransfer,
then the bins should be created as :math:`d_{min}, d_{min}+\Delta, d_{min}+2\Delta, \cdots, d_{max}`
-or :math:`q_{min}, q_{min}+\Delta, \cdots, q_{max}` respectively.
+or :math:`q_{min}, q_{min}+\Delta, \cdots, q_{max}` respectively.
For each detector, if its position falls between :math:`2\theta_i` and :math:`2\theta_{i+1}`,,
-:math:`d_i` and :math:`d_{i+1}`, or :math:`Q_i` and :math:`Q_{i+1}`,
-then its counts is added to :math:`Y_i` and the corresponding monitor counts is added to
-:math:`M_i`.
+:math:`d_i` and :math:`d_{i+1}`, or :math:`Q_i` and :math:`Q_{i+1}`,
+then its counts is added to :math:`Y_i` and the corresponding monitor counts is added to
+:math:`M_i`.
-The signals on these bins are normalized by its monitor counts, such that
+The signals on these bins are normalized by its monitor counts, such that
.. math:: y_i = \frac{Y_i}{M_i}
-The error (i.e., standard deviation) is defined as
+The error (i.e., standard deviation) is defined as
.. math:: \frac{\Delta y_i}{y_i} = \sqrt{(\frac{\Delta Y_i}{Y_i})^2 + (\frac{\Delta M_i}{M_i})^2}
Scaling
#######
-The normalized histogram can be scaled up by a factor specified by *ScaleFactor*.
-In most cases, the scaling factor is equal to average monitor counts of all measurements.
+The normalized histogram can be scaled up by a factor specified by *ScaleFactor*.
+In most cases, the scaling factor is equal to average monitor counts of all measurements.
If the scaling factor is specified, then
-the standard error of data point :math:`i` will be converted to
+the standard error of data point :math:`i` will be converted to
.. math:: \sigma^{(s)}_i = f \times \sigma^{(n)}_i
where :math:`f` is the scaling factor, :math:`\sigma^{(n)}_i` is the standard error of the normalized signal
-of data point :math:`i`, and
-:math:`\sigma^{(s)}_i` is the standard error of the signal scaled up.
+of data point :math:`i`, and
+:math:`\sigma^{(s)}_i` is the standard error of the signal scaled up.
Linear Interpolation
####################
-If a user specifies a bin size that is smaller than the resolution of the instrument,
+If a user specifies a bin size that is smaller than the resolution of the instrument,
then it is very likely to occur that some bins have zero count, while their neighboring
-bins have counts that are significantly larger than noise.
-In this case, an option to do linear interpolation to the zero count bins
-in the histogram is provided.
-Property *LinearInterpolateZeroCounts* is used to set the flag to do linear interpolation.
+bins have counts that are significantly larger than noise.
+In this case, an option to do linear interpolation to the zero count bins
+in the histogram is provided.
+Property *LinearInterpolateZeroCounts* is used to set the flag to do linear interpolation.
The linear interpolation will be only applied to those zero-count bins within
-the measuring range.
+the measuring range.
Excluding detectors
###################
-Detectors can be excluded from conversion process.
-They can be specified by their *Detector ID*s via property *ExcludedDetectorIDs*.
-If a detector is specified as being excluded,
-all of its counts of all runs (pts) will be taken out of binning process.
+Detectors can be excluded from conversion process.
+They can be specified by their *Detector ID*s via property *ExcludedDetectorIDs*.
+If a detector is specified as being excluded,
+all of its counts of all runs (pts) will be taken out of binning process.
Workflow
@@ -143,9 +143,9 @@ Workflow
This algorithm is the third step to reduce powder diffraction data from a SPICE file.
Following algorithm *LoadSpiceAscii*, which loads SPICE file to a TableWorkspace
-and {\it ConvertSpiceToRealSpace}, which converts the TableWorkspace to MDEvnetWorkspace
+and {\it ConvertSpiceToRealSpace}, which converts the TableWorkspace to MDEvnetWorkspace
that is able to reflect all the information of the epxeriment,
-{\it ConvertCWPDMDToSpectra} goes through all the detectors' counts and rebins the data.
+{\it ConvertCWPDMDToSpectra} goes through all the detectors' counts and rebins the data.
An Example
##########
@@ -153,9 +153,9 @@ An Example
1. LoadSpiceAscii
2. ConvertSpiceToRealSpace
3. Merge a few data MDWorkspaces together; merge the corresponding monitor MDWorkspaces together;
-4. ConvertCWPDMDToSpectra.
+4. ConvertCWPDMDToSpectra.
-Experimental data with different neutron wavelengths can be binned together to d-spacing or momentum transfer space.
+Experimental data with different neutron wavelengths can be binned together to d-spacing or momentum transfer space.
Usage
@@ -166,17 +166,17 @@ Usage
.. testcode:: ExReduceHB2AToFullprof
# create table workspace and parent log workspace
- LoadSpiceAscii(Filename='HB2A_exp0231_scan0001.dat',
+ LoadSpiceAscii(Filename='HB2A_exp0231_scan0001.dat',
IntegerSampleLogNames="Sum of Counts, scan, mode, experiment_number",
- FloatSampleLogNames="samplemosaic, preset_value, Full Width Half-Maximum, Center of Mass",
- DateAndTimeLog='date,MM/DD/YYYY,time,HH:MM:SS AM',
- OutputWorkspace='Exp0231DataTable',
+ FloatSampleLogNames="samplemosaic, preset_value, Full Width Half-Maximum, Center of Mass",
+ DateAndTimeLog='date,MM/DD/YYYY,time,HH:MM:SS AM',
+ OutputWorkspace='Exp0231DataTable',
RunInfoWorkspace='Exp0231ParentWS')
- # load for HB2A
- ConvertSpiceDataToRealSpace(InputWorkspace='Exp0231DataTable',
- RunInfoWorkspace='Exp0231ParentWS',
- OutputWorkspace='Exp0231DataMD',
+ # load for HB2A
+ ConvertSpiceDataToRealSpace(InputWorkspace='Exp0231DataTable',
+ RunInfoWorkspace='Exp0231ParentWS',
+ OutputWorkspace='Exp0231DataMD',
OutputMonitorWorkspace='Exp0231MonitorMD')
# Convert from real-space MD to Fullprof data
@@ -192,7 +192,7 @@ Usage
# output
ws = mtd["Exp0231Reduced"]
-
+
vecx = ws.readX(0)
vecy = ws.readY(0)
vece = ws.readE(0)
diff --git a/docs/source/algorithms/ConvertCWSDExpToMomentum-v1.rst b/docs/source/algorithms/ConvertCWSDExpToMomentum-v1.rst
index 9e6928d0c004f43c54885e9214c19d4cbf925767..78b52069a197b727b39888172375c4407ea33da3 100644
--- a/docs/source/algorithms/ConvertCWSDExpToMomentum-v1.rst
+++ b/docs/source/algorithms/ConvertCWSDExpToMomentum-v1.rst
@@ -10,15 +10,15 @@ Description
-----------
This algorithms is to convert an experiment done on reactor-based four-circle instrument
-(such as HFIR HB3A) to a MDEventWorkspace with each MDEvent in momentum space.
+(such as HFIR HB3A) to a MDEventWorkspace with each MDEvent in momentum space.
-In this algorithm's name, ConvertCWSDToMomentum, *CW* stands for constant wave
+In this algorithm's name, ConvertCWSDToMomentum, *CW* stands for constant wave
(reactor-source instrument); *SD* stands for single crystal diffraction.
This algorithm takes ??? as inputs.
-Furthermore, the unit of the output matrix workspace can be converted to
+Furthermore, the unit of the output matrix workspace can be converted to
momentum transfer (Q).
@@ -27,7 +27,7 @@ Outline of algorithm
1. Create output workspace
- * Build a virtual instrument, requiring
+ * Build a virtual instrument, requiring
- position of source
- position of sample
@@ -35,42 +35,42 @@ Outline of algorithm
2. Read in data via table workspace
- * From each row, (1) file name and (2) starting detector ID are read in.
- * Detector position in (virtual) instrument of MDEventWorkspace is compared with the position in MatrixWorkspace
+ * From each row, (1) file name and (2) starting detector ID are read in.
+ * Detector position in (virtual) instrument of MDEventWorkspace is compared with the position in MatrixWorkspace
* Momentum is calculated by goniometry values
Input Workspaces
################
-Two TableWorkspaces, which contain experiment information, are required.
+Two TableWorkspaces, which contain experiment information, are required.
-**InputWorkspace** is a TableWorkspace containing the data files names to be loaded for the experiment.
-It is required to have 4 columns.
-They are *Scan*, *Pt*, *Filename* and *StartDetID* respectively.
+**InputWorkspace** is a TableWorkspace containing the data files names to be loaded for the experiment.
+It is required to have 4 columns.
+They are *Scan*, *Pt*, *Filename* and *StartDetID* respectively.
-A typical HB3A experiment consists of multiple scans, each of which contains multiple measurement point (i.e., Pt).
-*FileName* is the XML data file for 2D detector information for a specific Scan/Pt pair.
-*StartDetID* is the starting detector ID of a specific Scan/Pt mapped to the virtual instrument.
+A typical HB3A experiment consists of multiple scans, each of which contains multiple measurement point (i.e., Pt).
+*FileName* is the XML data file for 2D detector information for a specific Scan/Pt pair.
+*StartDetID* is the starting detector ID of a specific Scan/Pt mapped to the virtual instrument.
-**DetectorTableWorkspace** is a TableWorkspace that list the parameters of all detector pixels belonged
-to the virtual instrument.
+**DetectorTableWorkspace** is a TableWorkspace that list the parameters of all detector pixels belonged
+to the virtual instrument.
The parameters include detector ID in virtual instrument, detector's position in cartesian coordinate,
-and detector's original detector ID.
+and detector's original detector ID.
Outputs
#######
-The output is an MDEventWorkspace that stores the data of an HB3A experiment.
-Every non-zero count recorded by detector is converted to an MDEvent in the
-output workspace.
+The output is an MDEventWorkspace that stores the data of an HB3A experiment.
+Every non-zero count recorded by detector is converted to an MDEvent in the
+output workspace.
MDEvent
+++++++
-Each MDEvent in output MDEventWorkspace contain
+Each MDEvent in output MDEventWorkspace contain
* *Kx*
* *Ky*
* *Kz*
@@ -82,34 +82,34 @@ Each MDEvent in output MDEventWorkspace contain
Combine Experiment Into One MDEventWorkspace
--------------------------------------------
-One typical HB3A (reactor-based four-circle diffractometer) experiment consists of
-a set of scans, each of which contains multiple experiment point (labeled as *Pt.* in SPICE).
+One typical HB3A (reactor-based four-circle diffractometer) experiment consists of
+a set of scans, each of which contains multiple experiment point (labeled as *Pt.* in SPICE).
-Each experiment point is independent to the others.
+Each experiment point is independent to the others.
They can have various detector positions, goniometer setup and even sample environment setup.
-In order to integrate them into an organized data structure, i.e., *MDEventWorkspace*,
-a virtual instrument is built in the algorithm.
+In order to integrate them into an organized data structure, i.e., *MDEventWorkspace*,
+a virtual instrument is built in the algorithm.
Virtual instrument
##################
-A virtual instrument is built in the algorithm.
-In this virtual instrument, the number of detectors and their position are determined
+A virtual instrument is built in the algorithm.
+In this virtual instrument, the number of detectors and their position are determined
by the number of individual detector's positions in the *experiment*.
MDEventWorkspace
################
-There is only one *virtual* instrument and *N* ExperimentInfo.
-*N* is the total number of experiment points in the *experiment*.
+There is only one *virtual* instrument and *N* ExperimentInfo.
+*N* is the total number of experiment points in the *experiment*.
Inconsistency between using virtual instrument and copying instrument
#####################################################################
It is found that the results, i.e., the peak's position in sample-momentum
-space, by FindPeaksMD, are different betweent the MDEventWorkspaces
+space, by FindPeaksMD, are different betweent the MDEventWorkspaces
output by this algorithm with copying instrument or creating virtual instrument.
It is caused by the difference of the instruments in the MDEventWorkspace.
@@ -117,7 +117,7 @@ The native HB3A's detector is of type *RectangularDetector*,
while the virtual instrument's detector is just of class *ComAssembly*.
FindPeaksMD calculates the centre of the mass for peak centre,
-and then locates the nearest pixel of the peak center
+and then locates the nearest pixel of the peak center
and re-define the position of the pixel as peak center.
For virtual instrument, CompAssembly::testIntersectionWithChildren()
@@ -132,7 +132,7 @@ Use cases
It is found that creating an instrument with tens of thousands detectors is very
time consuming in Mantid.
-It is caused by creating a map upon these detectors.
+It is caused by creating a map upon these detectors.
With this generation of Mantid, there is no simple solution for it.
For HB3A, there are usually :math:`2\theta` scan, :math:`\omega` scan and :math:`\phi`.
@@ -152,21 +152,21 @@ Usage
.. testcode:: ExConvertHB3AToMDVirtualInstrument
# Create input table workspaces for experiment information and virtual instrument parameters
- CollectHB3AExperimentInfo(ExperimentNumber='355', ScanList='11', PtLists='-1,11',
+ CollectHB3AExperimentInfo(ExperimentNumber='355', ScanList='11', PtLists='-1,11',
DataDirectory='',
GenerateVirtualInstrument = True,
OutputWorkspace='ExpInfoTable', DetectorTableWorkspace='VirtualInstrumentTable')
# Convert to MDWorkspace
- ConvertCWSDExpToMomentum(InputWorkspace='ExpInfoTable', DetectorTableWorkspace='VirtualInstrumentTable',
+ ConvertCWSDExpToMomentum(InputWorkspace='ExpInfoTable', DetectorTableWorkspace='VirtualInstrumentTable',
CreateVirtualInstrument = True,
- OutputWorkspace='QSampleMD', SourcePosition='0,0,2', SamplePosition='0,0,0', PixelDimension='1,2,2,3,3,4,3,3',
+ OutputWorkspace='QSampleMD', SourcePosition='0,0,2', SamplePosition='0,0,0', PixelDimension='1,2,2,3,3,4,3,3',
Directory='')
# Find peak in the MDEventWorkspace
- FindPeaksMD(InputWorkspace='QSampleMD', DensityThresholdFactor=0.10000000000000001,
+ FindPeaksMD(InputWorkspace='QSampleMD', DensityThresholdFactor=0.10000000000000001,
OutputWorkspace='PeakTable')
-
+
# Examine
mdws = mtd['QSampleMD']
print('Output MDEventWorkspace has {} events.'.format(mdws.getNEvents()))
@@ -176,7 +176,7 @@ Usage
qsample = peak['QSample']
print('In Q-sample frame, center of peak 0 is at ({:.5f}, {:.5f}, {:.5f}) at detector with ID {}'.
format(qsample.X(), qsample.Y(), qsample.Z(), peak['DetID']))
-
+
.. testcleanup:: ExConvertHB3AToMDVirtualInstrument
DeleteWorkspace(Workspace='QSampleMD')
@@ -197,7 +197,7 @@ Output:
.. testcode:: ExConvertHB3AToMDCopyInstrument
# Create input table workspaces for experiment information and virtual instrument parameters
- CollectHB3AExperimentInfo(ExperimentNumber='355', ScanList='11', PtLists='-1,11',
+ CollectHB3AExperimentInfo(ExperimentNumber='355', ScanList='11', PtLists='-1,11',
DataDirectory='',
GenerateVirtualInstrument=False,
OutputWorkspace='ExpInfoTable', DetectorTableWorkspace='VirtualInstrumentTable')
@@ -208,9 +208,9 @@ Output:
OutputWorkspace='QSampleMD', Directory='')
# Find peak in the MDEventWorkspace
- FindPeaksMD(InputWorkspace='QSampleMD', DensityThresholdFactor=0.10000000000000001,
+ FindPeaksMD(InputWorkspace='QSampleMD', DensityThresholdFactor=0.10000000000000001,
OutputWorkspace='PeakTable')
-
+
# Examine
mdws = mtd['QSampleMD']
print('Output MDEventWorkspace has {} events.'.format(mdws.getNEvents()))
@@ -220,7 +220,7 @@ Output:
qsample = peak['QSample']
print('In Q-sample frame, center of peak 0 is at ({:.5f}, {:.5f}, {:.5f}) at detector with ID {}'.
format(qsample.X(), qsample.Y(), qsample.Z(), peak['DetID']))
-
+
.. testcleanup:: ExConvertHB3AToMDCopyInstrument
DeleteWorkspace(Workspace='QSampleMD')
diff --git a/docs/source/algorithms/ConvertFitFunctionForMuonTFAsymmetry-v1.rst b/docs/source/algorithms/ConvertFitFunctionForMuonTFAsymmetry-v1.rst
index c2eef262351aa932eb64390e1e11b38730c866a4..055b3132ac9c9ae4a31938c97268bc95077e6b6e 100644
--- a/docs/source/algorithms/ConvertFitFunctionForMuonTFAsymmetry-v1.rst
+++ b/docs/source/algorithms/ConvertFitFunctionForMuonTFAsymmetry-v1.rst
@@ -13,7 +13,7 @@ This algorithm can be run in two modes. The first is construct, which takes a us
.. math:: N_0[1+f(t)] + A\exp(-\lambda t)
-where :math:`N_0` is the normalisation constant, :math:`A` is fixed to zero by default and :math:`\lambda` is fixed to the Muon lifetime. The initial value for the normalisation constant is from the normalisation table.
+where :math:`N_0` is the normalisation constant, :math:`A` is fixed to zero by default and :math:`\lambda` is fixed to the Muon lifetime. The initial value for the normalisation constant is from the normalisation table.
The second mode is extract, if the TF normalisation function is given it will return the user function.
diff --git a/docs/source/algorithms/ConvertMDHistoToMatrixWorkspace-v1.rst b/docs/source/algorithms/ConvertMDHistoToMatrixWorkspace-v1.rst
index 20247520553e0c4e1d4bd2ec5a197f9918bd529f..bc04bd23eadde35aff0a1e547fffe0e536e66b16 100644
--- a/docs/source/algorithms/ConvertMDHistoToMatrixWorkspace-v1.rst
+++ b/docs/source/algorithms/ConvertMDHistoToMatrixWorkspace-v1.rst
@@ -19,7 +19,7 @@ Usage
.. testcode:: ExHasUB1
- ws = CreateMDHistoWorkspace(SignalInput='1,2,3,4,5,6,7,8,9',
+ ws = CreateMDHistoWorkspace(SignalInput='1,2,3,4,5,6,7,8,9',
ErrorInput='1,1,1,1,1,1,1,1,1', Dimensionality='2',
Extents='-1,1,-1,1', NumberOfBins='3,3', Names='A,B', Units='U,T')
@@ -41,12 +41,12 @@ Output:
.. testcode:: ExHasUB2
- ws = CreateMDHistoWorkspace(SignalInput='1,2,3',
+ ws = CreateMDHistoWorkspace(SignalInput='1,2,3',
ErrorInput='1,1,1', Dimensionality='2',
Extents='-1,1,-1,1', NumberOfBins='1,3', Names='A,B', Units='U,T')
print("{} is a {}".format(ws, ws.id()))
-
+
wsOut=ConvertMDHistoToMatrixWorkspace(ws)
print("{} is a {} with {} histograms and {} bins".format(wsOut, wsOut.id(), wsOut.getNumberHistograms(), wsOut.blocksize()))
diff --git a/docs/source/algorithms/ConvertSpiceDataToRealSpace-v1.rst b/docs/source/algorithms/ConvertSpiceDataToRealSpace-v1.rst
index cac91b75b3568f7ef037cae6571eed1378be1344..4476ac2798232382476a0ba70469adb6098e4cda 100644
--- a/docs/source/algorithms/ConvertSpiceDataToRealSpace-v1.rst
+++ b/docs/source/algorithms/ConvertSpiceDataToRealSpace-v1.rst
@@ -9,9 +9,9 @@
Description
-----------
-This algorithm is to load HFIR Spice powder diffraction data to MDWorkspaces.
-HB2A is the only one instrument supported by this algorithm.
-HB2A will be supported in future.
+This algorithm is to load HFIR Spice powder diffraction data to MDWorkspaces.
+HB2A is the only one instrument supported by this algorithm.
+HB2A will be supported in future.
Inputs
######
@@ -19,65 +19,65 @@ Inputs
Required workspaces
+++++++++++++++++++
-There are two input Workspaces that are required for this algoriths.
-Both of them stores the data from a SPICE file.
+There are two input Workspaces that are required for this algoriths.
+Both of them stores the data from a SPICE file.
One is a TableWorkspace that stores the data, including detectors' counts
-and sample environment logs' value, measured per data points.
+and sample environment logs' value, measured per data points.
The other is a MatrixWorkspace that stores the sample logs,
-and serves the parent MatrixWorkspace for all temporary MatrixWorkspaces
-that are created during the algorithm's execution.
+and serves the parent MatrixWorkspace for all temporary MatrixWorkspaces
+that are created during the algorithm's execution.
-These two workspaces can be obtained by executing algorithm LoasSpiceAscii.
+These two workspaces can be obtained by executing algorithm LoasSpiceAscii.
Optional workspaces
+++++++++++++++++++
-An optional TableWorkspace is for applying detectors' efficiency factor
-to the raw detectors' counts.
-It is required to a 2-column TableWorkspace. Column 0 is of integer type for
-detector IDs, while
-Column 1 is of double type for detector efficiency factor (:math:`f`).
-The corrected counts is equal to :math:`counts^{raw}/f`.
+An optional TableWorkspace is for applying detectors' efficiency factor
+to the raw detectors' counts.
+It is required to a 2-column TableWorkspace. Column 0 is of integer type for
+detector IDs, while
+Column 1 is of double type for detector efficiency factor (:math:`f`).
+The corrected counts is equal to :math:`counts^{raw}/f`.
Outputs
#######
-Two MDEventWorkspaces will be output from this algorithm.
+Two MDEventWorkspaces will be output from this algorithm.
-One MDWorkspaces stores the experimental data.
-Each MDEvent is a data point measured on one detector.
+One MDWorkspaces stores the experimental data.
+Each MDEvent is a data point measured on one detector.
Thus if in the experiment, M detectors moves N times, then
-there will be total :math:`M \times N` MDEvents.
-It also stores the sample environment logs values in its ExperimentInfo.
+there will be total :math:`M \times N` MDEvents.
+It also stores the sample environment logs values in its ExperimentInfo.
The other MDWorkspaces stores the monitor counts of each detector
-at each measurement.
+at each measurement.
Format of SPICE data file
#########################
-There are two parts of content in SPICE data file.
-One is the run information, in which line that starts with #.
+There are two parts of content in SPICE data file.
+One is the run information, in which line that starts with #.
-In most cases, the run information is give as
+In most cases, the run information is give as
# run info name = run info value
-The other is the experimental data.
-The first item is an integer as the index of experimental data point.
+The other is the experimental data.
+The first item is an integer as the index of experimental data point.
How to combine measurements
###########################
Powder diffractometers rotates its detectors to achieve the coverage
-and resolution.
-Hence the output of of a run should include all the measurements.
+and resolution.
+Hence the output of of a run should include all the measurements.
MDEventWorkspace is the best solution to combine all the measurements
-to a single workspace and
-keep all the information for future reduction.
+to a single workspace and
+keep all the information for future reduction.
@@ -88,10 +88,10 @@ Apply MDWorkspaces to HFIR powder diffractometer experiment
Run
###
-In an HFIR powder diffractometer scan, one measurement is made at a certain rotational angle.
+In an HFIR powder diffractometer scan, one measurement is made at a certain rotational angle.
Such one meaurement constains 44 detectors' counts, instrument setup (such as rotation angle) and
-sample environment logs.
-As it is translated to MDWorkspace, such a measurement constitutes a {\it run}.
+sample environment logs.
+As it is translated to MDWorkspace, such a measurement constitutes a {\it run}.
Essential logs for building MDWorkspace
@@ -103,32 +103,32 @@ The algorithm allows the user to specify these logs
* Rotation angle to determine the :math:`2\theta` for detector 0. The default is '2theta';
* Prefix of the logs for detectors. The default is 'anode'. In present HB2A's SPICE file, the detectors are labelled as 'anode1', 'anode2', and etc;
* Monitor counts for each measurement. The default is 'monitor';
-* Duration of each measurement. The default is 'time'.
+* Duration of each measurement. The default is 'time'.
Sample Logs
###########
-Sample logs will be written to the ExperimentInfo for each run.
+Sample logs will be written to the ExperimentInfo for each run.
There are N+1 ExperimentInfo in the MDWorkspace that stores
-the detectors' counts.
+the detectors' counts.
-The first N ExperimentInfo are for the N measurements.
-The sample logs's value measured of that data point will be recorded in the corresponding
-ExperimentInfo.
+The first N ExperimentInfo are for the N measurements.
+The sample logs's value measured of that data point will be recorded in the corresponding
+ExperimentInfo.
Hence each of these N ExperimentInfo will contains a set of sample logs, each of which
-contains only one log entry.
+contains only one log entry.
-The last one, i.e., ExperimentInfo[N], contains the combined sample logs from all the runs.
-Hence for an experiment with N runs.
+The last one, i.e., ExperimentInfo[N], contains the combined sample logs from all the runs.
+Hence for an experiment with N runs.
Temporary MD File
#################
In this algorithm, the MDEvnetWorkspaces are created by loading from a temporary MD file,
-which is generated from a set of MatrixWorkspaces.
-Each MatrixWorkspace stores the data for one individual measurement.
+which is generated from a set of MatrixWorkspaces.
+Each MatrixWorkspace stores the data for one individual measurement.
The format of the MD files are like ::
@@ -138,34 +138,34 @@ The format of the MD files are like ::
z Z m 100
# Signal, Error, RunId, DetectorId, coord1, coord2, ... to end of coords
MDEVENTS
- 125 1 1 1 0.209057 0 1.98904
- 133 1 1 2 0.30052 0 1.97729
- 114 1 1 3 0.391584 0 1.96129
- 130 1 1 4 0.485503 0 1.94018
- 143 1 1 5 0.577963 0 1.91467
- 135 1 1 6 0.667844 0 1.8852
- 120 1 1 7 0.753968 0 1.85244
- 115 1 1 8 0.840013 0 1.81504
- 145 1 1 9 0.925819 0 1.77281
- 117 1 1 10 1.00779 0 1.72753
- 105 1 1 11 1.08951 0 1.67719
- 102 1 1 12 1.16527 0 1.62547
- 108 1 1 13 1.24041 0 1.56888
- 110 1 1 14 1.31159 0 1.50988
+ 125 1 1 1 0.209057 0 1.98904
+ 133 1 1 2 0.30052 0 1.97729
+ 114 1 1 3 0.391584 0 1.96129
+ 130 1 1 4 0.485503 0 1.94018
+ 143 1 1 5 0.577963 0 1.91467
+ 135 1 1 6 0.667844 0 1.8852
+ 120 1 1 7 0.753968 0 1.85244
+ 115 1 1 8 0.840013 0 1.81504
+ 145 1 1 9 0.925819 0 1.77281
+ 117 1 1 10 1.00779 0 1.72753
+ 105 1 1 11 1.08951 0 1.67719
+ 102 1 1 12 1.16527 0 1.62547
+ 108 1 1 13 1.24041 0 1.56888
+ 110 1 1 14 1.31159 0 1.50988
... ...
-
+
If there are N detectors of the instruments and M measurements in total,
-then there will be :math:`M\times N` MDEvents listed in the MD file.
+then there will be :math:`M\times N` MDEvents listed in the MD file.
Workflow
--------
-The 2 input workspaces of algorithm ConvertSpiceDataToRealSpace are the output of
-algorithm LoadSpiceAscii.
-Therefore, in order to load an HB2A or HB2B data from a SPICE file,
-LoadSpiceAscii should be called first.
+The 2 input workspaces of algorithm ConvertSpiceDataToRealSpace are the output of
+algorithm LoadSpiceAscii.
+Therefore, in order to load an HB2A or HB2B data from a SPICE file,
+LoadSpiceAscii should be called first.
Usage
@@ -176,17 +176,17 @@ Usage
.. testcode:: ExLoadHB2ADataToMD
# create table workspace and parent log workspace
- LoadSpiceAscii(Filename='HB2A_exp0231_scan0001.dat',
+ LoadSpiceAscii(Filename='HB2A_exp0231_scan0001.dat',
IntegerSampleLogNames="Sum of Counts, scan, mode, experiment_number",
- FloatSampleLogNames="samplemosaic, preset_value, Full Width Half-Maximum, Center of Mass",
- DateAndTimeLog='date,MM/DD/YYYY,time,HH:MM:SS AM',
- OutputWorkspace='Exp0231DataTable',
+ FloatSampleLogNames="samplemosaic, preset_value, Full Width Half-Maximum, Center of Mass",
+ DateAndTimeLog='date,MM/DD/YYYY,time,HH:MM:SS AM',
+ OutputWorkspace='Exp0231DataTable',
RunInfoWorkspace='Exp0231ParentWS')
- # load for HB2A
- ConvertSpiceDataToRealSpace(InputWorkspace='Exp0231DataTable',
- RunInfoWorkspace='Exp0231ParentWS',
- OutputWorkspace='Exp0231DataMD',
+ # load for HB2A
+ ConvertSpiceDataToRealSpace(InputWorkspace='Exp0231DataTable',
+ RunInfoWorkspace='Exp0231ParentWS',
+ OutputWorkspace='Exp0231DataMD',
OutputMonitorWorkspace='Exp0231MonitorMD')
# output
diff --git a/docs/source/algorithms/ConvertToEventWorkspace-v1.rst b/docs/source/algorithms/ConvertToEventWorkspace-v1.rst
index b5ed0670cba9c61fe7bcb44f113d6d3e984bd4a6..3fe5ffa9c49802a9a75d855cdc665f93e09e3664 100644
--- a/docs/source/algorithms/ConvertToEventWorkspace-v1.rst
+++ b/docs/source/algorithms/ConvertToEventWorkspace-v1.rst
@@ -9,10 +9,10 @@
Description
-----------
-This algorithm takes a :ref:`Workspace2D <Workspace2D>`
-with any binning or units as its input. An event is created for each
-bin of each histogram, except if the bin count is 0.0 (unless
-``GenerateZeros`` is true). Infinity and NAN (not-a-number) values
+This algorithm takes a :ref:`Workspace2D <Workspace2D>`
+with any binning or units as its input. An event is created for each
+bin of each histogram, except if the bin count is 0.0 (unless
+``GenerateZeros`` is true). Infinity and NAN (not-a-number) values
are always skipped.
Each event is created with an X position (typically time-of-flight)
diff --git a/docs/source/algorithms/ConvertToMD-v1.rst b/docs/source/algorithms/ConvertToMD-v1.rst
index 399fd37f0afbeb81ff42d335be02dbdd5597b441..a9113f970a5b984568ea0a57c8e2be8ad3f2392b 100644
--- a/docs/source/algorithms/ConvertToMD-v1.rst
+++ b/docs/source/algorithms/ConvertToMD-v1.rst
@@ -9,14 +9,14 @@
Description
-----------
-The algorithm is used transform existing :ref:`Event <EventWorkspace>`
-or :ref:`Matrix <MatrixWorkspace>` workspace into
+The algorithm is used transform existing :ref:`Event <EventWorkspace>`
+or :ref:`Matrix <MatrixWorkspace>` workspace into
:ref:`Multidimensional workspace <MDWorkspace>` using
-`MD Transformations Factory <http://www.mantidproject.org/MD_Transformation_factory>`_.
+`MD Transformations Factory <http://www.mantidproject.org/MD_Transformation_factory>`_.
If the target workspace does not exist, the algorithm creates :ref:`MDEventWorkspace <MDWorkspace>`
-with selected dimensions, e.g. the reciprocal space of momentums **(Qx, Qy, Qz)** or momentums modules **\|Q|**, energy transfer **dE** if available
-and any other user specified log values which can be treated as dimensions. If the target workspace do exist,
+with selected dimensions, e.g. the reciprocal space of momentums **(Qx, Qy, Qz)** or momentums modules **\|Q|**, energy transfer **dE** if available
+and any other user specified log values which can be treated as dimensions. If the target workspace do exist,
the **MD Events** are added to this workspace.
Using the FileBackEnd and Filename properties the algorithm can produce a file-backed workspace.
@@ -26,7 +26,7 @@ Used Subalgorithms
------------------
The algorithm uses :ref:`Unit Factory <Unit Factory>` and existing unit
-conversion procedures from the input Workspace :ref:`units <Unit Factory>`
+conversion procedures from the input Workspace :ref:`units <Unit Factory>`
to the :ref:`units <Unit Factory>` , necessary
for transformation into correspondent **MD Event workspace**. It also uses
:ref:`algm-PreprocessDetectorsToMD` algorithm to help
@@ -99,7 +99,7 @@ Usage examples
**Example - Convert re-binned MARI 2D workspace to 3D MD workspace for further analysis/merging with data at different temperatures :**
.. testcode:: ExConvertToMDNoQ
-
+
# Load Operation (disabled in test code)
# Load(Filename='MAR11001.nxspe',OutputWorkspace='MAR11001')
# Simulates Load of the workspace above #################
@@ -112,23 +112,23 @@ Usage examples
ws=ConvertToMD(InputWorkspace='MAR11001Qe2',OutputWorkspace='MD3',QDimensions='CopyToMD',OtherDimensions='T',\
MinValues='-10,0,0',MaxValues='10,6,500',SplitInto='50,50,5')
-
- #Output **MD3** workspace can be viewed in slice-viewer as 3D workspace with T-axis having single value.
+
+ #Output **MD3** workspace can be viewed in slice-viewer as 3D workspace with T-axis having single value.
#Visualize 3D data using slice viewer:
#plotSlice(ws)
-
- # Look at sample results:
+
+ # Look at sample results:
# A way to look at these results as a text:
print("Resulting MD workspace has {0} events and {1} dimensions".format(ws.getNEvents(),ws.getNumDims()))
print("--------------------------------------------")
-
+
.. testcleanup:: ExConvertToMDNoQ
DeleteWorkspace('MAR11001')
- DeleteWorkspace('MAR11001Qe2')
- DeleteWorkspace('MD3')
- DeleteWorkspace('PreprocessedDetectorsWS')
+ DeleteWorkspace('MAR11001Qe2')
+ DeleteWorkspace('MD3')
+ DeleteWorkspace('PreprocessedDetectorsWS')
**Output:**
@@ -149,7 +149,7 @@ obtained in an experiment and stored in nxspe files are provided to it.
# set up target ws name and remove target workspace with the same name which can occasionally exist.
# list of MD files (workspaces) to combine into target MD workspace
MD_FilesList='';
-
+
# define convetr to MD parameters
pars = dict();
pars['InputWorkspace']=''
@@ -167,15 +167,15 @@ obtained in an experiment and stored in nxspe files are provided to it.
# test script combines all contributed files in memory
pars['OverwriteExisting']=0 # Change this to false, if the files should/can be added in memory
#
- #---> Start loop over contributing files
+ #---> Start loop over contributing files
for n in range(0,5,1):
source_file = 'MER19566_22.0meV_one2one125.nxspe'; # redefine source files list as function of loop number
target = 'MDMAP_T1'+str(n)+'.nxs';
# check if the file already been converted to MD and is there
- if not(os.path.exists(target )):
+ if not(os.path.exists(target )):
print('Converting {}'.format(source_file))
#current_ws=LoadNXSPE(Filename=source)
- #### For the sample script, simulate load operation above
+ #### For the sample script, simulate load operation above
current_ws = CreateSimulationWorkspace(Instrument='MAR',BinParams=[-3,1,3],UnitX='DeltaE',OutputWorkspace=source_file)
AddSampleLog(Workspace=current_ws,LogName='Ei',LogText='3.0',LogType='Number')
@@ -184,7 +184,7 @@ obtained in an experiment and stored in nxspe files are provided to it.
SetUB(Workspace=current_ws,a='1.4165',b='1.4165',c='1.4165',u='1,0,0',v='0,1,0')
# Add crystal rotation (assume rotation abgle Psi=5*n where n is file number. Define list of angles if this is not correct
AddSampleLog(Workspace=current_ws,LogName='Psi',LogText=str(5*n)+'.',LogType='Number') # --correct Psi value may be already in nxspe file. This operation is then unnecessary
- # set crystal rotation
+ # set crystal rotation
SetGoniometer(Workspace=current_ws,Axis0='Psi,0,1,0,1')
# Convert to MD
@@ -211,11 +211,11 @@ obtained in an experiment and stored in nxspe files are provided to it.
print("Resulting MD workspace contains {0} events and {1} dimensions".format(md_ws.getNEvents(),md_ws.getNumDims()))
print("--------------------------------------------")
-
+
.. testcleanup:: ExConvertToMDQ3D
- DeleteWorkspace('md_ws')
- DeleteWorkspace('preprDetMantid')
+ DeleteWorkspace('md_ws')
+ DeleteWorkspace('preprDetMantid')
**Output:**
@@ -232,7 +232,7 @@ obtained in an experiment and stored in nxspe files are provided to it.
**Example - Convert set of inelastic results obtained in Powder mode (direct) as function of temperature to a 3D workspace:**
-This example produces 3-dimensional dataset, with a temperature axis.
+This example produces 3-dimensional dataset, with a temperature axis.
.. testcode:: ExConvertToMD|Q|T
@@ -242,7 +242,7 @@ This example produces 3-dimensional dataset, with a temperature axis.
DeleteWorkspace(RezWS)
except ValueError:
print("Target ws {} not found in analysis data service\n".format(RezWS))
-
+
# define convert to MD parameters
pars = dict();
pars['InputWorkspace']=''
@@ -254,35 +254,35 @@ This example produces 3-dimensional dataset, with a temperature axis.
pars['MaxValues']='12,10,10'
pars['SplitInto']='100,100,12'
pars['OverwriteExisting']=0 # contributed MD worskpaces are added in memory
-
- # let's assume this is the temperature range obtained in experiments and
- # each data file is obtained for particular temperature.
- T = [1.0,2.0,3.0,3.5,4.0,5.0,6.0,7.0,8.0,9.0,9.5,10.0]
+
+ # let's assume this is the temperature range obtained in experiments and
+ # each data file is obtained for particular temperature.
+ T = [1.0,2.0,3.0,3.5,4.0,5.0,6.0,7.0,8.0,9.0,9.5,10.0]
for i in range(0,len(T),1):
# source = sorurce_file_name[i];
- #current_ws=LoadNXSPE(Filename=source)
- # EMULATE LOAD OF DIFFERENT results obtained for different temperatures. ------>
+ #current_ws=LoadNXSPE(Filename=source)
+ # EMULATE LOAD OF DIFFERENT results obtained for different temperatures. ------>
current_ws = CreateSimulationWorkspace(Instrument='MAR',BinParams=[-3,0.1,3],UnitX='DeltaE')
AddSampleLog(Workspace=current_ws,LogName='Ei',LogText='3.0',LogType='Number')
# if the file does not have temperature log, add it here.
- AddSampleLog(Workspace=current_ws,LogName='T',LogText=str(T[i]),LogType='Number Series')
+ AddSampleLog(Workspace=current_ws,LogName='T',LogText=str(T[i]),LogType='Number Series')
# simulate changes in scattering with temperature
current_ws = current_ws*T[i];
# END EMULATION ---------------------------------------------------------------------
-
+
pars['InputWorkspace']=current_ws;
md_ws=ConvertToMD(**pars)
# delete source workspace from memory;
DeleteWorkspace(current_ws)
# end loop
-
+
# produce some test output
print("Resulting MD workspace contains {0} events and {1} dimensions".format(md_ws.getNEvents(),md_ws.getNumDims()))
-
+
.. testcleanup:: ExConvertToMD|Q|T
- DeleteWorkspace(md_ws)
- DeleteWorkspace('preprDetMantid')
+ DeleteWorkspace(md_ws)
+ DeleteWorkspace('preprDetMantid')
**Output:**
diff --git a/docs/source/algorithms/ConvertToMDMinMaxGlobal-v1.rst b/docs/source/algorithms/ConvertToMDMinMaxGlobal-v1.rst
index cbb9f6ad6639efb42a8b0bc681806f81a05e3e92..5982151c9a2f657f6b0ccd8a7bec03924b9ace0d 100644
--- a/docs/source/algorithms/ConvertToMDMinMaxGlobal-v1.rst
+++ b/docs/source/algorithms/ConvertToMDMinMaxGlobal-v1.rst
@@ -11,7 +11,7 @@ Description
The algorithm calculates the *MinValues* and *MaxValues* limits
produced by the :ref:`algm-ConvertToMD` algorithm for three MD transformation possibilities
-namely **CopyToMD**, **|Q|** and **Q3D** [#f1]_. To estimate these limits the algorithm
+namely **CopyToMD**, **|Q|** and **Q3D** [#f1]_. To estimate these limits the algorithm
uses the following procedure:
- If **QDimensions** is **CopyToMD** the first value in *MinValues* is going to
@@ -32,21 +32,21 @@ uses the following procedure:
*MaxValues* are :math:`Q_{max};Q_{max};Q_{max}`
- If ***QDimensions** is **Q3D**, and **Q3DFrames** is **HKL** the first three values of
the *MinValues* are :math:`-Q_{max}\frac{a}{2\pi};-Q_{max}\frac{b}{2\pi};-Q_{max}\frac{c}{2\pi}`
- and the first three values of *MaxValues* are
- :math:`Q_{max}\frac{a}{2\pi};Q_{max}\frac{b}{2\pi};Q_{max}\frac{c}{2\pi}` [#f2]_
+ and the first three values of *MaxValues* are
+ :math:`Q_{max}\frac{a}{2\pi};Q_{max}\frac{b}{2\pi};Q_{max}\frac{c}{2\pi}` [#f2]_
- If **QDimensions** is **|Q|** or **Q3D**, and **dEAnalysisMode** is **Elastic** or
**Inelastic**, the next value in *MinValues* is **dEmin**, and the next value
in *MaxValues* is **dEmax**
- If any **OtherDimensions** are added, the last values in *MinValues*
(*MaxValues*) are the minimum (maximum) of each of the sample log
values selected
-
+
.. rubric:: Notes
-.. [#f1] The algorithm does not use `MD Transformation factory <http://www.mantidproject.org/MD_Transformation_factory>`_ so can be used as
+.. [#f1] The algorithm does not use `MD Transformation factory <http://www.mantidproject.org/MD_Transformation_factory>`_ so can be used as
independent verification of `MD Transformation factory <http://www.mantidproject.org/MD_Transformation_factory>`_ work on a spherical instrument.
.. [#f2] for HKL mode one needs to have an OrientedLattice attached to the sample.
-
+
Usage
-----
@@ -59,11 +59,11 @@ Usage
AddSampleLog(detWS,LogName='Ei',LogText='52.',LogType='Number');
# evaluate |Q| transformation limits
minn,maxx = ConvertToMDMinMaxGlobal(InputWorkspace=detWS,QDimensions='|Q|',dEAnalysisMode='Direct')
- # Look at sample results:
+ # Look at sample results:
print('MD workspace limits:')
print('|Q|_min: {0:10f}, dE_min: {1:10f}'.format(minn[0], minn[1]))
print('|Q|_max: {0:10f}, dE_max: {1:10f}'.format(maxx[0],maxx[1]))
-
+
.. testcleanup:: ExConvertToMDMinMaxGlobalQ
DeleteWorkspace(detWS)
@@ -75,21 +75,21 @@ Usage
MD workspace limits:
|Q|_min: 0.000000, dE_min: -50.000000
|Q|_max: 12.025534, dE_max: 50.000000
-
-**Example -- Find min-max values for Q3D transformation, while converting TOF to energy transfer :**
+
+**Example -- Find min-max values for Q3D transformation, while converting TOF to energy transfer :**
.. testcode:: ExConvertToMDMinMaxGlobalQ3D
-
- # Simulates Load of a workspace with all necessary parameters #################
+
+ # Simulates Load of a workspace with all necessary parameters #################
detWS = CreateSimulationWorkspace(Instrument='MAR',BinParams=[20000,20,400000],UnitX='TOF')
AddSampleLog(detWS,LogName='Ei',LogText='52.',LogType='Number');
-
- # evaluate Q3D transformation limits, which includes converting units
+
+ # evaluate Q3D transformation limits, which includes converting units
minn,maxx = ConvertToMDMinMaxGlobal(InputWorkspace=detWS,QDimensions='Q3D',dEAnalysisMode='Direct')
print('Min values:: Qx: {0:10f}, Qy: {1:10f}, Qz: {2:10f}, dE:{3:10f}'.format(minn[0],minn[1],minn[2],minn[3]))
- print('Max values:: Qx: {0:10f}, Qy: {1:10f}, Qz: {2:10f}, dE:{3:10f}'.format(maxx[0],maxx[1],maxx[2],maxx[3]))
-
+ print('Max values:: Qx: {0:10f}, Qy: {1:10f}, Qz: {2:10f}, dE:{3:10f}'.format(maxx[0],maxx[1],maxx[2],maxx[3]))
+
.. testcleanup:: ExConvertToMDMinMaxGlobalQ3D
DeleteWorkspace(detWS)
@@ -100,17 +100,17 @@ Usage
Min values:: Qx: -5.401917, Qy: -5.401917, Qz: -5.401917, dE: 51.680898
Max values:: Qx: 5.401917, Qy: 5.401917, Qz: 5.401917, dE: 51.999462
-
-
-**Example -- Finding min-max values for CopyToMD transformation uses the source workspace limits :**
-
+
+
+**Example -- Finding min-max values for CopyToMD transformation uses the source workspace limits :**
+
.. testcode:: ExConvertToMDMinMaxGlobalCopyToMD
-
- # Simulates Load of a workspace with all necessary parameters #################
+
+ # Simulates Load of a workspace with all necessary parameters #################
detWS = CreateSimulationWorkspace(Instrument='MAR',BinParams=[200,2,20000],UnitX='TOF')
AddSampleLog(detWS,LogName='Ei',LogText='52.',LogType='Number');
minn,maxx = ConvertToMDMinMaxGlobal(InputWorkspace=detWS,QDimensions='CopyToMD',dEAnalysisMode='Direct',OtherDimensions='Ei')
- # Look at sample results:
+ # Look at sample results:
print('MD workspace limits:')
print('TOF_min: {0:10f}, Ei_min: {1:10f}'.format(minn[0],minn[1]))
print('TOF_max: {0:10f}, Ei_max: {1:10f}'.format(maxx[0],maxx[1]))
@@ -127,7 +127,7 @@ Usage
TOF_min: 200.000000, Ei_min: 52.000000
TOF_max: 20000.000000, Ei_max: 52.000000
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/ConvertToMDMinMaxLocal-v1.rst b/docs/source/algorithms/ConvertToMDMinMaxLocal-v1.rst
index 9fa209a18b66131258fb6ebcd52858fb447d5150..4bd3fab52899916f3af4014af073ccde810a4a19 100644
--- a/docs/source/algorithms/ConvertToMDMinMaxLocal-v1.rst
+++ b/docs/source/algorithms/ConvertToMDMinMaxLocal-v1.rst
@@ -9,25 +9,25 @@
Description
-----------
-Calculate min-max input values for selected workspace and MD transformation,
+Calculate min-max input values for selected workspace and MD transformation,
chosen from `MD Transformation factory <http://www.mantidproject.org/MD_Transformation_factory>`_.
-Used as helper algorithm for :ref:`algm-ConvertToMD` but can also be deployed separately
+Used as helper algorithm for :ref:`algm-ConvertToMD` but can also be deployed separately
to evaluate the MD transformation limits for the current workspace.
Initiates the same as :ref:`algm-ConvertToMD` algorithm transformation from the
-`MD Transformation factory <http://www.mantidproject.org/MD_Transformation_factory>`_ and uses this
-transformation to evaluate all points where the transformation can achieve extrema
-for each workspace spectra. Then goes through all extrema points, calculates min/max
-values for each spectra and select global min-max transformation values for
+`MD Transformation factory <http://www.mantidproject.org/MD_Transformation_factory>`_ and uses this
+transformation to evaluate all points where the transformation can achieve extrema
+for each workspace spectra. Then goes through all extrema points, calculates min/max
+values for each spectra and select global min-max transformation values for
this workspace.
For example, given input workspace in the units of energy transfer and
requesting :math:`|Q|` inelastic transformation, the algorithm looks through
all spectra of the input workspace and identifies minimal, maximal and
-an extremal [#f1]_ energy transfer for the input spectra. Then it runs
+an extremal [#f1]_ energy transfer for the input spectra. Then it runs
:math:`|Q|,dE` conversion for these energy transfer points and loops through all
-spectra of the workspace to identify :math:`|Q|_{min}, |Q|_{max}` and
+spectra of the workspace to identify :math:`|Q|_{min}, |Q|_{max}` and
:math:`dE_{min},dE_{max}` values.
.. rubric:: Note
@@ -35,7 +35,7 @@ spectra of the workspace to identify :math:`|Q|_{min}, |Q|_{max}` and
.. [#f1] extremal energy transfer for **|Q|** transformation occurs at some
energy transfer where momentum transfer is maximal. Its value depend on
polar angle of the detector.
-
+
Usage
-----
@@ -48,15 +48,15 @@ Usage
AddSampleLog(detWS,LogName='Ei',LogText='52.',LogType='Number');
# evaluate |Q| transformation limits
minn,maxx = ConvertToMDMinMaxLocal(InputWorkspace=detWS,QDimensions='|Q|',dEAnalysisMode='Direct')
- # Look at sample results:
+ # Look at sample results:
print('MD workspace limits:')
print('|Q|_min: {0:10f}, dE_min: {1:10f}'.format(minn[0],minn[1]))
print('|Q|_max: {0:10f}, dE_max: {1:10f}'.format(maxx[0],maxx[1]))
-
+
.. testcleanup:: ExConvertToMDMinMaxLocalQ
DeleteWorkspace(detWS)
- DeleteWorkspace('PreprocessedDetectorsWS')
+ DeleteWorkspace('PreprocessedDetectorsWS')
**Output:**
@@ -66,23 +66,23 @@ Usage
|Q|_min: 0.299713, dE_min: -50.000000
|Q|_max: 11.102851, dE_max: 50.000000
-**Example -- Find min-max values for Q3D transformation, while converting TOF to energy transfer :**
+**Example -- Find min-max values for Q3D transformation, while converting TOF to energy transfer :**
.. testcode:: ExConvertToMDMinMaxLocalQ3D
-
- # Simulates Load of a workspace with all necessary parameters #################
+
+ # Simulates Load of a workspace with all necessary parameters #################
detWS = CreateSimulationWorkspace(Instrument='MAR',BinParams=[20000,20,400000],UnitX='TOF')
AddSampleLog(detWS,LogName='Ei',LogText='52.',LogType='Number');
-
- # evaluate Q3D transformation limits, which includes converting units
+
+ # evaluate Q3D transformation limits, which includes converting units
minn,maxx = ConvertToMDMinMaxLocal(InputWorkspace=detWS,QDimensions='Q3D',dEAnalysisMode='Direct')
print('Min values:: Qx: {0:10f}, Qy: {1:10f}, Qz: {2:10f}, dE:{3:10f}'.format(minn[0],minn[1],minn[2],minn[3]))
- print('Max values:: Qx: {0:10f}, Qy: {1:10f}, Qz: {2:10f}, dE:{3:10f}'.format(maxx[0],maxx[1],maxx[2],maxx[3]))
-
+ print('Max values:: Qx: {0:10f}, Qy: {1:10f}, Qz: {2:10f}, dE:{3:10f}'.format(maxx[0],maxx[1],maxx[2],maxx[3]))
+
.. testcleanup:: ExConvertToMDMinMaxLocalQ3D
DeleteWorkspace(detWS)
- DeleteWorkspace('PreprocessedDetectorsWS')
+ DeleteWorkspace('PreprocessedDetectorsWS')
**Output:**
@@ -90,16 +90,16 @@ Usage
Min values:: Qx: -0.067199, Qy: -0.090211, Qz: 4.617771, dE: 51.680897
Max values:: Qx: 0.067199, Qy: 0.392381, Qz: 5.282783, dE: 51.999462
-
-**Example -- Finding min-max values for CopyToMD transformation uses the source workspace limits :**
-
+
+**Example -- Finding min-max values for CopyToMD transformation uses the source workspace limits :**
+
.. testcode:: ExConvertToMDMinMaxLocalCopyToMD
-
- # Simulates Load of a workspace with all necessary parameters #################
+
+ # Simulates Load of a workspace with all necessary parameters #################
detWS = CreateSimulationWorkspace(Instrument='MAR',BinParams=[200,2,20000],UnitX='TOF')
AddSampleLog(detWS,LogName='Ei',LogText='52.',LogType='Number');
minn,maxx = ConvertToMDMinMaxLocal(InputWorkspace=detWS,QDimensions='CopyToMD',dEAnalysisMode='Direct',OtherDimensions='Ei')
- # Look at sample results:
+ # Look at sample results:
print('MD workspace limits:')
print('TOF_min: {0:10f}, Ei_min: {1:10f}'.format(minn[0],minn[1]))
print('TOF_max: {0:10f}, Ei_max: {1:10f}'.format(maxx[0],maxx[1]))
@@ -107,7 +107,7 @@ Usage
.. testcleanup:: ExConvertToMDMinMaxLocalCopyToMD
DeleteWorkspace(detWS)
- DeleteWorkspace('PreprocessedDetectorsWS')
+ DeleteWorkspace('PreprocessedDetectorsWS')
**Output:**
@@ -117,8 +117,8 @@ Usage
TOF_min: 200.000000, Ei_min: 52.000000
TOF_max: 20000.000000, Ei_max: 52.000000
-
-
+
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/ConvertToMatrixWorkspace-v1.rst b/docs/source/algorithms/ConvertToMatrixWorkspace-v1.rst
index 54ebf29438e2a466646ee06d4432a4ad1d40b448..2d71cf586e47eb6d9c54bfc2a7dc70bc159760eb 100644
--- a/docs/source/algorithms/ConvertToMatrixWorkspace-v1.rst
+++ b/docs/source/algorithms/ConvertToMatrixWorkspace-v1.rst
@@ -48,8 +48,8 @@ Usage
Output:
-.. testoutput:: ConvertToMatrixWorkspaceComplexExample
-
+.. testoutput:: ConvertToMatrixWorkspaceComplexExample
+
51200 17
51200 17
diff --git a/docs/source/algorithms/ConvertToReflectometryQ-v1.rst b/docs/source/algorithms/ConvertToReflectometryQ-v1.rst
index 04ffb1505064027341d47fe5d77d923d0e66abb8..96dff8d48ed37e5ad82ffee121c86b672a386acb 100644
--- a/docs/source/algorithms/ConvertToReflectometryQ-v1.rst
+++ b/docs/source/algorithms/ConvertToReflectometryQ-v1.rst
@@ -119,11 +119,11 @@ Normalised Polygon Transformation
# Should now have signed theta vs Lambda
ConvertSpectrumAxis(InputWorkspace=I,OutputWorkspace='SignedTheta_vs_Wavelength',Target='signed_theta')
-
+
qxqy, vertexes_qxqy = ConvertToReflectometryQ(InputWorkspace='SignedTheta_vs_Wavelength', OutputDimensions='Q (lab frame)', Extents='-0.0005,0.0005,0,0.12', OutputAsMDWorkspace=False,Method='NormalisedPolygon')
-
+
kikf, vertexes_kikf = ConvertToReflectometryQ(InputWorkspace='SignedTheta_vs_Wavelength', OutputDimensions='K (incident, final)', Extents='0,0.05,0,0.05', OutputAsMDWorkspace=False,Method='NormalisedPolygon')
-
+
pipf, vertexes_pipf = ConvertToReflectometryQ(InputWorkspace='SignedTheta_vs_Wavelength', OutputDimensions='P (lab frame)', Extents='0,0.1,-0.02,0.15', OutputAsMDWorkspace=False,Method='NormalisedPolygon')
print("{} {}".format(qxqy.getDimension(0).name, qxqy.getDimension(1).name))
@@ -138,14 +138,14 @@ Output:
Qx Qz
Ki Kf
Pz_i + Pz_f Pz_i - Pz_f
-
+
Plot of the SignedTheta vs Wavelength workspace:
================================================
Before the ConvertToReflectometryQ algorithm is executed in the usage example above, the plot of the 'SignedTheta_vs_Wavelength' workspace should resemble this plot:
.. figure:: /images/SignedThetaVSlam_plot.png
- :alt: plot of Signed theta vs lambda.
-
+ :alt: plot of Signed theta vs lambda.
+
Patch Plot with Dumped Vertexes
###############################
@@ -163,15 +163,15 @@ achieved by running the algorithm below.
from matplotlib.collections import PatchCollection
import matplotlib.pyplot as plt
from matplotlib.colors import LogNorm
-
+
# full reduction on workspace
Load(Filename='data_th_lam.nxs', OutputWorkspace='data_th_lam')
CropWorkspace('data_th_lam', StartWorkspaceIndex=124, OutputWorkspace='data_th_lam')
data_th_lam = Rebin('data_th_lam', [1e-2])
-
- out_ws, dump_vertexes = ConvertToReflectometryQ(InputWorkspace='data_th_lam',OutputWorkspace='QxQy_poly', OutputDimensions='Q (lab frame)',
+
+ out_ws, dump_vertexes = ConvertToReflectometryQ(InputWorkspace='data_th_lam',OutputWorkspace='QxQy_poly', OutputDimensions='Q (lab frame)',
Extents='-0.0005,0.0005,-0,0.2', OutputAsMDWorkspace=False,Method='NormalisedPolygon', IncidentTheta=0.44, OverrideIncidentTheta=True, NumberBinsQx=100, NumberBinsQz=100,DumpVertexes=True, OutputVertexes='dump_vertexes')
-
+
#plot the conversion
plotSlice(out_ws)
@@ -180,7 +180,7 @@ achieved by running the algorithm below.
patches = list()
colors = list()
- polygon_vertexes = list()
+ polygon_vertexes = list()
for vertex in vertex_table:
#Column of vertex i.e 'Qx' in this case, is dependent on the type of transform.
@@ -192,7 +192,7 @@ achieved by running the algorithm below.
patches.append(poly)
colors.append(vertex['CellSignal'])
polygon_vertexes = list()
-
+
p = PatchCollection(patches, cmap=matplotlib.cm.jet,norm=LogNorm(vmin=1e-3, vmax=1e5),linewidths=(0,))
p.set_array(np.array(colors))
ax.add_collection(p)
@@ -202,7 +202,7 @@ achieved by running the algorithm below.
axes.set_ylim([0,0.2])
plt.show()
-
+
threadsafe_call(patch_plot, dump_vertexes)
**Output:**
@@ -222,7 +222,7 @@ Patch plots can also be produced using the other Transformations :math:`K_i, K_f
.. figure:: /images/ConvertToReflectometryQ_PatchPlotK.PNG
- :alt: patch plot of dumped vertexes using K transformation
+ :alt: patch plot of dumped vertexes using K transformation
**Patch plot for P Transformation:**
diff --git a/docs/source/algorithms/ConvertToYSpace-v1.rst b/docs/source/algorithms/ConvertToYSpace-v1.rst
index 42981b13a1b13d1b2529545c4cca43210965468d..b75a4091527e828c31cab063abee0029723263a4 100644
--- a/docs/source/algorithms/ConvertToYSpace-v1.rst
+++ b/docs/source/algorithms/ConvertToYSpace-v1.rst
@@ -43,11 +43,11 @@ Usage
###### Simulates Load workspace for and Indirect spectrometer #################
tof_ws = CreateSimulationWorkspace(Instrument='MAR',BinParams=[-50,2,50],UnitX='TOF')
SetInstrumentParameter(tof_ws,ParameterName='t0',ParameterType='Number',Value='0.5')
- SetInstrumentParameter(tof_ws,ParameterName='efixed',ParameterType='Number',Value='30.')
+ SetInstrumentParameter(tof_ws,ParameterName='efixed',ParameterType='Number',Value='30.')
###### Convert data to format acceptable by ConvertToYSpace
tof_ws = ConvertToPointData(tof_ws)
###### Convert to Y Space
- wsY=ConvertToYSpace(InputWorkspace='tof_ws',Mass='30')
+ wsY=ConvertToYSpace(InputWorkspace='tof_ws',Mass='30')
#
# Look at sample results:
print('part of the converted workspace:')
@@ -58,7 +58,7 @@ Usage
.. testcleanup:: ExConvetToYSp
DeleteWorkspace(wsY)
- DeleteWorkspace(tof_ws)
+ DeleteWorkspace(tof_ws)
**Output:**
diff --git a/docs/source/algorithms/ConvolutionFitSequential-v1.rst b/docs/source/algorithms/ConvolutionFitSequential-v1.rst
index 947321ef57a0e60a14807f006ab85c3f6bc89c4c..3cfd4fbf435ff2dc2f65bd31b12afe08ad6863cd 100644
--- a/docs/source/algorithms/ConvolutionFitSequential-v1.rst
+++ b/docs/source/algorithms/ConvolutionFitSequential-v1.rst
@@ -55,28 +55,28 @@ Usage
ConvolveMembers=convolve,
Minimizer=minimizer, MaxIterations=maxIt)
result_ws = result_ws[0]
-
+
print("Result has %i Spectra" %result_ws.getNumberHistograms())
-
+
print("Amplitude 0: %.3f" %(result_ws.readY(0)[0]))
print("Amplitude 1: %.3f" %(result_ws.readY(0)[1]))
print("Amplitude 2: %.3f" %(result_ws.readY(0)[2]))
-
+
print("X axis at 0: %.5f" %(result_ws.readX(0)[0]))
print("X axis at 1: %.5f" %(result_ws.readX(0)[1]))
print("X axis at 2: %.5f" %(result_ws.readX(0)[2]))
-
+
print("Amplitude Err 0: %.5f" %(result_ws.readE(0)[0]))
print("Amplitude Err 1: %.5f" %(result_ws.readE(0)[1]))
print("Amplitude Err 2: %.5f" %(result_ws.readE(0)[2]))
-Output:
-
+Output:
+
.. testoutput:: ConvolutionFitSequentialExample
:options: +NORMALIZE_WHITESPACE
Result has 3 Spectra
-
+
Amplitude 0: 4.314
Amplitude 1: 4.213
Amplitude 2: 4.555
@@ -84,7 +84,7 @@ Output:
X axis at 0: 0.52531
X axis at 1: 0.72917
X axis at 2: 0.92340
-
+
Amplitude Err 0: 0.00460
Amplitude Err 1: 0.00468
Amplitude Err 2: 0.00577
diff --git a/docs/source/algorithms/ConvolveWorkspaces-v1.rst b/docs/source/algorithms/ConvolveWorkspaces-v1.rst
index 2ead5bc04637464fa81b2a764494379aaee627bf..bc14bed59e2b848c4b7b33a184d9e5d457173180 100644
--- a/docs/source/algorithms/ConvolveWorkspaces-v1.rst
+++ b/docs/source/algorithms/ConvolveWorkspaces-v1.rst
@@ -18,15 +18,15 @@ Usage
**Example: Convolve sample workspaces**
.. testcode:: ExConvolveWorkspaces
-
+
ws = CreateSampleWorkspace("Histogram",NumBanks=1,BankPixelWidth=1)
ws = ConvertUnits(ws,"Wavelength")
ws = Rebin(ws,Params=[1])
-
+
#restrict the number of wavelength points to speed up the example
wsOut = ConvolveWorkspaces(ws,ws)
-
+
print("Output: {}".format(wsOut.readY(0)))
Output:
@@ -35,7 +35,7 @@ Output:
Output: [ 74.7278871 26.1996044 32.3478194 121.57078223 175.00835395
146.57078223]
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/CopyDataRange-v1.rst b/docs/source/algorithms/CopyDataRange-v1.rst
index 6a1cc2cac40bf485376ba60c5c06b8ddadb336ec..00aa4643bc1138fe73656494d3a6add977fa1ea0 100644
--- a/docs/source/algorithms/CopyDataRange-v1.rst
+++ b/docs/source/algorithms/CopyDataRange-v1.rst
@@ -9,12 +9,12 @@
Description
-----------
-This algorithm takes a continuous block of data from an input workspace and places this data into a destination
-workspace, replacing the data in the destination workspace at which the insertion is specified. The block of
+This algorithm takes a continuous block of data from an input workspace and places this data into a destination
+workspace, replacing the data in the destination workspace at which the insertion is specified. The block of
data to be used is specified by entering spectra indices and x indices within the input workspace into the algorithm.
The insertion location is then specified by an InsertionYIndex and InsertionXIndex within the destination workspace.
-Note that this algorithm will replace not only the Y values, but also the E values within the destination workspace. The
+Note that this algorithm will replace not only the Y values, but also the E values within the destination workspace. The
original input workspace remains unchanged.
Usage
diff --git a/docs/source/algorithms/CopyInstrumentParameters-v1.rst b/docs/source/algorithms/CopyInstrumentParameters-v1.rst
index e813e74fcb3c5a1b153500dc9846ccbc877e0e09..b9441d4ed65a882ed1bb7db914844b91610117c3 100644
--- a/docs/source/algorithms/CopyInstrumentParameters-v1.rst
+++ b/docs/source/algorithms/CopyInstrumentParameters-v1.rst
@@ -25,7 +25,7 @@ Usage
-----
**Example - Copy parameters that contain the movement of 3 detectors**
-.. include:: ../usagedata-note.txt
+.. include:: ../usagedata-note.txt
.. testcode:: ExCopyInstrumentParametersSimple
@@ -42,16 +42,16 @@ Usage
# Show positions in 1st workspace
for i in spectra:
det = ws1.getDetector(i)
- print("Position of Detector ID={} in 1st workspace: {:.0f},{:.0f},{:.0f}".
+ print("Position of Detector ID={} in 1st workspace: {:.0f},{:.0f},{:.0f}".
format(det.getID(), det.getPos().X(), det.getPos().Y(), det.getPos().Z()))
-
+
# Show positions in 2nd workspace before CopyInstrumrentParameters
for i in spectra:
det = ws2.getDetector(i)
- print("Position of Detector ID=%i in 2nd workspace before CopyInstrumentParameters: %.0f,%.0f,%.0f" % (det.getID(),
+ print("Position of Detector ID=%i in 2nd workspace before CopyInstrumentParameters: %.0f,%.0f,%.0f" % (det.getID(),
det.getPos().X(), det.getPos().Y(), det.getPos().Z()))
-
-
+
+
# Copy parameters from 1st workspace to 2nd workspace
CopyInstrumentParameters( ws1, ws2 )
diff --git a/docs/source/algorithms/CopyLogs-v1.rst b/docs/source/algorithms/CopyLogs-v1.rst
index a003eee7564c12f178f4775912e99fae6979edde..8701882da01524089eed45b44047e3a95af286cb 100644
--- a/docs/source/algorithms/CopyLogs-v1.rst
+++ b/docs/source/algorithms/CopyLogs-v1.rst
@@ -35,12 +35,12 @@ Usage
demo_ws1 = CreateWorkspace(DataX=range(0,3), DataY=(0,2))
demo_ws2 = CreateWorkspace(DataX=range(0,3), DataY=(0,2))
- # Add logs to first workspace
+ # Add logs to first workspace
AddSampleLog(Workspace=demo_ws1, LogName='x', LogText='hello world', LogType='String')
AddSampleLog(Workspace=demo_ws1, LogName='y', LogText='1', LogType='Number')
AddSampleLog(Workspace=demo_ws1, LogName='z', LogText='2', LogType='Number Series')
- # Add logs to second workspace
+ # Add logs to second workspace
AddSampleLog(Workspace=demo_ws2, LogName='x', LogText='hello universe', LogType='String')
AddSampleLog(Workspace=demo_ws2, LogName='w', LogText='3', LogType='Number')
@@ -58,7 +58,7 @@ Usage
print("1st workspace log values x = {} , y = {} , z = {}".format(log_x1.value, log_y.value, log_z.value))
print("2nd workspace log values x = {} , w = {}".format(log_x2.value, log_w.value ))
- # Copy logs of 1st workspace to 2nd workspace
+ # Copy logs of 1st workspace to 2nd workspace
CopyLogs( demo_ws1, demo_ws2)
# Fetch the new logs
@@ -79,7 +79,7 @@ Usage
Output:
-.. testoutput:: ExCopyLogsSimple
+.. testoutput:: ExCopyLogsSimple
Before CopyLog
1st workspace log values x = hello world , y = 1 , z = [2]
@@ -97,12 +97,12 @@ Output:
demo_ws1 = CreateWorkspace(DataX=range(0,3), DataY=(0,2))
demo_ws2 = CreateWorkspace(DataX=range(0,3), DataY=(0,2))
- # Add logs to first workspace
+ # Add logs to first workspace
AddSampleLog(Workspace=demo_ws1, LogName='x', LogText='hello world', LogType='String')
AddSampleLog(Workspace=demo_ws1, LogName='y', LogText='1', LogType='Number')
AddSampleLog(Workspace=demo_ws1, LogName='z', LogText='2', LogType='Number Series')
- # Add logs to second workspace
+ # Add logs to second workspace
AddSampleLog(Workspace=demo_ws2, LogName='x', LogText='hello universe', LogType='String')
AddSampleLog(Workspace=demo_ws2, LogName='w', LogText='3', LogType='Number')
@@ -120,7 +120,7 @@ Output:
print("1st workspace log values x = {} , y = {} , z = {}".format(log_x1.value, log_y.value, log_z.value))
print("2nd workspace log values x = {} , w = {}".format(log_x2.value, log_w.value))
- # Copy logs of 1st workspace to 2nd workspace
+ # Copy logs of 1st workspace to 2nd workspace
CopyLogs( demo_ws1, demo_ws2, MergeStrategy='MergeKeepExisting')
# Fetch the new logs
@@ -141,7 +141,7 @@ Output:
Output:
-.. testoutput:: ExCopyLogsKeepExisting
+.. testoutput:: ExCopyLogsKeepExisting
Before CopyLog
1st workspace log values x = hello world , y = 1 , z = [2]
diff --git a/docs/source/algorithms/CorelliCalibrationApply-v1.rst b/docs/source/algorithms/CorelliCalibrationApply-v1.rst
index 16dcceb9725490e639de775c244576cfd4d7b17d..988e585b17a1f165b3cabbb9052fa1480f36d01f 100644
--- a/docs/source/algorithms/CorelliCalibrationApply-v1.rst
+++ b/docs/source/algorithms/CorelliCalibrationApply-v1.rst
@@ -44,8 +44,8 @@ Usage
calitable = CreateEmptyTableWorkspace()
headers = [
- "ComponentName",
- "Xposition", "Yposition", "Zposition",
+ "ComponentName",
+ "Xposition", "Yposition", "Zposition",
"XdirectionCosine", "YdirectionCosine", "ZdirectionCosine", "RotationAngle",
]
datatypes = ["str"] + ["double"]*7
diff --git a/docs/source/algorithms/CorelliCalibrationDatabase-v1.rst b/docs/source/algorithms/CorelliCalibrationDatabase-v1.rst
index 9939837f6c57a57286317212a8aeecfe44e1f8e6..5c96aa423635ce156bc2411581c7f583d122fad0 100644
--- a/docs/source/algorithms/CorelliCalibrationDatabase-v1.rst
+++ b/docs/source/algorithms/CorelliCalibrationDatabase-v1.rst
@@ -76,59 +76,59 @@ produced with (hopefully) a row for each bank.
Usage
-----
-.. Try not to use files in your examples,
- but if you cannot avoid it then the (small) files must be added to
+.. Try not to use files in your examples,
+ but if you cannot avoid it then the (small) files must be added to
autotestdata\UsageData and the following tag unindented
.. include:: ../usagedata-note.txt
**Example - CorelliCalibrateDatabase**
.. testcode:: CorelliPowderCalibrationExample
-
+
# Import modules
import numpy as np
import os
-
+
# Enpty workspace
input = LoadEmptyInstrument(InstrumentName='CORELLI')
# add start timedelta64
AddSampleLog(Workspace=input, LogName='start_time', LogText='2020-02-20T12:57:17', LogType='String')
-
+
# generate simulated stored database files
bank2_str = "# YYYMMDD , Xposition , Yposition , Zposition , XdirectionCosine , YdirectionCosine , ZdirectionCosine , RotationAngle\n" \
"# str , double , double , double , double , double , double , double\n" \
"20001117,0.0001,-0.0002,0.003,0,-23.3,98.02,0"
-
+
# generate simulated stored database files
bank12_str = "# YYYMMDD , Xposition , Yposition , Zposition , XdirectionCosine , YdirectionCosine , ZdirectionCosine , RotationAngle\n" \
"# str , double , double , double , double , double , double , double\n" \
"20011117,1.0001,-2.0002,3.003,4,-23.3,98.02,0"
-
+
calib_dir = 'sim_corelli_cal'
if not os.path.exists(calib_dir):
os.mkdir(calib_dir)
-
+
for bank, content in [('bank2', bank2_str), ('bank12', bank12_str)]:
bankfile = open(os.path.join(calib_dir, bank + '.csv'), 'w')
bankfile.write(content)
bankfile.close()
-
+
# Create table
calib_table = CreateEmptyTableWorkspace("CorelliCalibrationTestTable");
calib_table.addColumn("str", "ComponentName")
for colname in ["Xposition", "Yposition", "Zposition","XdirectionCosine", "YdirectionCosine", "ZdirectionCosine", "RotationAngle"]:
calib_table.addColumn("double", colname)
-
+
# add entry
calib_table.addRow(["moderator" , 0. , 0. , -15.560 , 0. , 0. , 0., 0.])
calib_table.addRow(["sample-position" , 0.0001 , -0.0002 , 0.003 , 0. , 0., 0., 0.])
calib_table.addRow(["bank1/sixteenpack" , 0.9678 , 0.0056 , 0.0003 , 0.4563 , -0.9999, 0.3424, 0.321])
-
+
# save for powder calibration database
CorelliCalibrationDatabase(InputWorkspace='input', InputCalibrationPatchWorkspace='calib_table',
DatabaseDirectory='sim_corelli_cal',
OutputWorkspace='mergedcalibrationtable')
-
+
# check
print('Number of components = {}'.format(mtd['mergedcalibrationtable'].rowCount()))
bank1_file = os.path.join('sim_corelli_cal', 'bank1.csv')
diff --git a/docs/source/algorithms/CorelliCrossCorrelate-v1.rst b/docs/source/algorithms/CorelliCrossCorrelate-v1.rst
index 0f4905988f9a98d536fd6ebb6a510bed080ff47d..ab9fb49023d115a6021220d067116f6f9d181695 100644
--- a/docs/source/algorithms/CorelliCrossCorrelate-v1.rst
+++ b/docs/source/algorithms/CorelliCrossCorrelate-v1.rst
@@ -18,15 +18,15 @@ The algorithm requires the timing offset of the TDC signal from the correlation
Usage
-----
-.. Try not to use files in your examples,
- but if you cannot avoid it then the (small) files must be added to
+.. Try not to use files in your examples,
+ but if you cannot avoid it then the (small) files must be added to
autotestdata\UsageData and the following tag unindented
.. include:: ../usagedata-note.txt
**Example - CorelliCrossCorrelate**
.. testcode:: CorelliCrossCorrelateExample
-
+
# Load a Corelli data file.
ws = Load('CORELLI_2100')
@@ -42,7 +42,7 @@ Usage
Output:
-.. testoutput:: CorelliCrossCorrelateExample
+.. testoutput:: CorelliCrossCorrelateExample
The detector 172305 has 3 events.
The event weights before cross-correlation are [ 1. 1. 1.]
diff --git a/docs/source/algorithms/CorrectKiKf-v1.rst b/docs/source/algorithms/CorrectKiKf-v1.rst
index 77c39bb6e766dd6d29ce85d852e4917d18c75d8f..7ed3c0fdf41d1a22a47ab0a86ea96d9f15304b81 100644
--- a/docs/source/algorithms/CorrectKiKf-v1.rst
+++ b/docs/source/algorithms/CorrectKiKf-v1.rst
@@ -23,19 +23,19 @@ Algorithm is event aware. TOF events will be changed to weighted events.
Usage
-----
-**Example**
+**Example**
.. testcode:: CorrectKiKf
ws = CreateSampleWorkspace()
ws = ConvertUnits(ws,"DeltaE",EMode="Direct", EFixed=7.5)
-
+
wsOut = CorrectKiKf(ws, EMode="Direct", EFixed=7.5)
print("First five bins:")
print("index orig corrected")
for i in range(5):
- print(" %i %.2f %.2f" %
+ print(" %i %.2f %.2f" %
(i,ws.readY(0)[i],wsOut.readY(0)[i]))
diff --git a/docs/source/algorithms/CorrectTOF-v1.rst b/docs/source/algorithms/CorrectTOF-v1.rst
index 16eb68c6f1a366cb226436f92b27a49680b9daba..c79b0f63c320fd7b24653b0118f6e7e414b66636 100644
--- a/docs/source/algorithms/CorrectTOF-v1.rst
+++ b/docs/source/algorithms/CorrectTOF-v1.rst
@@ -78,7 +78,7 @@ Output:
**Example 2: Apply correction to the TOFTOF data.**
.. testcode:: ExCorrectTOF2
-
+
import numpy
# load TOFTOF data
diff --git a/docs/source/algorithms/CorrectTOFAxis-v1.rst b/docs/source/algorithms/CorrectTOFAxis-v1.rst
index 92464f500e6803c096f8e52e582578786b753278..ae3266ad7f2d45f8d8426a60fd5efbf2f93d27e3 100644
--- a/docs/source/algorithms/CorrectTOFAxis-v1.rst
+++ b/docs/source/algorithms/CorrectTOFAxis-v1.rst
@@ -30,7 +30,7 @@ where :math:`m_n` is the neutron mass. The shift :math:`\Delta t` is then added
The algorithm assumes micro seconds as units of time and meV as units of energy.
-Whether the *ReferenceSpectra* input property refers to workspace indices, spectrum numbers or detector IDs is specified by *IndexType*.
+Whether the *ReferenceSpectra* input property refers to workspace indices, spectrum numbers or detector IDs is specified by *IndexType*.
Usage
-----
@@ -40,15 +40,15 @@ Usage
.. testcode:: ExElasticBinWithL2
from mantid.kernel import DeltaEModeType, UnitConversion
-
+
L1 = 2.0 # in metres.
L2 = 2.0
Ei = 55.0 # in meV
- elasticTOF = UnitConversion.run(src='Energy', dest='TOF',
+ elasticTOF = UnitConversion.run(src='Energy', dest='TOF',
srcValue=Ei,
- l1=L1, l2=L2,
+ l1=L1, l2=L2,
theta=0, emode=DeltaEModeType.Direct, efixed=Ei)
-
+
# Make a workspace with wrong TOF axis.
TOFMin = 0.0
TOFMax = 100.0
@@ -69,19 +69,19 @@ Usage
XMin=TOFMin,
XMax=TOFMax,
BinWidth=binWidth)
-
+
# Do the correction.
correctedWs = CorrectTOFAxis(ws,
IndexType='Workspace Index',
ElasticBinIndex=elasticBinIndex,
EFixed=Ei,
L2=L2)
-
+
# Convert TOF to energy transfer.
convertedWs = ConvertUnits(correctedWs,
Target='DeltaE',
EMode='Direct')
-
+
# Check results
# Zero energy transfer should be around elasticBinIndex.
for index in range(elasticBinIndex-1, elasticBinIndex+2):
@@ -101,15 +101,15 @@ Output:
.. testcode:: ExElasticBinWithRef
from mantid.kernel import DeltaEModeType, UnitConversion
-
+
L1 = 2.0 # in metres.
L2 = 2.0
Ei = 55.0 # in meV
- elasticTOF = UnitConversion.run(src='Energy', dest='TOF',
+ elasticTOF = UnitConversion.run(src='Energy', dest='TOF',
srcValue=Ei,
- l1=L1, l2=L2,
+ l1=L1, l2=L2,
theta=0, emode=DeltaEModeType.Direct, efixed=Ei)
-
+
# Make a workspace with wrong TOF axis.
TOFMin = 0.0
TOFMax = 100.0
@@ -130,19 +130,19 @@ Output:
XMin=TOFMin,
XMax=TOFMax,
BinWidth=binWidth)
-
+
# Do the correction.
correctedWs = CorrectTOFAxis(ws,
IndexType='Workspace Index',
ReferenceSpectra='0',
ElasticBinIndex=elasticBinIndex,
EFixed=Ei)
-
+
# Convert TOF to energy transfer.
convertedWs = ConvertUnits(correctedWs,
Target='DeltaE',
EMode='Direct')
-
+
# Check results
# Zero energy transfer should be around elasticBinIndex.
for index in range(elasticBinIndex-1, elasticBinIndex+2):
@@ -163,15 +163,15 @@ Output:
from mantid.kernel import DeltaEModeType, UnitConversion
import numpy
-
+
L1 = 2.0 # in metres
L2 = 2.0
Ei = 55.0 # in meV
- elasticTOF = UnitConversion.run(src='Energy', dest='TOF',
+ elasticTOF = UnitConversion.run(src='Energy', dest='TOF',
srcValue=Ei,
- l1=L1, l2=L2,
+ l1=L1, l2=L2,
theta=0, emode=DeltaEModeType.Direct, efixed=Ei)
-
+
# Make a workspace with wrong TOF axis.
TOFMin = 0.0
TOFMax = 100.0
@@ -189,17 +189,17 @@ Output:
XMin=TOFMin,
XMax=TOFMax,
BinWidth=0.5)
-
+
# Prepare for the correction.
EPPTable = FindEPP(ws)
-
+
# Do the correction.
correctedWs = CorrectTOFAxis(ws,
EPPTable=EPPTable,
IndexType='Workspace Index',
ReferenceSpectra='0',
EFixed=Ei)
-
+
# Check results.
print('Original TOF for the elastic peak: {0:0.1f}'.format(
ws.readX(0)[numpy.argmax(ws.readY(0))]))
@@ -221,15 +221,15 @@ Output:
from mantid.kernel import DeltaEModeType, UnitConversion
import numpy
-
+
L1 = 2.0
L2 = 2.0
Ei = 55.0 # in meV
- elasticTOF = UnitConversion.run(src='Energy', dest='TOF',
+ elasticTOF = UnitConversion.run(src='Energy', dest='TOF',
srcValue=Ei,
- l1=L1, l2=L2,
+ l1=L1, l2=L2,
theta=0, emode=DeltaEModeType.Direct, efixed=Ei)
-
+
# Make two workspaces with wrong TOF axis.
TOFMin = 0.0
TOFMax = 100.0
@@ -260,21 +260,21 @@ Output:
XMin=TOFMin,
XMax=TOFMax,
BinWidth=0.5)
-
+
# Correct the first workspace using the EPP table method.
EPPTable = FindEPP(ws1)
-
+
# Do the correction.
correctedWs1 = CorrectTOFAxis(ws1,
EPPTable=EPPTable,
IndexType='Workspace Index',
ReferenceSpectra='0',
EFixed=Ei)
-
+
# Correct the second workspace by using the first as a reference.
correctedWs2 = CorrectTOFAxis(ws2,
ReferenceWorkspace=correctedWs1)
-
+
# Check results
print('First workspace original TOF for the elastic peak: {0:0.1f}'.format(
ws1.readX(0)[numpy.argmax(ws1.readY(0))]))
diff --git a/docs/source/algorithms/CreateCalFileByNames-v1.rst b/docs/source/algorithms/CreateCalFileByNames-v1.rst
index 2ff56c6ee286f056cea4b73793ca7063aab7db79..e968228dbe9834a9e135156b070029e38eb67dda 100644
--- a/docs/source/algorithms/CreateCalFileByNames-v1.rst
+++ b/docs/source/algorithms/CreateCalFileByNames-v1.rst
@@ -36,7 +36,7 @@ Usage
-----
**Example - create cal file from GEM instrument**
-.. include:: ../usagedata-note.txt
+.. include:: ../usagedata-note.txt
.. testcode:: ExCreateCalFileByNamesSimple
@@ -46,7 +46,7 @@ Usage
newFile = os.path.join(os.path.expanduser("~"), "output.cal")
# Create test workspace. Normally just use reduced one
- GEM = LoadEmptyInstrument(Filename="GEM_Definition.xml")
+ GEM = LoadEmptyInstrument(Filename="GEM_Definition.xml")
# Run the algorithm
CreateCalFileByNames("GEM",newFile,"bank1,bank2,module1")
@@ -60,13 +60,13 @@ Output:
.. testoutput:: ExCreateCalFileByNamesSimple
File Exists: True
-
+
.. testcleanup:: ExCreateCalFileByNamesSimple
os.remove( newFile )
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/CreateDummyCalFile-v1.rst b/docs/source/algorithms/CreateDummyCalFile-v1.rst
index bed1a6caf3c291297e7683d81c36af2012f820f4..c1b8fb909dce3081cef0ca9fe213ee7e0b9a432b 100644
--- a/docs/source/algorithms/CreateDummyCalFile-v1.rst
+++ b/docs/source/algorithms/CreateDummyCalFile-v1.rst
@@ -28,7 +28,7 @@ Usage
-----
**Example - CreateDummyCalFile for MUSR**
-.. include:: ../usagedata-note.txt
+.. include:: ../usagedata-note.txt
.. testcode:: ExCreateDummyCalFileSimple
diff --git a/docs/source/algorithms/CreateEPP-v1.rst b/docs/source/algorithms/CreateEPP-v1.rst
index c450dbf8c90607628450b1a02f1551f8c8f65100..ef9a81c7a169f6d4455a457ecc930be084266ab6 100644
--- a/docs/source/algorithms/CreateEPP-v1.rst
+++ b/docs/source/algorithms/CreateEPP-v1.rst
@@ -41,7 +41,7 @@ Usage
from mantid.kernel import DeltaEModeType, UnitConversion
import numpy
-
+
CreateSampleWorkspace(
OutputWorkspace='exWS',
Function='Flat background',
@@ -71,11 +71,11 @@ Usage
ys += peak(ws.dataX(i), tof)
# The 'Ei' sample log shall hold the incident energy.
ws.mutableRun().addProperty('Ei', Ei, True)
-
+
# Compare CreateEPP and FindEPP results.
createEPPWS = CreateEPP(InputWorkspace=ws)
findEPPWS = FindEPP(InputWorkspace='exWS')
-
+
epp1 = createEPPWS.cell('PeakCentre', 0)
print('CreateEPP gives {0:.8f} as the first elastic peak position.'.format(epp1))
epp2 = findEPPWS.cell('PeakCentre', 0)
diff --git a/docs/source/algorithms/CreateFlatEventWorkspace-v1.rst b/docs/source/algorithms/CreateFlatEventWorkspace-v1.rst
index b2802e224aa01b66752eff5d0df3e1df06f1d7d8..2daa88d5b8f46df8af762614370a6f49772e2c5e 100644
--- a/docs/source/algorithms/CreateFlatEventWorkspace-v1.rst
+++ b/docs/source/algorithms/CreateFlatEventWorkspace-v1.rst
@@ -9,8 +9,8 @@
Description
-----------
-This creates a new event workspace from an existing one by sampling an area of the
-source workspaces background and then using this to create a new workspace that covers
+This creates a new event workspace from an existing one by sampling an area of the
+source workspaces background and then using this to create a new workspace that covers
the same data range as the input workspace.
Usage
@@ -19,7 +19,7 @@ Usage
**Example: Extract the background into another workspace**
.. testcode:: Extractbackground
-
+
ws = CreateSampleWorkspace("Event","Multiple Peaks")
wsOut=CreateFlatEventWorkspace(ws,RangeStart=15000,RangeEnd=18000)
diff --git a/docs/source/algorithms/CreateFloodWorkspace-v1.rst b/docs/source/algorithms/CreateFloodWorkspace-v1.rst
index 3c334125f5bf146886a7384e19143192ff2d4cdc..1481a3dd70cb002f4f339990001dedf02f8fa3e5 100644
--- a/docs/source/algorithms/CreateFloodWorkspace-v1.rst
+++ b/docs/source/algorithms/CreateFloodWorkspace-v1.rst
@@ -11,7 +11,7 @@ Description
The algorithm takes a measured flood run (or runs) and converts it to a workspace that can be used for flood correction of reflectometry measurements.
If `StartSpectrum` and `EndSpectrum` are given then they specify a range of detectors for which the flood will be calculated, for all other
-detectors it will be assumed 1. For detectors given in the `ExcludeSpectra` property the flood value will be set to a very large number that will have an effect
+detectors it will be assumed 1. For detectors given in the `ExcludeSpectra` property the flood value will be set to a very large number that will have an effect
of excluding these detectors from analysis.
If `CentralPixelSpectrum` is given then the integrated value of that spectrum is used to scale the flood workspace. If it is default then the
diff --git a/docs/source/algorithms/CreateMDHistoWorkspace-v1.rst b/docs/source/algorithms/CreateMDHistoWorkspace-v1.rst
index 1fb31629c1a805c9b1479781fefa954aba6c1e85..8893c7d961e0ffa040e850fd9f8d5013b28717b7 100644
--- a/docs/source/algorithms/CreateMDHistoWorkspace-v1.rst
+++ b/docs/source/algorithms/CreateMDHistoWorkspace-v1.rst
@@ -45,8 +45,8 @@ Usage
.. testcode:: exCreateMDHisto
S =range(0,100);
- ERR=range(0,100);
- # create Histo workspace
+ ERR=range(0,100);
+ # create Histo workspace
ws=CreateMDHistoWorkspace(Dimensionality=2,Extents='-3,3,-10,10',SignalInput=S,ErrorInput=ERR,\
NumberOfBins='10,10',Names='Dim1,Dim2',Units='MomentumTransfer,EnergyTransfer')
@@ -57,17 +57,17 @@ Usage
d1=ws.getDimension(0)
print('dimension 0 has ID: {0}; nBins={1}; min: {2}; max: {3} in units of: {4}'.
format(d1.getDimensionId(), d1.getNBins(), d1.getMinimum(), d1.getMaximum(),d1.getUnits()))
- d1=ws.getDimension(1)
+ d1=ws.getDimension(1)
print('dimension 1 has ID: {0}; nBins={1}; min: {2}; max: {3} in units of: {4}'.
format(d1.getDimensionId(), d1.getNBins(), d1.getMinimum(), d1.getMaximum(), d1.getUnits()))
-
+
**Output:**
.. testoutput:: exCreateMDHisto
created workspace is of type: MDHistoWorkspace
- and has 2 dimensions with 100 points and 0 events
+ and has 2 dimensions with 100 points and 0 events
dimension 0 has ID: Dim1; nBins=10; min: -3.0; max: 3.0 in units of: MomentumTransfer
dimension 1 has ID: Dim2; nBins=10; min: -10.0; max: 10.0 in units of: EnergyTransfer
diff --git a/docs/source/algorithms/CreateMDWorkspace-v1.rst b/docs/source/algorithms/CreateMDWorkspace-v1.rst
index c39280179d65d6d7d92a02a0a5ca6288dee6dc14..0a18e94f398b316d5e860b79059c7d13f63f0735 100644
--- a/docs/source/algorithms/CreateMDWorkspace-v1.rst
+++ b/docs/source/algorithms/CreateMDWorkspace-v1.rst
@@ -34,7 +34,7 @@ Usage
.. testcode:: Example
mdws = CreateMDWorkspace(Dimensions=3, Extents='-10,10,-10,10,-10,10', Names='A,B,C', Units='U,U,U')
-
+
print("mdws is a " + mdws.id())
print("with {0} dimensions:".format(mdws.getNumDims()))
for i in range (mdws.getNumDims()):
diff --git a/docs/source/algorithms/CreatePSDBleedMask-v1.rst b/docs/source/algorithms/CreatePSDBleedMask-v1.rst
index 9b680d7c3c040f941bbc30d9c3aa77f65796d1ee..f9c7c73358374d192ccb670cd601deb0dbd68913 100644
--- a/docs/source/algorithms/CreatePSDBleedMask-v1.rst
+++ b/docs/source/algorithms/CreatePSDBleedMask-v1.rst
@@ -11,39 +11,39 @@ Description
The algorithm identifies tubes, which become saturated due to high
neutron flux from intense Bragg peaks affecting these tubes,
-so these tubes are not counting neutrons but show constant high
-counts over the tube in the elastic line(s) energy region(s).
+so these tubes are not counting neutrons but show constant high
+counts over the tube in the elastic line(s) energy region(s).
After that, the algorithm generates masking workspace to
eliminate such tubes from the final results.
-The bleeding effect occurs due to some old data acquisition electronics and
-observed as homogeneous high counts reading, symmetric over the whole
-tube length. The bleeding occurs at or close to incident energy or
+The bleeding effect occurs due to some old data acquisition electronics and
+observed as homogeneous high counts reading, symmetric over the whole
+tube length. The bleeding occurs at or close to incident energy or
specific energies in multirep mode, where bright Bragg reflections
hit the tube in positions, symmetric with respect to the tube centre.
The example of the workspace, affected by the bleed current and requesting
bleeding corrections is presented on the following picture:
-.. image:: /images/BleedingSignal.png
+.. image:: /images/BleedingSignal.png
-First of all, the algorithm attempts to find all tubes
-within the instrument attached to the workspace. If successful,
-each tube is tested for saturation above the level defined by the
+First of all, the algorithm attempts to find all tubes
+within the instrument attached to the workspace. If successful,
+each tube is tested for saturation above the level defined by the
production of *MaxTubeFramerate* property by the *goodfrm* log value,
retrieved from the workspace.
-If the total signal, summed over all tubes pixels, excluding the number
-of central pixels specified by the *NIgnoredCentralPixels* property,
-exceeds the threshold, specified by the *MaxTubeFramerate* multiplied
-by the *goodfrm* value, the tube becomes masked.
+If the total signal, summed over all tubes pixels, excluding the number
+of central pixels specified by the *NIgnoredCentralPixels* property,
+exceeds the threshold, specified by the *MaxTubeFramerate* multiplied
+by the *goodfrm* value, the tube becomes masked.
-The following image shows two instrument views obtained for two
-converted to energy transfer workspaces, recorded for two incident
-energies in multirep mode. Second energy range suffers from
-bleeding signal as on the picture above, so proper
-bleeding corrections are calculated. First energy range does not
+The following image shows two instrument views obtained for two
+converted to energy transfer workspaces, recorded for two incident
+energies in multirep mode. Second energy range suffers from
+bleeding signal as on the picture above, so proper
+bleeding corrections are calculated. First energy range does not
show bleeding signal, so no bleeding corrections applied to it.
.. image:: /images/BleedingCorrections.png
diff --git a/docs/source/algorithms/CreateSampleWorkspace-v1.rst b/docs/source/algorithms/CreateSampleWorkspace-v1.rst
index 45e7ae8cd5f444cc096fe96bcda5ec1b8a3a1ee3..57571b701f8a3e5b8903b61e5e261b098ebec263 100644
--- a/docs/source/algorithms/CreateSampleWorkspace-v1.rst
+++ b/docs/source/algorithms/CreateSampleWorkspace-v1.rst
@@ -60,7 +60,7 @@ sample and the first bank, then between each bank (or where the banks would be
if "NumMonitors" > "NumBanks").
If "NumScanPoints" > 1 then a scanning workspace is created, that is one with time
-indexed positions and rotations. The scan is set up such that for each scan point
+indexed positions and rotations. The scan is set up such that for each scan point
all the detectors are rotated by 1 degree around the sample.
Usage
diff --git a/docs/source/algorithms/CreateTransmissionWorkspaceAuto-v2.rst b/docs/source/algorithms/CreateTransmissionWorkspaceAuto-v2.rst
index 7eee0bc60f82df327e5ff2d93c986b5123e73dd9..2ad31c7eb292e9e87547fdd910f87c264c0491bc 100644
--- a/docs/source/algorithms/CreateTransmissionWorkspaceAuto-v2.rst
+++ b/docs/source/algorithms/CreateTransmissionWorkspaceAuto-v2.rst
@@ -63,7 +63,7 @@ Output:
0.0861
0.0869
-
+
**Example - Create a transmission run, overriding some default parameters**
.. testcode:: ExCreateTransWSAutoOverload
@@ -86,7 +86,7 @@ Output:
0.086
0.087
-
+
**Example - Create a transmission run from two runs**
.. testcode:: ExCreateTransWSAutoTwo
diff --git a/docs/source/algorithms/CreateUserDefinedBackground-v1.rst b/docs/source/algorithms/CreateUserDefinedBackground-v1.rst
index 3ad76d3d2f851d0265bf6fe1651221e5103b66e9..552c630aa3066676f93c96e1b24961a9899dfedc 100644
--- a/docs/source/algorithms/CreateUserDefinedBackground-v1.rst
+++ b/docs/source/algorithms/CreateUserDefinedBackground-v1.rst
@@ -10,8 +10,8 @@
Description
-----------
-Given an input workspace containing data with a background and a table of
-user-selected points defining the background, creates a new workspace
+Given an input workspace containing data with a background and a table of
+user-selected points defining the background, creates a new workspace
containing background data that can be subtracted from the original data.
The background is constructed using linear interpolation at the same X values as the input workspace.
@@ -25,7 +25,7 @@ Typical use case
#. Convert table to a TableWorkspace (*Table > Convert to TableWorkspace*)
#. Run this algorithm, giving it the original data and the background table.
It will return a workspace filled with background data.
-#. Use :ref:`algm-Minus` to subtract the returned workspace from the original data workspace.
+#. Use :ref:`algm-Minus` to subtract the returned workspace from the original data workspace.
Usage
diff --git a/docs/source/algorithms/CropToComponent-v1.rst b/docs/source/algorithms/CropToComponent-v1.rst
index 19adeedd740fdb1d6142f7ed860497adbd64008a..3e7164866c6a335ebbc2dfa2b3113e1ac5adfe49 100644
--- a/docs/source/algorithms/CropToComponent-v1.rst
+++ b/docs/source/algorithms/CropToComponent-v1.rst
@@ -12,7 +12,7 @@ Description
This algorithm takes a list of component names and an input workspaces and produces an output workspace which only contains the detectors which are part of the specified components. If no components are specified then the full workspace is returned.
-The workspace allows users to select a specific bank for exclusive investigation in subsequent operations.
+The workspace allows users to select a specific bank for exclusive investigation in subsequent operations.
Usage
-----
diff --git a/docs/source/algorithms/CropWorkspace-v1.rst b/docs/source/algorithms/CropWorkspace-v1.rst
index a3d39088ca4b74b6f5455613ab4df2a4ded97b92..6904839fcefb5a7952cd4d2722aede89d0b8add7 100644
--- a/docs/source/algorithms/CropWorkspace-v1.rst
+++ b/docs/source/algorithms/CropWorkspace-v1.rst
@@ -42,7 +42,7 @@ Usage
# Show workspaces
print("TOF Before CropWorkspace {}".format(ws.readX(0)))
print("TOF After CropWorkspace {}".format(OutputWorkspace.readX(0)))
-
+
Output:
.. testoutput:: ExCropWorkspace
diff --git a/docs/source/algorithms/CropWorkspaceRagged-v1.rst b/docs/source/algorithms/CropWorkspaceRagged-v1.rst
index f5428f585bdc00771c74197789ddc8f4e57a6513..aec931284337d7ac29ed9d503c0dbdc857bfd5de 100644
--- a/docs/source/algorithms/CropWorkspaceRagged-v1.rst
+++ b/docs/source/algorithms/CropWorkspaceRagged-v1.rst
@@ -32,7 +32,7 @@ Usage
for j in range(ws.getNumberHistograms()):
x_min.append(1.0+j)
x_max.append(14.0)
-
+
new=CropWorkspaceRagged(ws,x_min,x_max)
print("The number of bins in spectrum 1 is: {}".format(new.readX(0).size))
@@ -69,7 +69,7 @@ mentioned above, ``numpy.nan`` or ``math.nan`` can both be used.
WeightedSum=True, RemoveSpecialValues=True)
gr=PDFFourierTransform(InputWorkspace='FQ', OutputWorkspace='Gr',
Direction="Backward", DeltaR=.02)
- for j in range(10,13):
+ for j in range(10,13):
print("y values: {:.4f}".format(gr.readY(0)[j]))
Output:
diff --git a/docs/source/algorithms/CrossCorrelate-v1.rst b/docs/source/algorithms/CrossCorrelate-v1.rst
index 870f9b7398f7fe55747ecd46742ac6e4670b348f..8f664da76da0c5b7caff12dcad1611861e366cef 100644
--- a/docs/source/algorithms/CrossCorrelate-v1.rst
+++ b/docs/source/algorithms/CrossCorrelate-v1.rst
@@ -27,7 +27,7 @@ Usage
.. testcode:: ExCrossCorrelate
-
+
#Create a workspace with 2 spectra with five bins of width 0.5
ws = CreateSampleWorkspace(BankPixelWidth=1, XUnit='dSpacing', XMax=5, BinWidth=0.5)
ws = ScaleX(InputWorkspace='ws', Factor=0.5, Operation='Add', IndexMin=1, IndexMax=1)
diff --git a/docs/source/algorithms/CrystalFieldEnergies-v1.rst b/docs/source/algorithms/CrystalFieldEnergies-v1.rst
index 9750f4703ab85d24dda130151ec53b26b2618177..ffaeeee3a3450abf0f0ac43221a4f5d14737bf9c 100644
--- a/docs/source/algorithms/CrystalFieldEnergies-v1.rst
+++ b/docs/source/algorithms/CrystalFieldEnergies-v1.rst
@@ -19,7 +19,7 @@ The algorithm calculates the crystal field energies and wave functions. The exam
# The first parameter is a code for the rare earth ion
# The rest of the parameters define the crystal field
en, wf, ham = energies(1, B20=0.37737, B22=3.9770, B40=-0.031787, B42=-0.11611, B44=-0.12544)
-
+
# a list of crystal field energies
print('energies:\n{}'.format(en[2:]))
# a complex-valued matrix with wave functions
@@ -58,7 +58,7 @@ The algorithm calculates the crystal field energies and wave functions. The exam
4.96692000+0.j 0.00000000+0.j]
[ 0.00000000+0.j -3.36590841+0.j 0.00000000+0.j 9.27182972+0.j
0.00000000+0.j 1.86648000+0.j]]
-
+
Please note that this area is under active development and any name can be changed in the future.
.. categories::
diff --git a/docs/source/algorithms/CuboidGaugeVolumeAbsorption-v1.rst b/docs/source/algorithms/CuboidGaugeVolumeAbsorption-v1.rst
index 46ef26dd4949bf776617b3c5fba71b45285db3c2..922871931f2e612f00ef3f9b1c53cb62bc1c612c 100644
--- a/docs/source/algorithms/CuboidGaugeVolumeAbsorption-v1.rst
+++ b/docs/source/algorithms/CuboidGaugeVolumeAbsorption-v1.rst
@@ -12,7 +12,7 @@ Description
This algorithm uses a numerical integration method to calculate
attenuation factors resulting from absorption and single scattering
within a cuboid region of a sample with the dimensions and material
-properties given.
+properties given.
The gauge volume generated will be an axis-aligned
cuboid centred on the sample (centre) position. The sample must fully
@@ -49,7 +49,7 @@ Usage
**Example: A simple spherical sample with a cuboid gauge volume**
.. testcode:: ExCuboidGuageSimpleSpere
-
+
#setup the sample shape
sphere = '''<sphere id="sample-sphere">
<centre x="0" y="0" z="0"/>
diff --git a/docs/source/algorithms/CutMD-v1.rst b/docs/source/algorithms/CutMD-v1.rst
index 621d47d4ef3df47b6b71e0edf9cff4c53d47a226..e09efcecbf12b393293ee80ed756bbbe369fed5f 100644
--- a/docs/source/algorithms/CutMD-v1.rst
+++ b/docs/source/algorithms/CutMD-v1.rst
@@ -10,7 +10,7 @@ Description
-----------
This algorithm performs slicing of multiDimensional data according to a chosen
-projection, limits and binning steps.
+projection, limits and binning steps.
The syntax is similar to that used by `Horace <http://horace.isis.rl.ac.uk/Manipulating_and_extracting_data_from_SQW_files_and_objects#cut_sqw>`__.
@@ -26,7 +26,7 @@ MDEventWorkspaces
For input of type :ref:`MDEventWorkspace <MDWorkspace>` the algorithm uses :ref:`algm-BinMD` or
:ref:`algm-SliceMD` to achieve the binning of the data. The choice of child
-algorithm used for slicing in this case is controlled by the NoPix option.
+algorithm used for slicing in this case is controlled by the NoPix option.
MDHistoWorkspaces
#################
@@ -143,14 +143,14 @@ _`Usage`
FakeMDEventData(InputWorkspace='to_cut', PeakParams=[10000,-0.5,0,0,0,0.1])
FakeMDEventData(InputWorkspace='to_cut', PeakParams=[10000,0.5,0,0,0,0.1])
-
+
SetUB(Workspace=to_cut, a=1, b=1, c=1, alpha=90, beta=90, gamma=90)
SetSpecialCoordinates(InputWorkspace=to_cut, SpecialCoordinates='HKL')
#Since we only specify u and v, w is automatically calculated to be the cross product of u and v
projection = Projection([1,1,0], [-1,1,0])
proj_ws = projection.createWorkspace()
-
+
# Apply the cut (PBins property sets the P1Bin, P2Bin, etc. properties for you)
out_md = CutMD(to_cut, Projection=proj_ws, PBins=([0.1], [0.1], [0.1], [-5,5]), NoPix=True)
@@ -171,7 +171,7 @@ Output:
number of dimensions not integrated 3
min dE 5.0
max dE -5.0
-
+
**Example - CutMD on MDHistoWorkspace:**
.. testcode:: ExampleMDHisto
@@ -180,9 +180,9 @@ Output:
error=[1.0] * 100;
# Create Histo workspace
histo_ws=CreateMDHistoWorkspace(Dimensionality=2,Extents=[-10,10,-10,10],SignalInput=signal ,ErrorInput=error, NumberOfBins=[10,10], Names='X,Y', Units='Q,Q')
-
- # Cut the MDHistoWorkspace to give a single bin containing half the data
- cut= CutMD(InputWorkspace=histo_ws, PBins=[[-10, 10], [-5, 5]])
+
+ # Cut the MDHistoWorkspace to give a single bin containing half the data
+ cut= CutMD(InputWorkspace=histo_ws, PBins=[[-10, 10], [-5, 5]])
print('Total signal in input = {}'.format(sum(signal)))
print('Half the volume should give half the signal = {}'.format(cut.getSignalArray()[0][0]))
@@ -193,7 +193,7 @@ Output:
Total signal in input = 100.0
Half the volume should give half the signal = 50.0
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/D7AbsoluteCrossSections-v1.rst b/docs/source/algorithms/D7AbsoluteCrossSections-v1.rst
index 5edcf51fc8d206700ec387373ab40817d5d9d472..abcaef9c46904a695f9eb24f30e4e96a9e477350 100644
--- a/docs/source/algorithms/D7AbsoluteCrossSections-v1.rst
+++ b/docs/source/algorithms/D7AbsoluteCrossSections-v1.rst
@@ -14,7 +14,7 @@ Description
This is the algorithm that performs cross-section separation and allows for sample data normalisation to absolute scale.
The cross-section separation provides information about magnetic, nuclear coherent, and spin-incoherent contributions to the measured cross-section.
The absolute scale normalisation uses either the output from cross-section separation or a vanadium reference sample for polarised diffraction and spectroscopy data measured
-by D7 instrument at the ILL.
+by D7 instrument at the ILL.
Three types of cross-section separation are supported: `Uniaxial`, `XYZ`, and `10p`, for which 2, 6, and 10 distributions with spin-flip and non-spin-flip cross-sections
are required. The expected input is a workspace group containing spin-flip and non-spin-flip cross-sections, with the following order of axis directions:
@@ -211,7 +211,7 @@ Output:
CrossSectionSeparationMethod='XYZ', NormalisationMethod='Paramagnetic',
SampleAndEnvironmentProperties=sampleProperties, AbsoluteUnitsNormalisation=False)
print("The number of entries in the normalised data is: {}".format(mtd['normalised_sample_magnetic'].getNumberOfEntries()))
-
+
Output:
.. testoutput:: ExD7AbsoluteCrossSections_paramagnetic_normalisation
diff --git a/docs/source/algorithms/D7YIGPositionCalibration-v1.rst b/docs/source/algorithms/D7YIGPositionCalibration-v1.rst
index 31f0544b2d4587c8cc8f2fc50797ee1453b51609..b3f84a444095974b911102c3774c80bc20192e23 100644
--- a/docs/source/algorithms/D7YIGPositionCalibration-v1.rst
+++ b/docs/source/algorithms/D7YIGPositionCalibration-v1.rst
@@ -48,7 +48,7 @@ Usage
YIGPeaksFile='D7_YIG_peaks.xml', CalibrationOutputFile='test_shortWavelength.xml',
MinimalDistanceBetweenPeaks=1.5, BankOffsets=[3, 3, 1], ClearCache=True,
FittingMethod='Individual', FitOutputWorkspace='shortWavelength')
-
+
print('The calibrated wavelength is: {0:.2f}'.format(float(approximate_wavelength)*mtd['shortWavelength'].column(1)[1]))
print('The bank2 gradient is: {0:.3f}'.format(1.0 / mtd['shortWavelength'].column(1)[0]))
print('The bank3 gradient is: {0:.3f}'.format(1.0 / mtd['shortWavelength'].column(1)[176]))
diff --git a/docs/source/algorithms/DNSFlippingRatioCorr-v1.rst b/docs/source/algorithms/DNSFlippingRatioCorr-v1.rst
index 612a739a34cfcd4cedec8d783a703276974e69f7..9b4f87f3b3b5514b2e868fd6897645472affbb30 100644
--- a/docs/source/algorithms/DNSFlippingRatioCorr-v1.rst
+++ b/docs/source/algorithms/DNSFlippingRatioCorr-v1.rst
@@ -11,13 +11,13 @@ Description
.. warning::
- This algorithm is being developed for a specific instrument. It might get changed or even
+ This algorithm is being developed for a specific instrument. It might get changed or even
removed without a notification, should instrument scientists decide to do so.
-This algorithm applies flipping ratio correction to a given data workspaces. As a result, following workspaces will be created:
+This algorithm applies flipping ratio correction to a given data workspaces. As a result, following workspaces will be created:
-- output workspace with corrected spin-flip data. Sample logs will be copied from the data spin-flip workspace.
-- output workspace with corrected non-spin-flip data. Sample logs will be copied from the data non-spin-flip workspace.
+- output workspace with corrected spin-flip data. Sample logs will be copied from the data spin-flip workspace.
+- output workspace with corrected non-spin-flip data. Sample logs will be copied from the data non-spin-flip workspace.
Flipping ratio correction is performed using the measurements of :math:`Ni_{0.89}\,Cr_{0.11}` standard sample (hereafter NiCr). Background for NiCr must be also measured and provided to the algorithm as an input. Both, spin-flip anf non-spin-flip measurements are required. This algorithm performs the flipping ratio correction according to J. Appl. Cryst. 42, 69-84, 2009. Calculations are made in a following steps:
@@ -36,7 +36,7 @@ Flipping ratio correction is performed using the measurements of :math:`Ni_{0.89
3. Apply correction to the data:
:math:`(I^{NSF}_i)_{corr} = I^{NSF}_i + \frac{1}{k_i}\cdot\left(I^{NSF}_i - I^{SF}_i\right)`
-
+
:math:`(I^{SF}_i)_{corr} = I^{SF}_i - \frac{1}{k_i}\cdot\left(I^{NSF}_i - I^{SF}_i\right)`
where :math:`I^{SF,\,NSF}_i` are the neutron counts in the **SFDataWorkspace** and **NSFDataWorkspace**, respectively.
diff --git a/docs/source/algorithms/DNSMergeRuns-v1.rst b/docs/source/algorithms/DNSMergeRuns-v1.rst
index 98aa84115fb4846cd7ec8ae60773f7c76d65ec8f..879a1c735477f887a49e7150e1b9e265ba4d8add 100644
--- a/docs/source/algorithms/DNSMergeRuns-v1.rst
+++ b/docs/source/algorithms/DNSMergeRuns-v1.rst
@@ -11,7 +11,7 @@ Description
.. warning::
- This algorithm is being developed for a specific instrument. It might get changed or even
+ This algorithm is being developed for a specific instrument. It might get changed or even
removed without a notification, should instrument scientists decide to do so.
This algorithm merges given matrix workspaces to a :ref:`Workspace2D <Workspace2D>`. The purpose of this algorithm is to merge the DNS diffraction mode data measured at different detector bank positions. The algorithm is not suitable to merge DNS single crystal diffraction data measured at different sample rotation angles.
@@ -104,9 +104,9 @@ Usage
Output:
First 5 2Theta values: [ 7.5 8. 8.5 9. 9.5]
-
+
First 5 Q values: [ 0.249 0.266 0.282 0.299 0.315]
-
+
First 5 d values: [ 1.844 1.848 1.852 1.856 1.86 ]
.. categories::
diff --git a/docs/source/algorithms/DakotaChiSquared-v1.rst b/docs/source/algorithms/DakotaChiSquared-v1.rst
index 633f76d8ea0887d92b3c5d1e3d1f66728de6f925..12d99129981a08063bb35c2a8e03ca68515b1bf0 100644
--- a/docs/source/algorithms/DakotaChiSquared-v1.rst
+++ b/docs/source/algorithms/DakotaChiSquared-v1.rst
@@ -16,25 +16,25 @@ Usage
-----
.. testcode:: DakotaChiSquared
-
+
#We need to create some files
import mantid,os.path
datafile=os.path.join(mantid.config.getString('defaultsave.directory'),'DakotaChiSquared_data.nxs')
simfile=os.path.join(mantid.config.getString('defaultsave.directory'),'DakotaChiSquared_sim.nxs')
chifile=os.path.join(mantid.config.getString('defaultsave.directory'),'DakotaChiSquared_chi.txt')
-
+
CreateWorkspace(OutputWorkspace='data',DataX='1,2,3,4,5',DataY='1,0,1,4,4',DataE='1,1,1,2,2')
CreateWorkspace(OutputWorkspace='sim',DataX='1,2,3,4,5',DataY='1,1,1,1,1',DataE='0,0,0,0,0')
SaveNexus('data',datafile)
SaveNexus('sim',simfile)
-
+
#clean up the workspaces
DeleteWorkspace("data")
DeleteWorkspace("sim")
-
+
#run the algorithm
result=DakotaChiSquared(datafile,simfile,chifile)
-
+
#Test to see if everything is ok
print("Chi squared is {}".format(result[0]))
print("Residuals are {}".format(result[1].dataY(0)))
@@ -43,10 +43,10 @@ Usage
chistr=f.read()
print("Content of the file : {}".format(chistr.strip()))
f.close()
-
+
.. testcleanup:: DakotaChiSquared
- DeleteWorkspace(result[1])
+ DeleteWorkspace(result[1])
import mantid,os.path
datafile=os.path.join(mantid.config.getString('defaultsave.directory'),'DakotaChiSquared_data.nxs')
simfile=os.path.join(mantid.config.getString('defaultsave.directory'),'DakotaChiSquared_sim.nxs')
@@ -54,9 +54,9 @@ Usage
os.remove(datafile)
os.remove(simfile)
os.remove(chifile)
-
-.. testoutput:: DakotaChiSquared
-
+
+.. testoutput:: DakotaChiSquared
+
Chi squared is 5.5
Residuals are [ 0. -1. 0. 1.5 1.5]
Content of the file : 5.5 obj_fn
diff --git a/docs/source/algorithms/DefineGaugeVolume-v1.rst b/docs/source/algorithms/DefineGaugeVolume-v1.rst
index 4d57077e70a2a2321bc7dcd9de2b726ca28c3b67..b861ea1364870b30b6d47ea9a50f229d4e5ecfb4 100644
--- a/docs/source/algorithms/DefineGaugeVolume-v1.rst
+++ b/docs/source/algorithms/DefineGaugeVolume-v1.rst
@@ -29,7 +29,7 @@ Usage
**Example: A simple spherical sample with a cuboid gauge volume**
.. testcode:: ExSimpleSpereWithCuboidGuage
-
+
#setup the sample shape
sphere = '''<sphere id="sample-sphere">
<centre x="0" y="0" z="0"/>
diff --git a/docs/source/algorithms/DeleteLog-v1.rst b/docs/source/algorithms/DeleteLog-v1.rst
index 2809ddcab41845ed8923bd0171e649a2dd61534b..d2cafef89d90875c203cfc0a59d61644abca5514 100644
--- a/docs/source/algorithms/DeleteLog-v1.rst
+++ b/docs/source/algorithms/DeleteLog-v1.rst
@@ -35,7 +35,7 @@ Usage
Output:
-.. testoutput:: DeleteLogExample
+.. testoutput:: DeleteLogExample
Log is present before deletion: True
Log is present after deletion: False
diff --git a/docs/source/algorithms/DeleteTableRows-v1.rst b/docs/source/algorithms/DeleteTableRows-v1.rst
index 0bd251222d43013b031b8b3036d04312c15a6dde..9ffa7c5d4ea2c0a7dd1fbf21a40b5ac68df3023f 100644
--- a/docs/source/algorithms/DeleteTableRows-v1.rst
+++ b/docs/source/algorithms/DeleteTableRows-v1.rst
@@ -36,7 +36,7 @@ Usage
DeleteTableRows(t,Rows=[2,4,6,8]) #Note: the previous delete will have moved all the rows up 1
#delete a range of rows, you can also refer to the workspace using the name in the Workspace List
- DeleteTableRows("myTable",Rows=range(7,14))
+ DeleteTableRows("myTable",Rows=range(7,14))
print("The remaining values in the first column")
print(t.column(0))
diff --git a/docs/source/algorithms/DetectorDiagnostic-v1.rst b/docs/source/algorithms/DetectorDiagnostic-v1.rst
index ac630bf0fcd3729f65a0c7e9d1c4ff201f28396e..134d4bd1c1ca167ec21b8844020295967022dfd9 100644
--- a/docs/source/algorithms/DetectorDiagnostic-v1.rst
+++ b/docs/source/algorithms/DetectorDiagnostic-v1.rst
@@ -37,8 +37,8 @@ They are passed onto child algorithms that under the same name, except
* SampleBkgLowAcceptanceFactor, SampleBkgHighAcceptanceFactor, SampleBkgSignificanceTest and SampleCorrectForSolidAngle are passed onto :ref:`algm-MedianDetectorTest` as LowThreshold, HighThreshold, SignicanceTest and CorrectForSolidAngle respectively.
-Numerous uses of :ref:`algm-MaskDetectors` are not shown and can be taken be be executed whenever appropriate.
-Also the output property NumberOfFailures from the executed child algorithms are added together
+Numerous uses of :ref:`algm-MaskDetectors` are not shown and can be taken be be executed whenever appropriate.
+Also the output property NumberOfFailures from the executed child algorithms are added together
to form the NumberOfFailures output by the main algorithm.
diff --git a/docs/source/algorithms/DetectorEfficiencyCorUser-v1.rst b/docs/source/algorithms/DetectorEfficiencyCorUser-v1.rst
index 2039b8cb1f1b369058c4bc3c48faa710c1077b0e..3a5aaff4311d850ef1870f9c280f8b9a463079e9 100644
--- a/docs/source/algorithms/DetectorEfficiencyCorUser-v1.rst
+++ b/docs/source/algorithms/DetectorEfficiencyCorUser-v1.rst
@@ -34,22 +34,22 @@ this has been implemented at the ILL for ILL IN4, IN5 and IN6, and at
the MLZ for TOFTOF.
Unlike :ref:`algm-DetectorEfficiencyCor` algorithm, which uses tabulated formula
-accounting for neutron adsorption efficiency dependence on neutron energy,
-the formula used by this algorithm
-is provided by instrument scientist and is adjusted for the instrument,
-accounting for a number of additional instrument specific factors.
+accounting for neutron adsorption efficiency dependence on neutron energy,
+the formula used by this algorithm
+is provided by instrument scientist and is adjusted for the instrument,
+accounting for a number of additional instrument specific factors.
-As example, for `TOFTOF <http://www.mlz-garching.de/toftof>`_ instrument, the energy-dependent intensity
-loss factor accounts also for absorption of neutrons by the Ar gas in the flight chamber, Al windows
+As example, for `TOFTOF <http://www.mlz-garching.de/toftof>`_ instrument, the energy-dependent intensity
+loss factor accounts also for absorption of neutrons by the Ar gas in the flight chamber, Al windows
of sample environment etc.
-The formula used by DetectorEfficiencyCorUser algorithm is derived for TOFTOF in paper of
-T. Unruh, 2007, doi:10.1016/j.nima.2007.07.015 and is set up in the TOFTOF instrument parameters file.
+The formula used by DetectorEfficiencyCorUser algorithm is derived for TOFTOF in paper of
+T. Unruh, 2007, doi:10.1016/j.nima.2007.07.015 and is set up in the TOFTOF instrument parameters file.
Usage
-----
-**Example - A sample correction**
+**Example - A sample correction**
.. testcode:: Ex1
diff --git a/docs/source/algorithms/DetectorEfficiencyVariation-v1.rst b/docs/source/algorithms/DetectorEfficiencyVariation-v1.rst
index 8a21005e672d40a95e2bbd50d1dc9ce2fa613dd0..b73e7224e2fef942f0f70cbddff148d4358f68d1 100644
--- a/docs/source/algorithms/DetectorEfficiencyVariation-v1.rst
+++ b/docs/source/algorithms/DetectorEfficiencyVariation-v1.rst
@@ -44,7 +44,7 @@ Usage
import numpy as np
- wsBase=CreateSampleWorkspace()
+ wsBase=CreateSampleWorkspace()
ws=CreateSampleWorkspace()
noisyY = np.array(ws.readY(0))
noisyY[0]=1e20
diff --git a/docs/source/algorithms/DetectorFloodWeighting-v1.rst b/docs/source/algorithms/DetectorFloodWeighting-v1.rst
index 35f13ab8f53b9ef8135240a6b61dbb0acad3ae32..1a7fa4f2b306f20fdead617d93e9e83b0d024b47 100644
--- a/docs/source/algorithms/DetectorFloodWeighting-v1.rst
+++ b/docs/source/algorithms/DetectorFloodWeighting-v1.rst
@@ -19,14 +19,14 @@ Usage
.. testcode:: DetectorFloodWeightingExample
- import numpy as np
+ import numpy as np
# create histogram workspace
dataX = range(0,10) # or use dataX=range(0,10)
dataY = [1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2] # or use dataY=[1]*9
ws = CreateWorkspace(dataX, dataY, NSpec=2, UnitX="Wavelength")
-
+
out_ws = DetectorFloodWeighting(InputWorkspace=ws, Bands=[0,10], SolidAngleCorrection=False)
-
+
print('Number Histograms {}'.format(out_ws.getNumberHistograms()))
print('Min X: {} Max X: {}'.format(out_ws.readX(0)[0], out_ws.readX(0)[1]))
diff --git a/docs/source/algorithms/DiffractionEventCalibrateDetectors-v1.rst b/docs/source/algorithms/DiffractionEventCalibrateDetectors-v1.rst
index 3ad86a09a962bb6c8292dd99f6001499859f490d..6b6bb4429036075dc2c516b11af15ebb20b58e62 100644
--- a/docs/source/algorithms/DiffractionEventCalibrateDetectors-v1.rst
+++ b/docs/source/algorithms/DiffractionEventCalibrateDetectors-v1.rst
@@ -19,7 +19,7 @@ Usage
**Example: move detectors to maximize intensity**
.. testcode:: ExDiffractionEventCalibrateDetectors
-
+
import os
ws = CreateSampleWorkspace("Event",NumBanks=1,BankPixelWidth=1)
ws = MoveInstrumentComponent(Workspace='ws', ComponentName='bank1', X=0.5, RelativePosition=False)
diff --git a/docs/source/algorithms/DiffractionFocussing-v2.rst b/docs/source/algorithms/DiffractionFocussing-v2.rst
index bfbfa1a1990d7164b5b8afcc8627a647874e91f4..e3c3e1a02735f33d63387cfcac424b9b5fc5d927 100644
--- a/docs/source/algorithms/DiffractionFocussing-v2.rst
+++ b/docs/source/algorithms/DiffractionFocussing-v2.rst
@@ -17,8 +17,8 @@ following:
created.
#. The algorithm determines the X boundaries for each group as the upper
and lower limits of all contributing detectors. It then calculates
- a logarithmic step that preserves the number of bins in the initial workspace.
- It assumes that the entire data set uses logarithmic binning in the process
+ a logarithmic step that preserves the number of bins in the initial workspace.
+ It assumes that the entire data set uses logarithmic binning in the process
(i.e. it does not check for constant width binning).
#. All histograms are read and rebinned to the new grid for their group.
#. A new workspace with N histograms is created.
diff --git a/docs/source/algorithms/DirectILLCollectData-v1.rst b/docs/source/algorithms/DirectILLCollectData-v1.rst
index 88f3f70e05db5551b08f6017248c0cf9159032f0..f1416b82e65be201386b413bebb46938dff3f9cb 100644
--- a/docs/source/algorithms/DirectILLCollectData-v1.rst
+++ b/docs/source/algorithms/DirectILLCollectData-v1.rst
@@ -34,7 +34,7 @@ Some basic reduction steps are done to the input data.
More detailed description of some of these steps is given below.
.. note::
- The initial time-of-flight axis of ILL's spectrometers has an arbitrary starting point. Therefore, the TOF values in the intermediate workspaces do not correspond to any physical flight distances until they are corrected at step 6.
+ The initial time-of-flight axis of ILL's spectrometers has an arbitrary starting point. Therefore, the TOF values in the intermediate workspaces do not correspond to any physical flight distances until they are corrected at step 6.
Normalisation to monitor
^^^^^^^^^^^^^^^^^^^^^^^^
@@ -59,7 +59,7 @@ A flat time-independent background for subtraction can be given by *FlatBkgWorks
Before subtraction, the background workspace is multiplied by *FlatBkgScaling*.
-The background used for the subtraction can be retrieved using the *OutputFlatBkgWorkspace* property. This property holds either the same workspace as *FlatBkgWorkspace*, or a workspace created by :ref:`CalculateFlatBackground <algm-CalculateFlatBackground>`. Note that no *FlatBkgScaling* is applied to this workspace.
+The background used for the subtraction can be retrieved using the *OutputFlatBkgWorkspace* property. This property holds either the same workspace as *FlatBkgWorkspace*, or a workspace created by :ref:`CalculateFlatBackground <algm-CalculateFlatBackground>`. Note that no *FlatBkgScaling* is applied to this workspace.
Elastic peak positions (EPP)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/docs/source/algorithms/DirectILLDiagnostics-v1.rst b/docs/source/algorithms/DirectILLDiagnostics-v1.rst
index 38ca71c01657489b1cb0e129fa3f1ba22a27381e..91c21b2e9655935330e4be198d6ad5c730159cfe 100644
--- a/docs/source/algorithms/DirectILLDiagnostics-v1.rst
+++ b/docs/source/algorithms/DirectILLDiagnostics-v1.rst
@@ -120,7 +120,7 @@ For usage of this algorithm as part of the direct geometry data reduction, check
OutputRawWorkspace='raw', # Needed for the diagnostics
OutputEPPWorkspace='epps' # Needed for the diagnostics
)
-
+
diagnostics = DirectILLDiagnostics(
InputWorkspace='raw', # Use 'raw' rather than 'preprocessed' for background diagnostics
OutputWorkspace='mask', # A special MaskWorkspace
@@ -178,7 +178,7 @@ Output:
The figure below shows the mask produced by the IN5 example script above. The green pixels show the default hard mask and the beam stop.
.. figure:: ../images/DiagnosticsMaskIN5.png
- :alt: Default and beam stop masks of IN5 spectrometer.
+ :alt: Default and beam stop masks of IN5 spectrometer.
.. categories::
diff --git a/docs/source/algorithms/DirectILLReduction-v1.rst b/docs/source/algorithms/DirectILLReduction-v1.rst
index 44db44a57f8482fff8dc160c876d1adfbcfd5c45..e202c9dce828d065a6ff8b53577372436104abf0 100644
--- a/docs/source/algorithms/DirectILLReduction-v1.rst
+++ b/docs/source/algorithms/DirectILLReduction-v1.rst
@@ -36,7 +36,7 @@ Normalisation to absolute units can be enabled by setting *AbsoluteUnitsNormalis
:math:`f = \frac{N_V \sigma_V}{N_S}`
-after normalisation to vanadium giving units of barn to the data. In the above, :math:`N_V` stands for the vanadium number density, :math:`\sigma_V` for vanadium total scattering cross section and :math:`N_S` sample number density.
+after normalisation to vanadium giving units of barn to the data. In the above, :math:`N_V` stands for the vanadium number density, :math:`\sigma_V` for vanadium total scattering cross section and :math:`N_S` sample number density.
The material properties should be set for *InputWorkspace* and *IntegratedVanadiumWorkspace* by :ref:`SetSample <algm-SetSample>` before running this algorithm .
diff --git a/docs/source/algorithms/DoublePulseFit-v1.rst b/docs/source/algorithms/DoublePulseFit-v1.rst
index d3d5a546e74b292c1a412e5aa83090634bae9223..7f7c7d3cd6a2469e1ec24e7c07e8d5ffd94d0b56 100644
--- a/docs/source/algorithms/DoublePulseFit-v1.rst
+++ b/docs/source/algorithms/DoublePulseFit-v1.rst
@@ -51,7 +51,7 @@ Usage
convolution.add(innerFunction)
convolution.add(deltaFunctions)
innerFunctionSingle = FunctionFactory.createInitialized('name=GausOsc,A=0.2,Sigma=0.2,Frequency=1,Phi=0')
-
+
DoublePulseFit(Function=innerFunctionSingle, InputWorkspace=ws, PulseOffset = delta, StartX=0.0, EndX=15.0, Output='DoublePulseFit')
Fit(Function=convolution, InputWorkspace=ws, CreateOutput = True, StartX=0.0, EndX=15.0, Output='Fit')
@@ -60,7 +60,7 @@ Usage
single_parameter_workspace = AnalysisDataService.retrieve('Fit_Parameters')
col_values = single_parameter_workspace.column(1)
-
+
print('Fitted value of A from DoublePulseFit is {:.2g}'.format(double_col_values[0]))
print('Fitted value of Frequency from DoublePulseFit is {:.2g}'.format(double_col_values[2]))
print('Fitted value of A from Fit is {:.2g}'.format(col_values[0]))
diff --git a/docs/source/algorithms/EQSANSAzimuthalAverage1D-v1.rst b/docs/source/algorithms/EQSANSAzimuthalAverage1D-v1.rst
index f83a4eeea4e5203caee2a21270febf85b24c0989..f86a380114a732c751397cfd24a7d6a410ba3ad8 100644
--- a/docs/source/algorithms/EQSANSAzimuthalAverage1D-v1.rst
+++ b/docs/source/algorithms/EQSANSAzimuthalAverage1D-v1.rst
@@ -9,24 +9,24 @@
Description
-----------
-Compute I(q) for reduced EQSANS data.
-This algorithm is rarely called directly. It is called by
+Compute I(q) for reduced EQSANS data.
+This algorithm is rarely called directly. It is called by
:ref:`SANSReduction <algm-SANSReduction>`.
-This workflow algorithm takes into account whether the data was
-acquired in frame-skipping mode or not.
+This workflow algorithm takes into account whether the data was
+acquired in frame-skipping mode or not.
-- In normal mode, the algorithm will simply call
+- In normal mode, the algorithm will simply call
:ref:`SANSAzimuthalAverage1D <algm-SANSAzimuthalAverage1D>`,
- followed by a call to :ref:`EQSANSResolution <algm-EQSANSResolution>`
+ followed by a call to :ref:`EQSANSResolution <algm-EQSANSResolution>`
to compute the resolution in Q.
-- In frame-skipping mode, the algorithm will compute the Q binning according to
+- In frame-skipping mode, the algorithm will compute the Q binning according to
the wavelength range of the acquired data in each frame. The
- :ref:`SANSAzimuthalAverage1D <algm-SANSAzimuthalAverage1D>` and
+ :ref:`SANSAzimuthalAverage1D <algm-SANSAzimuthalAverage1D>` and
:ref:`EQSANSResolution <algm-EQSANSResolution>`
algorithms are then called for each frame. An I(Q) workspace will be produced
- for each of the two frames. When called by the
+ for each of the two frames. When called by the
:ref:`SANSReduction <algm-SANSReduction>`
algorithm, the name of those output workspaces will end with
*_frame_1_Iq* or *_frame_2_Iq*.
diff --git a/docs/source/algorithms/EQSANSDarkCurrentSubtraction-v1.rst b/docs/source/algorithms/EQSANSDarkCurrentSubtraction-v1.rst
index e371b8e32b3f368e87d53fd71b3e13108c8f83d1..e805fe6dc72e0ddb5fcae32258c48a85238d9213 100644
--- a/docs/source/algorithms/EQSANSDarkCurrentSubtraction-v1.rst
+++ b/docs/source/algorithms/EQSANSDarkCurrentSubtraction-v1.rst
@@ -9,8 +9,8 @@
Description
-----------
-Subtract the dark current from an EQSANS data set.
-This algorithm is rarely called directly. It is called by
+Subtract the dark current from an EQSANS data set.
+This algorithm is rarely called directly. It is called by
:ref:`SANSReduction <algm-SANSReduction>`.
This workflow algorithm will:
diff --git a/docs/source/algorithms/EQSANSDarkCurrentSubtraction-v2.rst b/docs/source/algorithms/EQSANSDarkCurrentSubtraction-v2.rst
index 9a4c6b31f2fb603bde6b6c7bf95e9822714d5190..92f328e14f3d2dd0a493e9d1d75253d5fca0128b 100644
--- a/docs/source/algorithms/EQSANSDarkCurrentSubtraction-v2.rst
+++ b/docs/source/algorithms/EQSANSDarkCurrentSubtraction-v2.rst
@@ -9,8 +9,8 @@
Description
-----------
-Subtract the dark current from an EQSANS data set.
-This algorithm is rarely called directly. It is called by
+Subtract the dark current from an EQSANS data set.
+This algorithm is rarely called directly. It is called by
:ref:`SANSReduction <algm-SANSReduction>`.
This workflow algorithm will:
@@ -26,7 +26,7 @@ The dark current is subtracted pixel by pixel by normalizing the dark current da
:math:`I'(i,\lambda_j)=I_{data}(i,\lambda_j)-N_{dc}(i) \ \ \frac{T_{data}}{T_{dc}} \ \ \frac{t_{frame}-t^{low}_{cut} - t^{high}_{cut}}{t_{frame}} \ \ \frac{\Delta\lambda_j}{\lambda_{max}-\lambda_{min}}`
-where the T-values are the counting times for the data set and the dark current (dc). The :math:`t_{cut}` values are the TOF cuts at the beginning and end of a frame. :math:`t_{frame}` is the width of a frame. :math:`\Delta\lambda_j` is the width of the wavelength bin we are considering.
+where the T-values are the counting times for the data set and the dark current (dc). The :math:`t_{cut}` values are the TOF cuts at the beginning and end of a frame. :math:`t_{frame}` is the width of a frame. :math:`\Delta\lambda_j` is the width of the wavelength bin we are considering.
.. categories::
diff --git a/docs/source/algorithms/EQSANSLoad-v1.rst b/docs/source/algorithms/EQSANSLoad-v1.rst
index 545dac3422e99aebfa9de4d1d589f734e40f2f8d..f28f9382e00b5061b96a8b646031286c0dad6745 100644
--- a/docs/source/algorithms/EQSANSLoad-v1.rst
+++ b/docs/source/algorithms/EQSANSLoad-v1.rst
@@ -24,7 +24,7 @@ corrections to the workspace. The workflow proceeds as follows:
in the logs so that we can retrieve them later
(see :ref:`SANSMask <algm-SANSMask>`).
-6. Move the detector according to the correct beam center position,
+6. Move the detector according to the correct beam center position,
which is either given as input to the algorithm or pre-determined and stored in the input *ReductionProperties*.
7. Apply a TOF correction to take into account frame correction and the neutron flight path using
@@ -35,7 +35,7 @@ corrections to the workspace. The workflow proceeds as follows:
9. Rebin the data according to the input *WavelengthStep*.
-This algorithm is rarely called directly. It is called by
+This algorithm is rarely called directly. It is called by
:ref:`SANSReduction <algm-SANSReduction>`.
|LoadEQSANS.png|
diff --git a/docs/source/algorithms/EQSANSMonitorTOF-v1.rst b/docs/source/algorithms/EQSANSMonitorTOF-v1.rst
index 8c1cdcc1f0c0850fb312a0658cd2c38a43c34eec..853aadabdcd144fa8516acb936a1c526cbefc2e6 100644
--- a/docs/source/algorithms/EQSANSMonitorTOF-v1.rst
+++ b/docs/source/algorithms/EQSANSMonitorTOF-v1.rst
@@ -13,7 +13,7 @@ Corrects the TOF distribution of a monitor workspace (histogram) according to
the chopper settings. The algorithm determines whether the data was taken
in frame skipping mode in order to perform the proper frame correction.
-This algorithm is rarely called directly. It is called by
+This algorithm is rarely called directly. It is called by
:ref:`EQSANSNormalise <algm-EQSANSNormalise>`.
.. categories::
diff --git a/docs/source/algorithms/EQSANSPatchSensitivity-v1.rst b/docs/source/algorithms/EQSANSPatchSensitivity-v1.rst
index fbcf407733c3d04dee7c17bbe9dab71bc3fbea13..432f6faef19d68cacb56e74282efc333c225f2b5 100644
--- a/docs/source/algorithms/EQSANSPatchSensitivity-v1.rst
+++ b/docs/source/algorithms/EQSANSPatchSensitivity-v1.rst
@@ -12,13 +12,13 @@ Description
Process a detector sensitivity workspace and patch the area defined by
the masked pixels in the provided *PatchWorkspace*.
-This algorithm is usually set up by
-:ref:`ComputeSensitivity <algm-ComputeSensitivity>` and
-executed by
+This algorithm is usually set up by
+:ref:`ComputeSensitivity <algm-ComputeSensitivity>` and
+executed by
:ref:`SANSSensitivityCorrection <algm-SANSSensitivityCorrection>`.
The *InputWorkspace* is a pre-calculated sensitivity workspace, usually computed
-using the
+using the
:ref:`SANSSensitivityCorrection <algm-SANSSensitivityCorrection>` algorithm.
The *PatchWorkspace* is a workspace where the pixels to patch are marked as masked.
The actual data of the *PatchWorkspace* is not used, only the masking information.
@@ -30,7 +30,7 @@ along a given tube, that pixel's sensitivity (Y-value) is set to:
- [If *UseLinearRegression=True*] The value found for that position along the tube by a linear regression performed
using all unmasked pixels along that tube.
-
+
The output workspace is the patched version of the input workspace.
.. categories::
diff --git a/docs/source/algorithms/EQSANSQ2D-v1.rst b/docs/source/algorithms/EQSANSQ2D-v1.rst
index 5c90e3e9ecc69bb23285434ff93fede712fc3a93..ed5782ff7699a3781d238e588e08a3c6f597e534 100644
--- a/docs/source/algorithms/EQSANSQ2D-v1.rst
+++ b/docs/source/algorithms/EQSANSQ2D-v1.rst
@@ -9,10 +9,10 @@
Description
-----------
-Workflow algorithm that computes I(Qx,Qy) for EQSANS data using
+Workflow algorithm that computes I(Qx,Qy) for EQSANS data using
:ref:`Qxy <algm-Qxy>` for each frame, as appropriate.
-This algorithm is rarely called directly. It is called by
+This algorithm is rarely called directly. It is called by
:ref:`SANSReduction <algm-SANSReduction>`.
.. categories::
diff --git a/docs/source/algorithms/EQSANSResolution-v1.rst b/docs/source/algorithms/EQSANSResolution-v1.rst
index 8fa588e49a042a91ecc01aa804f20331145975da..e5913f615289015a4a5389e9829689c71d33f873 100644
--- a/docs/source/algorithms/EQSANSResolution-v1.rst
+++ b/docs/source/algorithms/EQSANSResolution-v1.rst
@@ -9,18 +9,18 @@
Description
-----------
-This algorithm extends the
+This algorithm extends the
:ref:`TOFSANSResolution <algm-TOFSANSResolution>`
to implement the experimentally determined TOF resolution for EQSANS.
-The Q resolution for a TOF SANS has two components: a geometrical contribution and a
+The Q resolution for a TOF SANS has two components: a geometrical contribution and a
contributions from the resolution in TOF.
The TOF resolution for EQSANS was measured to be:
:math:`\Delta T = y_0 + A ( f/(1+\exp((\lambda-x^0_1)/k_1)) + (1-f)/(1+\exp((\lambda-x^0_2)/k_2)) )`
-where :math:`\lambda` is the wavelength and
+where :math:`\lambda` is the wavelength and
:math:`y_0 = -388`
@@ -36,7 +36,7 @@ where :math:`\lambda` is the wavelength and
:math:`k_2 = -65.46`
-This algorithm is generally not called directly. It's called by
+This algorithm is generally not called directly. It's called by
:ref:`EQSANSAzimuthalAverage1D <algm-EQSANSAzimuthalAverage1D>`
after the calculation of I(Q). It can only be applied to an I(Q) workspace.
diff --git a/docs/source/algorithms/EQSANSTofStructure-v1.rst b/docs/source/algorithms/EQSANSTofStructure-v1.rst
index 5e7db7dcb46e27fddcdacdf9907dd7a8d3795d63..22d16603a2a708ced71b29b3d9ee591529b31edd 100644
--- a/docs/source/algorithms/EQSANSTofStructure-v1.rst
+++ b/docs/source/algorithms/EQSANSTofStructure-v1.rst
@@ -16,7 +16,7 @@ in frame skipping mode in order to perform the proper frame correction.
This algorithm will trim the edges of the TOF distribution according to the input properties.
It will also correct the TOF values for the flight path of the neutrons.
-This algorithm is rarely called directly. It is called by
+This algorithm is rarely called directly. It is called by
:ref:`EQSANSLoad <algm-EQSANSLoad>`.
diff --git a/docs/source/algorithms/ElasticWindowMultiple-v1.rst b/docs/source/algorithms/ElasticWindowMultiple-v1.rst
index bbfbc8f62fc09aed441d15bec8f4c9d455097dae..b3fb930aa9ec7cc0914200492262d1055776f8e5 100644
--- a/docs/source/algorithms/ElasticWindowMultiple-v1.rst
+++ b/docs/source/algorithms/ElasticWindowMultiple-v1.rst
@@ -28,7 +28,7 @@ Usage
-----
.. testcode:: exElasticWindowMultiple
-
+
# This test needs the facility to be set to ISIS to load the IRIS instrument
facility = config['default.facility']
config['default.facility'] = 'ISIS'
diff --git a/docs/source/algorithms/EnggEstimateFocussedBackground-v1.rst b/docs/source/algorithms/EnggEstimateFocussedBackground-v1.rst
index dac42bdc5d49db922d48d4b322c9bd42ce4d41e6..9f337ebacb74873c783f8699fe711c55531fe591 100644
--- a/docs/source/algorithms/EnggEstimateFocussedBackground-v1.rst
+++ b/docs/source/algorithms/EnggEstimateFocussedBackground-v1.rst
@@ -10,7 +10,7 @@ Description
-----------
Estimates the background for a spectra by employing an iterative smoothing procedure adapted from an algorithm published in [1].
-In each iteration a smoothing window is convolved with the data to produce a new spectra which is compared point by point with spectra from the previous iteration, with the lowest of the two intensities retained. In this way counting statistics are taken into conisderation to some extent, but if the data are noisy then this can lead to the background being underestimated (by the approxiumate amplitude of the noise). This can be avoided by rebinning/rebunching data, however this is not always desirable. Therefore there is an option to apply a Savitzky–Golay filter with a linear polynomial over a window the same length as the smoothing window before the iterative smoothing.
+In each iteration a smoothing window is convolved with the data to produce a new spectra which is compared point by point with spectra from the previous iteration, with the lowest of the two intensities retained. In this way counting statistics are taken into conisderation to some extent, but if the data are noisy then this can lead to the background being underestimated (by the approxiumate amplitude of the noise). This can be avoided by rebinning/rebunching data, however this is not always desirable. Therefore there is an option to apply a Savitzky–Golay filter with a linear polynomial over a window the same length as the smoothing window before the iterative smoothing.
Useage
@@ -18,7 +18,7 @@ Useage
**Example:**
-.. code-block:: python
+.. code-block:: python
from mantid.simpleapi import *
diff --git a/docs/source/algorithms/EnggFocus-v1.rst b/docs/source/algorithms/EnggFocus-v1.rst
index 6883341f7be4c13ac2379ee697208f4699712b86..26a286f85e189f20e66b32b1549a1980ae4397a0 100644
--- a/docs/source/algorithms/EnggFocus-v1.rst
+++ b/docs/source/algorithms/EnggFocus-v1.rst
@@ -87,7 +87,7 @@ Output:
For TOF of 20165.642 normalized intensity is 1.769
For TOF of 33547.826 normalized intensity is 2.895
For TOF of 38619.804 normalized intensity is 5.181
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/EnggSaveSinglePeakFitResultsToHDF5-v1.rst b/docs/source/algorithms/EnggSaveSinglePeakFitResultsToHDF5-v1.rst
index 3d94fbeebf92e2f2f780dbff824cf32c743ca391..980de48f90ea9f57b80b641f29dbde86b252c964 100644
--- a/docs/source/algorithms/EnggSaveSinglePeakFitResultsToHDF5-v1.rst
+++ b/docs/source/algorithms/EnggSaveSinglePeakFitResultsToHDF5-v1.rst
@@ -62,7 +62,7 @@ we just mock one up here. See :ref:`EnggFitPeaks documentation
for i in range(3):
peaks.addRow([(i + 1.0) / (j + 1) for j in range(len(fit_param_headers))])
-
+
output_filename = os.path.join(config["defaultsave.directory"],
"EnggSaveSinglePeakFitResultsToHDF5DocTest.hdf5")
@@ -76,7 +76,7 @@ we just mock one up here. See :ref:`EnggFitPeaks documentation
print("Peaks dataset has {} rows, for our 3 peaks".format(len(peaks_dataset)))
print("First peak is at D spacing {}".format(peaks_dataset[0]["dSpacing"]))
print("Third peak X0 = {}".format(peaks_dataset[2]["X0"]))
-
+
.. testcleanup:: EnggSaveSinglePeakFitResultsToHDF5
os.remove(output_filename)
diff --git a/docs/source/algorithms/EnggVanadiumCorrections-v1.rst b/docs/source/algorithms/EnggVanadiumCorrections-v1.rst
index d1eae6232446e697bc04983337a48f6a19f1958a..434eddc9f927fea00309a69ce524cdddcbdcd1a1 100644
--- a/docs/source/algorithms/EnggVanadiumCorrections-v1.rst
+++ b/docs/source/algorithms/EnggVanadiumCorrections-v1.rst
@@ -85,7 +85,7 @@ Usage
# # To generate the pre-calculated features (integration and curves), for a new
# Vanadium run, and apply the corrections on a workspace:
- #
+ #
# sample_ws = Load('ENGINX00213855.nxs')
# van_ws = Load('ENGINX00236516.nxs')
# EnggVanadiumCorrections(Workspace = sample_ws, VanadiumWorkspace = van_ws
@@ -98,7 +98,7 @@ Usage
# SaveNexus(InputWorkspace='curves_ws',
# Filename='ENGINX_precalculated_vanadium_run000236516_bank_curves.nxs')
#
- # # (not done here because the Vanadium run file has a large number of events)
+ # # (not done here because the Vanadium run file has a large number of events)
#
# # Below we use the pre-calculated features that can be obtained with
# # the commands listed above.
@@ -136,7 +136,7 @@ Output:
For workspace index 400 the spectrum integration is 23.998
For workspace index 401 the spectrum integration is 23.799
For workspace index 402 the spectrum integration is 22.872
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/EstimateFitParameters-v1.rst b/docs/source/algorithms/EstimateFitParameters-v1.rst
index b52d962ce0357db3f372d0c10c10e62f345eab80..e1b0f5921c15d81b867155d3afc4d8e83c5b06a4 100644
--- a/docs/source/algorithms/EstimateFitParameters-v1.rst
+++ b/docs/source/algorithms/EstimateFitParameters-v1.rst
@@ -15,8 +15,8 @@ The user needs to provide the search intervals for each parameters that requires
These intervals are set by defining boundary constraints in the fitting function. For example::
name=UserFunction,Formula=a*x+b,a=0,b=0,constraints=(1<a<4, 0<b<4)
-
-Here the algorithm will search intervals [1, 4] and [0, 4] for values of parameters `a` and `b`
+
+Here the algorithm will search intervals [1, 4] and [0, 4] for values of parameters `a` and `b`
respectively such that the cost function is the smallest.
If a parameter will be fixed or tied in a fit don't include it in the `constraints`. For example::
@@ -34,7 +34,7 @@ In this strategy a number (defined by `NSamples` property) of parameter sets are
gives the smallest cost function is considered the winner. These best parameters are set to `Function`
property (it has the `InOut` direction).
-If `OutputWorkspace` property is set then more than 1 parameter set can be output. The output workspace is
+If `OutputWorkspace` property is set then more than 1 parameter set can be output. The output workspace is
a table workspace in which the first column contains the names of the parameters and the subsequent columns
have the parameter sets with the smallest cost fnction values. Below is an example of such a workspace.
@@ -59,7 +59,7 @@ Finding Bad Parameters
######################
It may happen that some of the parameters cannot be determined from the data set in the `InputWorkspace`. If this is the case :ref:`algm-Fit` may diverge
-or fail with an error. To try and find such parameters set `FixBadParameters` to `true`.
+or fail with an error. To try and find such parameters set `FixBadParameters` to `true`.
If the algorithm decides that some of the parameters may cause problems it will fix them.
Usage
@@ -78,7 +78,7 @@ Usage
2.847186128946, 1.726807862958, 1.047276595461,
0.6351380161499, 0.3851804649058, 0.1957211887562]
ws = CreateWorkspace(x, y)
-
+
# Define a function, constraints set the search intervals.
fun = 'name=BackToBackExponential,S=1.1,constraints=(50<I<200,0.1<A<300,0.01<B<10,-5<X0<0,0.001<S<4)'
@@ -92,7 +92,7 @@ Usage
alg.setProperty('CostFunction', 'Unweighted least squares')
# How many points to try.
alg.setProperty('NSamples', 1000)
- # A seed for the random number generator. Only to make this test reproducible.
+ # A seed for the random number generator. Only to make this test reproducible.
alg.setProperty('Seed', 1234)
# Execute the algorithm.
alg.execute()
@@ -103,10 +103,10 @@ Usage
EvaluateFunction(str(function),ws,OutputWorkspace='estimation')
# Run Fit starting with the new parameters.
Fit(str(function),ws,Output='fit')
-
+
.. figure:: /images/EstimateFitParameters_mcest.png
.. figure:: /images/EstimateFitParameters_mcfit.png
-
+
Output:
(You may see different numbers for the parameters when you run this example on your machine.)
@@ -129,7 +129,7 @@ Output:
0.0391638950989871, 0.00504176025969098, 0.000393669040655079,
1.86437423315169e-05, 5.35534780279311e-07, 1.43072419185677e-08]
ws = CreateWorkspace(x, y)
-
+
# Define a function, constraints set the search intervals.
fun = 'name=BackToBackExponential,S=1.1,constraints=(0.01<I<200,0.001<A<300,0.001<B<300,-5<X0<5,0.001<S<4)'
@@ -160,7 +160,7 @@ Output:
EvaluateFunction(str(function),ws,OutputWorkspace='estimation')
# Run Fit starting with the new parameters.
Fit(str(function),ws,Output='fit')
-
+
.. figure:: /images/EstimateFitParameters_ceest.png
.. figure:: /images/EstimateFitParameters_cefit.png
@@ -172,7 +172,7 @@ Output:
:options: +ELLIPSIS, +NORMALIZE_WHITESPACE
name=BackToBackExponential,I=...,X0=...,S=...,constraints=(0.01<I<200,0.001<A<300,0.001<B<300,-5<X0<5,0.001<S<4),ties=(A=...,B=...)
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/EstimateMuonAsymmetryFromCounts-v1.rst b/docs/source/algorithms/EstimateMuonAsymmetryFromCounts-v1.rst
index 0675d41282c01ec9f620b47c73bd637783e9b786..9edb302d6bed474962854044fe05970cb8a976c2 100644
--- a/docs/source/algorithms/EstimateMuonAsymmetryFromCounts-v1.rst
+++ b/docs/source/algorithms/EstimateMuonAsymmetryFromCounts-v1.rst
@@ -24,7 +24,7 @@ fitted normalization constant. The normalization is given by
.. math:: N_0= \frac{\Delta t\sum_j(\textrm{OldData}_j)}{\tau F \left( \exp(-\frac{t_0}{\tau})-\exp(-\frac{t_N}{\tau})\right) },
-where the summation only includes the data with times bewtween :math:`t_0` and :math:`t_N` and :math:`\Delta t` is the time step.
+where the summation only includes the data with times bewtween :math:`t_0` and :math:`t_N` and :math:`\Delta t` is the time step.
Usage
-----
@@ -35,7 +35,7 @@ Usage
import math
import numpy as np
-
+
tab = CreateEmptyTableWorkspace()
tab.addColumn('double', 'norm')
tab.addColumn('str', 'name')
@@ -50,7 +50,7 @@ Usage
print("Asymmetry : {}".format(['{0:.2f}'.format(value) for value in output.readY(0)]))
print("Unnormalized: {}".format(['{0:.2f}'.format(value) for value in unnorm.readY(0)]))
print("Normalization constant: {0:.2f}".format(tab.column(0)[0]))
-
+
Output:
.. testoutput:: ExSimple
@@ -65,7 +65,7 @@ Output:
import math
import numpy as np
-
+
tab = CreateEmptyTableWorkspace()
tab.addColumn('double', 'norm')
tab.addColumn('str', 'name')
@@ -81,7 +81,7 @@ Output:
print("Asymmetry: {}".format(['{0:.2f}'.format(value) for value in output.readY(0)]))
print("Normalization constant: {0:.2f}".format(tab.column(0)[0]))
-
+
Output:
.. testoutput:: ExNorm
diff --git a/docs/source/algorithms/EvaluateFunction-v1.rst b/docs/source/algorithms/EvaluateFunction-v1.rst
index 41aa5710e3682d2e93f2398023081ad276736f6c..f988c23a78c8ed9f308b53dfdd2ffbf5a3c3cb65 100644
--- a/docs/source/algorithms/EvaluateFunction-v1.rst
+++ b/docs/source/algorithms/EvaluateFunction-v1.rst
@@ -9,7 +9,7 @@
Description
-----------
-The algorithm will use the axes of the input workspace to evaluate a functions on them
+The algorithm will use the axes of the input workspace to evaluate a functions on them
and store the result in the output workspace.
Usage
diff --git a/docs/source/algorithms/EvaluateMDFunction-v1.rst b/docs/source/algorithms/EvaluateMDFunction-v1.rst
index 0c0d2d28586002f8aa4957ca218bc5deabf65c59..356975ac5ea75b7d78dc8263671881df177f8e98 100644
--- a/docs/source/algorithms/EvaluateMDFunction-v1.rst
+++ b/docs/source/algorithms/EvaluateMDFunction-v1.rst
@@ -11,7 +11,7 @@ Description
**Note**: this algorithm is deprecated, use :ref:`EvaluateFunction <algm-EvaluateFunction>` instead.
-The algorithm will use the axes of the input workspace to evaluate a functions on them
+The algorithm will use the axes of the input workspace to evaluate a functions on them
and store the result in the output workspace.
This is a plot of the evaluated function from the usage example below.
@@ -41,8 +41,8 @@ Usage
print(out.getXDimension().name)
print(out.getYDimension().name)
print(out.getZDimension().name)
-
-
+
+
Output
######
diff --git a/docs/source/algorithms/ExaminePowderDiffProfile-v1.rst b/docs/source/algorithms/ExaminePowderDiffProfile-v1.rst
index 26143b44ab996d835aaabff1cb55d09d81aeed5b..c03630b57ea824b7a099bbf5ccb9ed3199211b28 100644
--- a/docs/source/algorithms/ExaminePowderDiffProfile-v1.rst
+++ b/docs/source/algorithms/ExaminePowderDiffProfile-v1.rst
@@ -12,7 +12,7 @@ Description
This algorithm is to examine peak profile values for powder diffractometry by LeBailFit.
It is a workflow algorithm including loading files (including data file, profile parameter file and reflections list file),
-processing background and calculating peaks by Le Bail algorithm.
+processing background and calculating peaks by Le Bail algorithm.
Usage
@@ -25,25 +25,25 @@ Usage
# Generate inputs
LoadAscii(Filename='PG3_15035-3.dat', OutputWorkspace='PG3_15035-3', Unit='TOF')
- ProcessBackground(InputWorkspace='PG3_15035-3',
- OutputWorkspace='PG3_15035-3_BkgdPts',
- Options='SelectBackgroundPoints',
- LowerBound=9726,
- UpperBound=79000,
- SelectionMode='FitGivenDataPoints',
- BackgroundPoints='10082,10591,11154,12615,13690,13715,15073,16893,17764,19628,21318,24192,35350, 44212,50900,60000,69900,79000',
- UserBackgroundWorkspace='Bank3Background',
+ ProcessBackground(InputWorkspace='PG3_15035-3',
+ OutputWorkspace='PG3_15035-3_BkgdPts',
+ Options='SelectBackgroundPoints',
+ LowerBound=9726,
+ UpperBound=79000,
+ SelectionMode='FitGivenDataPoints',
+ BackgroundPoints='10082,10591,11154,12615,13690,13715,15073,16893,17764,19628,21318,24192,35350, 44212,50900,60000,69900,79000',
+ UserBackgroundWorkspace='Bank3Background',
OutputBackgroundParameterWorkspace='Bank3BackgroundParamsTable')
- CreateLeBailFitInput(FullprofParameterFile='2013A_HR60b3.irf',
+ CreateLeBailFitInput(FullprofParameterFile='2013A_HR60b3.irf',
ReflectionsFile='LB4854b3.hkl',
- Bank=3, LatticeConstant=4.156890,
+ Bank=3, LatticeConstant=4.156890,
InstrumentParameterWorkspace='PG3_Bank3_ParTable',
BraggPeakParameterWorkspace='LaB6_HKL_Table')
# Examine profile quality
- ExaminePowderDiffProfile(InputWorkspace='PG3_15035-3', StartX=20000, EndX=100000,
- ProfileWorkspace='PG3_Bank3_ParTable', BraggPeakWorkspace='LaB6_HKL_Table',
+ ExaminePowderDiffProfile(InputWorkspace='PG3_15035-3', StartX=20000, EndX=100000,
+ ProfileWorkspace='PG3_Bank3_ParTable', BraggPeakWorkspace='LaB6_HKL_Table',
BackgroundParameterWorkspace='Bank3BackgroundParamsTable', OutputWorkspace='PG3_15035B3_Cal')
# Output result
diff --git a/docs/source/algorithms/ExampleSaveAscii-v1.rst b/docs/source/algorithms/ExampleSaveAscii-v1.rst
index 4236bf38c2683f7ac897282fa7d451486281f321..8a5b3fd6b6fbb930dc260949f5c4db192a780dac 100644
--- a/docs/source/algorithms/ExampleSaveAscii-v1.rst
+++ b/docs/source/algorithms/ExampleSaveAscii-v1.rst
@@ -37,13 +37,13 @@ Usage
# Get the default save path
workdir = config['defaultsave.directory']
filepath = os.path.join(workdir, filename)
-
+
# Read and print first 3 lines from file
with open(filepath, 'r') as f:
print(f.readline()[:-1])
print(f.readline()[:-1])
print(f.readline()[:-1])
-
+
# Delete the test file
os.remove(filepath)
diff --git a/docs/source/algorithms/ExportExperimentLog-v1.rst b/docs/source/algorithms/ExportExperimentLog-v1.rst
index 6b13a6e6157381ee7329e0f8d4a16b5bb73783c2..94fb00850d41d3319a992d4ac435d078935364df 100644
--- a/docs/source/algorithms/ExportExperimentLog-v1.rst
+++ b/docs/source/algorithms/ExportExperimentLog-v1.rst
@@ -90,7 +90,7 @@ Usage
.. testcode:: ExExportExpLogs
import os
-
+
nxsfilename = "HYS_11092_event.nxs"
wsname = "HYS_11092_event"
@@ -98,15 +98,15 @@ Usage
if defaultdir == "":
defaultdir = config["defaultsave.directory"]
savefile = os.path.join(defaultdir, "testlog.txt")
-
- Load(Filename = nxsfilename,
+
+ Load(Filename = nxsfilename,
OutputWorkspace = wsname,
MetaDataOnly = True,
LoadLogs = True)
-
+
ExportExperimentLog(
InputWorkspace = wsname,
- OutputFilename = savefile,
+ OutputFilename = savefile,
FileMode = "new",
SampleLogNames = "run_start, run_title",
SampleLogTitles = "AA, BB",
@@ -115,7 +115,7 @@ Usage
TimeZone = "America/New_York")
print("File is created = {}".format(os.path.exists(savefile)))
-
+
# Get lines of file
sfile = open(savefile, 'r')
slines = sfile.readlines()
diff --git a/docs/source/algorithms/ExportGeometry-v1.rst b/docs/source/algorithms/ExportGeometry-v1.rst
index 36b20edabcd81c0ac8ffc73ebbafa54cce0be4e3..4ce1b95ed116109f8ff2a354bd50fb33a58c1170 100644
--- a/docs/source/algorithms/ExportGeometry-v1.rst
+++ b/docs/source/algorithms/ExportGeometry-v1.rst
@@ -12,8 +12,8 @@ Description
This algorithm is intended to write out portions of an instrument's
geometry in the :ref:`Instrument Definition File <InstrumentDefinitionFile>`
-xml format. The resulting file is meant to be copied by-hand into a
-geometry file, the output is not a useable IDF as written.
+xml format. The resulting file is meant to be copied by-hand into a
+geometry file, the output is not a useable IDF as written.
The main use of this algorithm is if the instrument geometry is
calibrated in mantid, this algorithm can be used to help get the
diff --git a/docs/source/algorithms/ExportSampleLogsToCSVFile-v1.rst b/docs/source/algorithms/ExportSampleLogsToCSVFile-v1.rst
index 3a7f8b6f10502e5f82c9d4111385152850be9a74..3a7e86be9dc88f35135a8818dda04101e40a70a8 100644
--- a/docs/source/algorithms/ExportSampleLogsToCSVFile-v1.rst
+++ b/docs/source/algorithms/ExportSampleLogsToCSVFile-v1.rst
@@ -11,23 +11,23 @@ Description
Algorithm *LoadSampleLogsToCSVFile* exports a specified set of sample logs
, which are stored in a MatrixWorkspace, to a CSV file.
-The header for the sample log csv file can also
-be created by this algorithm in a separate *header* file.
+The header for the sample log csv file can also
+be created by this algorithm in a separate *header* file.
CSV File format
###############
-Sample logs are written to a csv file.
-A tab separates any two adjacent values.
+Sample logs are written to a csv file.
+A tab separates any two adjacent values.
Each entry of each exported sample log will be an individual entry in the
output CSV file,
except in the situation that two entries with time stamps within time tolerance.
-The output CSV file has 2+n columns, where n is the number of sample logs
-to be exported.
+The output CSV file has 2+n columns, where n is the number of sample logs
+to be exported.
-Here is the definition for the columns.
+Here is the definition for the columns.
- Column 1: Absolute time (with respect to the Unix epoch) in seconds
- Column 2: Relative to first log entry's time
@@ -37,8 +37,8 @@ Here is the definition for the columns.
Header file
###########
-A sample log header file can be generated optionally.
-It contains theree lines described as below.
+A sample log header file can be generated optionally.
+It contains theree lines described as below.
- Line 1: Test date: [Test date in string]
- Line 2: Test description: [Description of this log file]
@@ -53,7 +53,7 @@ Some users wants to see the exported sample log as the neutron facility's local
So the input property 'TimeZone' is for this purpose.
Property *TimeZone* does not support all the time zones
-but only those with facilities that use Mantid.
+but only those with facilities that use Mantid.
Here is the list of all time zones that are allowed by this algorithm.
- UTC
@@ -113,7 +113,7 @@ Usage
print("Number of lines in File = {}".format(len(slines)))
print("Number of lines in Header file = {}".format(len(hlines)))
-
+
.. testcleanup:: ExExportSampleToTSV
os.remove(savefile)
diff --git a/docs/source/algorithms/ExportSampleLogsToHDF5-v1.rst b/docs/source/algorithms/ExportSampleLogsToHDF5-v1.rst
index 47c5562cc8dce8119c834ab1ce505363ee464a6d..c1c10203c80520f89083f98cd5354f7125cf0180 100644
--- a/docs/source/algorithms/ExportSampleLogsToHDF5-v1.rst
+++ b/docs/source/algorithms/ExportSampleLogsToHDF5-v1.rst
@@ -50,7 +50,7 @@ Usage
with h5py.File(output_filename, "r") as f:
sample_logs_group = f["Sample Logs"]
-
+
print("Proton charge saved to file: {}".format("tot_prtn_chrg" in sample_logs_group))
print(format_run_number(sample_logs_group["run_number"][0]))
print("nspectra (blacklisted) saved to file: {}".format("nspectra" in sample_logs_group))
diff --git a/docs/source/algorithms/ExportSpectraMask-v1.rst b/docs/source/algorithms/ExportSpectraMask-v1.rst
index 5bf6179e0cb1337de30222f62a264c0709b0f295..dd351a3acf1712ec86372595c69ad9cb7634725c 100644
--- a/docs/source/algorithms/ExportSpectraMask-v1.rst
+++ b/docs/source/algorithms/ExportSpectraMask-v1.rst
@@ -17,7 +17,7 @@ The format is described on :ref:`LoadMask <algm-LoadMask>` algorithm pages.
**Note** It is not recommended to use exported *.msk* files for masking workspaces during reduction as
the result of applying such mask will be different depending on the stage of reduction of the source and target files.
You need to make additional efforts (see :ref:`LoadMask <algm-LoadMask>` algorithm description) to avoid this effect.
-It is better to use :ref:`SaveMask <algm-SaveMask>` algorithm instead. This algorithm produces *.xml* files,
+It is better to use :ref:`SaveMask <algm-SaveMask>` algorithm instead. This algorithm produces *.xml* files,
containing lists of masked detectors, which will produce identical masking regardless of the workspace grouping and
spectra-detector map, defined for data acquisition electronics during experiment.
@@ -33,20 +33,20 @@ Usage
masks = [1,4,8,10,11,12,12,198,199,200]
test_ws = CreateSampleWorkspace()
test_ws.maskDetectors(masks)
-
+
f_name = 'test_ws_mask.msk'
-
+
#extract mask:
r_masks = ExportSpectraMask(test_ws,Filename=f_name)
-
+
# Compare results:
wmsk = ''
- final_fname = os.path.join(config.getString('defaultsave.directory'),f_name)
+ final_fname = os.path.join(config.getString('defaultsave.directory'),f_name)
with open(final_fname,'r') as res_file:
for line in res_file:
wmsk = line
os.remove(final_fname)
-
+
sys.stdout.write("Input mask: {0}\n".format(masks))
sys.stdout.write("Extracted mask: {0}\n".format(r_masks))
sys.stdout.write("Saved mask: {0}".format(wmsk))
diff --git a/docs/source/algorithms/ExportTimeSeriesLog-v1.rst b/docs/source/algorithms/ExportTimeSeriesLog-v1.rst
index 29e7fde322b7978b148052b56dc61482cf2fd27a..2fc0496421c675dafe732adec461d47490078802 100644
--- a/docs/source/algorithms/ExportTimeSeriesLog-v1.rst
+++ b/docs/source/algorithms/ExportTimeSeriesLog-v1.rst
@@ -17,7 +17,7 @@ If the output workspace is chosen to be an EventWorkspace, there are some limita
Output TimeSeries Log to MatrixWorkspace
########################################
-The output MatrixWorkspace has one spectrum.
+The output MatrixWorkspace has one spectrum.
X-vector and Y-vector have the same size, which is the size of exported TimeSeriesProperty.
The unit of X-vector is either *second* or *nano second*.
diff --git a/docs/source/algorithms/ExtractMask-v1.rst b/docs/source/algorithms/ExtractMask-v1.rst
index 1f13ca0e28b5f4324f99ae8718128bbd45487917..fe2ec8f9976fb87b147cc8d6e43a1a41753022c5 100644
--- a/docs/source/algorithms/ExtractMask-v1.rst
+++ b/docs/source/algorithms/ExtractMask-v1.rst
@@ -18,8 +18,8 @@ new MatrixWorkspace with a single X bin where:
The spectra containing 0 are also marked as masked and the instrument
link is preserved so that the instrument view functions correctly.
-A list of masked detector IDs is also output. Note this contains the detector IDs which
-are masked rather than the index or spectrum number.
+A list of masked detector IDs is also output. Note this contains the detector IDs which
+are masked rather than the index or spectrum number.
Usage
-----
@@ -45,7 +45,7 @@ Usage
print("n ws ws2")
for i in range (ws.getNumberHistograms()):
print("%i %-5s %s" % (i, ws.getDetector(i).isMasked(), ws2.getDetector(i).isMasked()))
-
+
print("\nMasked detector IDs")
print(maskList)
@@ -64,7 +64,7 @@ Output:
6 True True
7 False False
8 True True
-
+
Masked detector IDs
[ 9 11 13 15 17]
diff --git a/docs/source/algorithms/ExtractMonitorWorkspace-v1.rst b/docs/source/algorithms/ExtractMonitorWorkspace-v1.rst
index 626c243bbb2a3bb7b2bdda0152799e2cf1bdfdbf..e3b642e9b5a395167f393e79a694eb7ed84cf3e4 100644
--- a/docs/source/algorithms/ExtractMonitorWorkspace-v1.rst
+++ b/docs/source/algorithms/ExtractMonitorWorkspace-v1.rst
@@ -19,12 +19,12 @@ This does not extract monitor data that is stored with the detector data in the
Usage
-----
-**Example: Extracting an internally stored monitor workspace**
+**Example: Extracting an internally stored monitor workspace**
.. This is encoded as a non tested block as it is currently not possible to create a workspace with an internal monitor workspace in python.
.. code-block:: python
-
+
#If no monitor workspace is present the algorithm will fail.
wsMonitor = ExtractMonitorWorkspace(ws)
diff --git a/docs/source/algorithms/FFT-v1.rst b/docs/source/algorithms/FFT-v1.rst
index 467c249b81709bd7fc9cc4239181355756d2683b..18b129d099e6ead1555a934eaa71196a95f4ba5f 100644
--- a/docs/source/algorithms/FFT-v1.rst
+++ b/docs/source/algorithms/FFT-v1.rst
@@ -19,9 +19,9 @@ inverse ("Backward").
Note that it is assumed that the input data has the x origin in the
middle of the x-value range. It means that for the data defined on
-an interval [A,B] the output :math:`F(\xi_k)` must be multiplied by
+an interval [A,B] the output :math:`F(\xi_k)` must be multiplied by
:math:`e^{-2\pi ix_0\xi_k}`, where :math:`x_0=\tfrac{1}{2}(A+B)` and
-:math:`\xi_k` is the frequency. This can be achieved by using the
+:math:`\xi_k` is the frequency. This can be achieved by using the
input parameter *Shift*, which applies a phase shift to the transform,
or by setting *AutoShift* on to do this automatically.
@@ -202,7 +202,7 @@ Usage
.. testcode:: FFTBackwards
- #Create Sample Workspace
+ #Create Sample Workspace
ws = CreateSampleWorkspace(WorkspaceType = 'Event', NumBanks = 1, Function = 'Exp Decay', BankPixelWidth = 1, NumEvents = 100)
#apply the FFT algorithm - note output is point data
@@ -216,7 +216,7 @@ Usage
Output:
.. testoutput:: FFTBackwards
-
+
DataX(0)[1] equals DataX(0)[99]? : True
DataX(0)[10] equals DataX(0)[90]? : True
DataX((0)[50] equals 0? : True
diff --git a/docs/source/algorithms/FFTSmooth-v1.rst b/docs/source/algorithms/FFTSmooth-v1.rst
index 277c3e01e7862fb6ea2ef7e889ea42edf87a0ad2..7ad9a9613c26335736d0e16bcd25513b5b146fc3 100644
--- a/docs/source/algorithms/FFTSmooth-v1.rst
+++ b/docs/source/algorithms/FFTSmooth-v1.rst
@@ -60,16 +60,16 @@ Output:
.. testoutput:: ExFFTSmoothZeroing
bin Orig Smoothed
- 0 0.20 0.30
- 10 0.20 0.30
- 20 0.37 0.47
- 30 10.20 10.30
- 40 0.37 0.47
- 50 0.20 0.30
- 60 8.20 8.30
- 70 0.20 0.30
- 80 0.20 0.30
- 90 0.20 0.30
+ 0 0.20 0.30
+ 10 0.20 0.30
+ 20 0.37 0.47
+ 30 10.20 10.30
+ 40 0.37 0.47
+ 50 0.20 0.30
+ 60 8.20 8.30
+ 70 0.20 0.30
+ 80 0.20 0.30
+ 90 0.20 0.30
.. categories::
diff --git a/docs/source/algorithms/FFTSmooth-v2.rst b/docs/source/algorithms/FFTSmooth-v2.rst
index 9b44faa260f1261c08a17e50e22f8639a4bf7215..ecbc24a5ac1e64c86a94533c5a6f744d9a7be206 100644
--- a/docs/source/algorithms/FFTSmooth-v2.rst
+++ b/docs/source/algorithms/FFTSmooth-v2.rst
@@ -81,16 +81,16 @@ Output:
.. testoutput:: ExFFTSmoothZeroing
bin Orig Smoothed
- 0 0.20 0.30
- 10 0.20 0.30
- 20 0.37 0.47
- 30 10.20 10.30
- 40 0.37 0.47
- 50 0.20 0.30
- 60 8.20 8.30
- 70 0.20 0.30
- 80 0.20 0.30
- 90 0.20 0.30
+ 0 0.20 0.30
+ 10 0.20 0.30
+ 20 0.37 0.47
+ 30 10.20 10.30
+ 40 0.37 0.47
+ 50 0.20 0.30
+ 60 8.20 8.30
+ 70 0.20 0.30
+ 80 0.20 0.30
+ 90 0.20 0.30
**Example: Using the Butterworth filter**
diff --git a/docs/source/algorithms/FilterBadPulses-v1.rst b/docs/source/algorithms/FilterBadPulses-v1.rst
index b98e55478c0c8cefc901bd27987f778b71d3bbf7..ec022f1e50a9502f0f9a04ef8f4670b91668da28 100644
--- a/docs/source/algorithms/FilterBadPulses-v1.rst
+++ b/docs/source/algorithms/FilterBadPulses-v1.rst
@@ -18,13 +18,13 @@ producing neutrons, reducing background noise.
Usage
-----
-**Example - Using a simple proton charge log**
+**Example - Using a simple proton charge log**
.. testcode:: Filter
ws = CreateSampleWorkspace("Event",BankPixelWidth=1)
- AddTimeSeriesLog(ws, Name="proton_charge", Time="2010-01-01T00:00:00", Value=100)
+ AddTimeSeriesLog(ws, Name="proton_charge", Time="2010-01-01T00:00:00", Value=100)
AddTimeSeriesLog(ws, Name="proton_charge", Time="2010-01-01T00:10:00", Value=100)
AddTimeSeriesLog(ws, Name="proton_charge", Time="2010-01-01T00:20:00", Value=100)
AddTimeSeriesLog(ws, Name="proton_charge", Time="2010-01-01T00:30:00", Value=100)
@@ -40,7 +40,7 @@ Output:
.. testoutput:: Filter
- The number of events that remain: 950
+ The number of events that remain: 950
compared to the number in the unfiltered workspace: 1900
diff --git a/docs/source/algorithms/FilterByTime-v1.rst b/docs/source/algorithms/FilterByTime-v1.rst
index 9cd99c8e2e5aeba027438486202f27c4c3a05ea8..2c5841b3b72e81b519f37bf19561a9bee4347b56 100644
--- a/docs/source/algorithms/FilterByTime-v1.rst
+++ b/docs/source/algorithms/FilterByTime-v1.rst
@@ -33,12 +33,12 @@ introduction on event filtering in MantidPlot.
Usage
-----
-**Example - Using a relative and absolute times**
+**Example - Using a relative and absolute times**
.. testcode:: ExFilter
ws = CreateSampleWorkspace("Event",BankPixelWidth=1)
- AddTimeSeriesLog(ws, Name="proton_charge", Time="2010-01-01T00:00:00", Value=100)
+ AddTimeSeriesLog(ws, Name="proton_charge", Time="2010-01-01T00:00:00", Value=100)
AddTimeSeriesLog(ws, Name="proton_charge", Time="2010-01-01T00:10:00", Value=100)
AddTimeSeriesLog(ws, Name="proton_charge", Time="2010-01-01T00:20:00", Value=100)
AddTimeSeriesLog(ws, Name="proton_charge", Time="2010-01-01T00:30:00", Value=100)
diff --git a/docs/source/algorithms/FilterLogByTime-v1.rst b/docs/source/algorithms/FilterLogByTime-v1.rst
index cc472181d1f8c353b4cf916a8ac75e60f74974f8..b00cfbb373470f3a7d16bda6e781235b28103a8d 100644
--- a/docs/source/algorithms/FilterLogByTime-v1.rst
+++ b/docs/source/algorithms/FilterLogByTime-v1.rst
@@ -27,13 +27,13 @@ python numpy functions with the same name. These are documented
Usage
-----
-**Example - Filtering a simple time series Log**
+**Example - Filtering a simple time series Log**
.. testcode:: Filter
ws = CreateSampleWorkspace("Histogram",BankPixelWidth=1)
- AddTimeSeriesLog(ws, Name="proton_charge", Time="2010-01-01T00:00:00", Value=100)
+ AddTimeSeriesLog(ws, Name="proton_charge", Time="2010-01-01T00:00:00", Value=100)
AddTimeSeriesLog(ws, Name="proton_charge", Time="2010-01-01T00:10:00", Value=100)
AddTimeSeriesLog(ws, Name="proton_charge", Time="2010-01-01T00:20:00", Value=100)
AddTimeSeriesLog(ws, Name="proton_charge", Time="2010-01-01T00:30:00", Value=100)
@@ -52,7 +52,7 @@ Usage
print("The min is: %i" % stat_result)
(filtered_result,stat_result) = FilterLogByTime(ws,LogName="proton_charge", Method="median")
print("The median is: %i" % stat_result)
- print("")
+ print("")
print("Adding a start time and optionally an end time allows you to filter the values")
(filtered_result,stat_result) = FilterLogByTime(ws,LogName="proton_charge",
@@ -60,7 +60,7 @@ Usage
print("The filtered mean is: %i" % stat_result)
print("The filtered result is")
print(filtered_result)
-
+
Output:
diff --git a/docs/source/algorithms/FindCenterOfMassPosition-v1.rst b/docs/source/algorithms/FindCenterOfMassPosition-v1.rst
index d3ce89a051092bfdc88adc68e4f4b5d32f36270a..548830a85a82ba82a226fe7093fc3b105a66960f 100644
--- a/docs/source/algorithms/FindCenterOfMassPosition-v1.rst
+++ b/docs/source/algorithms/FindCenterOfMassPosition-v1.rst
@@ -9,7 +9,7 @@
Description
-----------
-Finds the beam center using the direct beam method.
+Finds the beam center using the direct beam method.
This algorithm is used by the EQSANS and HFIR SANS reduction.
The position of the beam center *p* is given by
@@ -17,17 +17,17 @@ The position of the beam center *p* is given by
:math:`\vec{p}=\frac{\sum_iI_i\vec{d}_i}{\sum_iI_i}`
-where i runs over all pixels within the largest square detector area centered on the
-initial guess for the beam center position. The initial guess is the center of the detector.
-:math:`I_i` is the detector count for pixel i, and :math:`\vec{d}_i` is the pixel coordinates. The calculation above
-is repeated iteratively by replacing the initial guess with the position found with the
-previous iteration. The process stops when the difference between the positions found
+where i runs over all pixels within the largest square detector area centered on the
+initial guess for the beam center position. The initial guess is the center of the detector.
+:math:`I_i` is the detector count for pixel i, and :math:`\vec{d}_i` is the pixel coordinates. The calculation above
+is repeated iteratively by replacing the initial guess with the position found with the
+previous iteration. The process stops when the difference between the positions found
with two consecutive iterations is smaller than 0.25 pixel.
-If *DirectBeam* is set to False, the beam center will be found using the
-scattered beam method. The process is identical to the direct beam method, with the
-only difference being that the pixels within a distance R (the beam radius) of the
-beam center guess are excluded from the calculation. The direct beam is thus
+If *DirectBeam* is set to False, the beam center will be found using the
+scattered beam method. The process is identical to the direct beam method, with the
+only difference being that the pixels within a distance R (the beam radius) of the
+beam center guess are excluded from the calculation. The direct beam is thus
excluded and only the scattered data is used.
If the *Output* property is set, the beam centre will be placed in a
@@ -46,10 +46,10 @@ Usage
# Load your data file
workspace = LoadSpice2D('BioSANS_empty_cell.xml')
-
+
# Compute the center position, which will be put in a table workspace
FindCenterOfMassPosition('workspace', Output='center', Version=1)
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/FindCenterOfMassPosition-v2.rst b/docs/source/algorithms/FindCenterOfMassPosition-v2.rst
index 807494f5f19438330e642fcccdf2a3bb63a71205..018dac348c4648ca9786f8db869cdd60ef8c6b31 100644
--- a/docs/source/algorithms/FindCenterOfMassPosition-v2.rst
+++ b/docs/source/algorithms/FindCenterOfMassPosition-v2.rst
@@ -9,7 +9,7 @@
Description
-----------
-Finds the beam center using the direct beam method.
+Finds the beam center using the direct beam method.
This algorithm is used by the EQSANS and HFIR SANS reduction.
The position of the beam center *p* is given by
@@ -17,17 +17,17 @@ The position of the beam center *p* is given by
:math:`\vec{p}=\frac{\sum_iI_i\vec{d}_i}{\sum_iI_i}`
-where i runs over all pixels within the largest square detector area centered on the
-initial guess for the beam center position. The initial guess is the center of the detector.
-:math:`I_i` is the detector count for pixel i, and :math:`\vec{d}_i` is the pixel coordinates. The calculation above
-is repeated iteratively by replacing the initial guess with the position found with the
-previous iteration. The process stops when the difference between the positions found
+where i runs over all pixels within the largest square detector area centered on the
+initial guess for the beam center position. The initial guess is the center of the detector.
+:math:`I_i` is the detector count for pixel i, and :math:`\vec{d}_i` is the pixel coordinates. The calculation above
+is repeated iteratively by replacing the initial guess with the position found with the
+previous iteration. The process stops when the difference between the positions found
with two consecutive iterations is smaller than 0.25 pixel.
-If *DirectBeam* is set to False, the beam center will be found using the
-scattered beam method. The process is identical to the direct beam method, with the
-only difference being that the pixels within a distance R (the beam radius) of the
-beam center guess are excluded from the calculation. The direct beam is thus
+If *DirectBeam* is set to False, the beam center will be found using the
+scattered beam method. The process is identical to the direct beam method, with the
+only difference being that the pixels within a distance R (the beam radius) of the
+beam center guess are excluded from the calculation. The direct beam is thus
excluded and only the scattered data is used.
If the *Output* property is set, the beam centre will be placed in a
@@ -45,10 +45,10 @@ Usage
# Load your data file
workspace = LoadSpice2D('BioSANS_empty_cell.xml')
-
+
# Compute the center position, which will be put in a table workspace
FindCenterOfMassPosition('workspace', Output='center')
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/FindDeadDetectors-v1.rst b/docs/source/algorithms/FindDeadDetectors-v1.rst
index 61183a433f719809ecfd64c905f3f1a901282ebd..95840ced1a50bc886c3e4770b9662f1b08b2147d 100644
--- a/docs/source/algorithms/FindDeadDetectors-v1.rst
+++ b/docs/source/algorithms/FindDeadDetectors-v1.rst
@@ -25,7 +25,7 @@ Uses the :ref:`algm-Integration` algorithm to sum the spectra.
Usage
-----
-**Example - Find various dead detectors**
+**Example - Find various dead detectors**
.. testcode:: FindVariousDeadDets
@@ -67,7 +67,7 @@ Output:
with a lower range and upper range will find all three
[110,115,120]
-
+
diff --git a/docs/source/algorithms/FindDetectorsOutsideLimits-v1.rst b/docs/source/algorithms/FindDetectorsOutsideLimits-v1.rst
index 3b4d4cbeeaddfabc5cc4909fd39efe19f8515169..272b61e7019e54cd81174c124a59b400e84373e2 100644
--- a/docs/source/algorithms/FindDetectorsOutsideLimits-v1.rst
+++ b/docs/source/algorithms/FindDetectorsOutsideLimits-v1.rst
@@ -47,7 +47,7 @@ Usage
print("")
print("With a High and LowThreshold, as well as restricting the range to consider")
- (wsOut2,NumberOfFailures)=FindDetectorsOutsideLimits(ws, HighThreshold=1000,
+ (wsOut2,NumberOfFailures)=FindDetectorsOutsideLimits(ws, HighThreshold=1000,
LowThreshold=0, RangeLower=200, RangeUpper=10000)
print("{} spectra were outside the limits.".format(NumberOfFailures))
@@ -71,12 +71,12 @@ Output:
ws = CreateSimulationWorkspace('MARI','0,1,10')
nh = ws.getNumberHistograms()
for ind in range(nh):
- y = ws.dataY(ind)
+ y = ws.dataY(ind)
if ind>=100 and ind < 300:
y.fill(100)
else:
- y.fill(1)
-
+ y.fill(1)
+
mws1,nMasked1 = FindDetectorsOutsideLimits(ws,100)
mws2,nMasked2 = FindDetectorsOutsideLimits(ws,100,startWorkspaceIndex = 200)
diff --git a/docs/source/algorithms/FindEPP-v2.rst b/docs/source/algorithms/FindEPP-v2.rst
index a5911df4dfab16292ae592ce34e8680232b00cfa..18355febfa3f534cf525f58199f0ed4a0b8a5012 100644
--- a/docs/source/algorithms/FindEPP-v2.rst
+++ b/docs/source/algorithms/FindEPP-v2.rst
@@ -54,5 +54,5 @@ Output:
.. categories::
.. sourcelink::
- :filename: FindEPP
+ :filename: FindEPP
:py: None
diff --git a/docs/source/algorithms/FindGoniometerFromUB-v1.rst b/docs/source/algorithms/FindGoniometerFromUB-v1.rst
index 961cb74ec751d8fb7e6f483552fb15626e12d530..f5abd6a3084e7d117b2aa45ebfb6aabe2e69350c 100644
--- a/docs/source/algorithms/FindGoniometerFromUB-v1.rst
+++ b/docs/source/algorithms/FindGoniometerFromUB-v1.rst
@@ -26,7 +26,7 @@ Useage
**Example:**
-.. code-block:: python
+.. code-block:: python
# WISH single crystal
# demonstration of linkedUBs algorithm on D10 Ruby (cyle 18/1)
diff --git a/docs/source/algorithms/FindPeakBackground-v1.rst b/docs/source/algorithms/FindPeakBackground-v1.rst
index 13fe933f2bec15837591eb6a41fad34e994f92be..1ae908c16cfd002416a427d4df263c5282e82686 100644
--- a/docs/source/algorithms/FindPeakBackground-v1.rst
+++ b/docs/source/algorithms/FindPeakBackground-v1.rst
@@ -9,16 +9,16 @@
Description
-----------
-Algorithm written using the paper referenced below which has a very good
-description.
-
-This algorithm estimates the background level and separates the background
-from signal data in a Poisson-distributed data set by statistical analysis.
-For each iteration, the bins/points with the highest intensity value are
-eliminated from the data set and the sample mean and the unbiased variance
-estimator are calculated. Convergence is reached when the absolute
-difference between the sample mean and the sample variance of the data set
-is within k standard deviations of the variance, the default value of k
+Algorithm written using the paper referenced below which has a very good
+description.
+
+This algorithm estimates the background level and separates the background
+from signal data in a Poisson-distributed data set by statistical analysis.
+For each iteration, the bins/points with the highest intensity value are
+eliminated from the data set and the sample mean and the unbiased variance
+estimator are calculated. Convergence is reached when the absolute
+difference between the sample mean and the sample variance of the data set
+is within k standard deviations of the variance, the default value of k
being 1. The k value is called ``SigmaConstant`` in the algorithm input.
References
diff --git a/docs/source/algorithms/FindPeaksMD-v1.rst b/docs/source/algorithms/FindPeaksMD-v1.rst
index 12ff02c569650b494a7e9e78b64e405945a429bd..2834f2473e5c9df77d6c1fff7f854033d75be3a9 100644
--- a/docs/source/algorithms/FindPeaksMD-v1.rst
+++ b/docs/source/algorithms/FindPeaksMD-v1.rst
@@ -45,11 +45,11 @@ is not accessible. It may give better results on
:ref:`MDWorkspaces <MDWorkspace>`.
-For data which has originally been based on histogram-type data and that has been converted to
+For data which has originally been based on histogram-type data and that has been converted to
event-based data it might be beneficial to select the NumberOfEventNormalization for the `PeakFindingStrategy` property instead of the VolumeNormalization which is the default. This
will disable the `DensityThresholdFactor` property and enable the `SignalThresholdFactor` property.
The algorithmic steps remain the same as above but instead of using the signal density as the sorting
-quantity the signal count (total weighted event sum divided by the number of events) is used. If
+quantity the signal count (total weighted event sum divided by the number of events) is used. If
the events are weighted this will result in boxes with signal counts larger than one for peaks and for the majority of background counts the signal count will be 1. Hence it is possible to discriminate between peaks and background. Note that the NumberOfEventNormalization selection of the `PeakFindingStrategy` property does not make sense for all scenarios and infact might not produce useful results for your particular case.
@@ -162,7 +162,7 @@ file is available in `Mantid system tests repository <https://github.com/mantidp
name= name[:8]
row += "| {:8} ".format(name)
print(row + "|")
-
+
for i in range(nRows):
row = ""
for name in tab_names:
@@ -173,10 +173,10 @@ file is available in `Mantid system tests repository <https://github.com/mantidp
else:
row += "| {:8} ".format(str(data2pr))
print(row + "|")
-
+
# load test workspace
Load(Filename=r'TOPAZ_3132_event.nxs',OutputWorkspace='TOPAZ_3132_event',LoadMonitors='1')
-
+
# build peak workspace necessary for IntegrateEllipsoids algorithm to work
ConvertToMD(InputWorkspace='TOPAZ_3132_event',QDimensions='Q3D',dEAnalysisMode='Elastic',Q3DFrames='Q_sample',LorentzCorrection='1',OutputWorkspace='TOPAZ_3132_md',\
MinValues='-25,-25,-25',MaxValues='25,25,25',SplitInto='2',SplitThreshold='50',MaxRecursionDepth='13',MinRecursionDepth='7')
diff --git a/docs/source/algorithms/FindSXPeaks-v1.rst b/docs/source/algorithms/FindSXPeaks-v1.rst
index 231ad55bb22e0eefa0e60063e5cdf11de690da27..247b17fd244c8c864f6e5eb64fa4064fa0d34c12 100644
--- a/docs/source/algorithms/FindSXPeaks-v1.rst
+++ b/docs/source/algorithms/FindSXPeaks-v1.rst
@@ -17,18 +17,18 @@ d-spacing.
Strongest peak mode:
-- The highest intensity bin is taken to be the peak, so the algorithm only
+- The highest intensity bin is taken to be the peak, so the algorithm only
finds one peak per spectra. In this case the background is calculated as the
average of the start and end intensity multiplied by the provided
SignalBackground parameter. Peaks that are not above the background are
- culled.
+ culled.
- This peak finding mode is mainly used with the ResolutionStrategy set to
RelativeResolution. In this case, the resolution parameter defines a
tolerance which is compared to the absolute difference between the parameters
:math:`\phi`, :math:`2\theta`, and :math:`t` of two found peaks. If the
absolute difference between any of the parameters for two peaks is greater
than the product of the tolerance value and the parameter value then the two
- peaks are classed as not the same. i.e. if :math:`|\phi_1 - \phi_2| > tolerance * \phi_1`
+ peaks are classed as not the same. i.e. if :math:`|\phi_1 - \phi_2| > tolerance * \phi_1`
then peaks 1 & 2 are not the same (as well as similar
definitions for :math:`2\theta` and :math:`t`).
@@ -36,13 +36,13 @@ Strongest peak mode:
All peaks mode:
- All peaks in each spectra above a certain threshold are detected as peaks
- (see below for the threshold).
+ (see below for the threshold).
- In this case the user provides an absolute, global background/threshold
value which is set with the AbsoluteBackground parameter. Peaks that are not
above the absolute background are culled. A good way of identifying the
background is to inspect your data set in pick mode within the
InstrumentView. Ensure that your absolute background has been set high
- enough, else the algorithm will pick up noise as peaks.
+ enough, else the algorithm will pick up noise as peaks.
- This peak finding mode provides the best results when used with the
ResolutionStrategy set to AbsoluteResolution, which allows the user to set
absolute resolution values for the XUnitResolution (either in units of TOF or
@@ -51,7 +51,7 @@ All peaks mode:
difference between the parameters :math:`\phi`, :math:`2\theta`, and
:math:`t` of two found peaks. If the absolute difference between any of the
parameters for two peaks is greater than the absolute tolerance then the two
- peaks are classed as not the same. i.e. if :math:`|\phi_1 - \phi_2| > PhiTolerance`
+ peaks are classed as not the same. i.e. if :math:`|\phi_1 - \phi_2| > PhiTolerance`
then peaks 1 & 2 are not the same (as well as similar
definitions for :math:`2\theta` and :math:`t`).
@@ -70,7 +70,7 @@ Usage
# create histogram workspace
ws=CreateSampleWorkspace()
-
+
wsPeaks = FindSXPeaks(ws)
print("Peaks found: {}".format(wsPeaks.getNumberPeaks()))
diff --git a/docs/source/algorithms/FindSatellitePeaks-v1.rst b/docs/source/algorithms/FindSatellitePeaks-v1.rst
index c157ea7a54c6aea666a656a55e782f76b302b9fb..120e162077bca003c9732111cc0341c7a1da1ff5 100644
--- a/docs/source/algorithms/FindSatellitePeaks-v1.rst
+++ b/docs/source/algorithms/FindSatellitePeaks-v1.rst
@@ -12,7 +12,7 @@ occurring at fractional HKL locations in reciprocal space. FindSatellitePeaks
takes a :ref:`MDWorkspace <MDWorkspace>` of experimental data, a
:ref:`PeaksWorkspace <PeaksWorkspace>` containing the locations of peaks with
integer HKL, and another PeaksWorkspace containing a subset of peaks found at
-fractional HKL.
+fractional HKL.
.. figure:: ../images/FindSatellitePeaks-satellites.png
:align: center
@@ -43,7 +43,7 @@ the :ref:`MDWorkspace <MDWorkspace>`.
as starting points into distinct sets of `q` vectors. The centroid of each
cluster is then taken as the "true" value of `q` and is used to predict the
position of all other fractional peaks with this `q`.
-
+
For each predicted fractional peak, the local centroid (the radius of which is
defined by `PeakRadius`) in the MD data is found and this is taken as the actual
@@ -71,21 +71,21 @@ discarded if there I/sigma value is less than the parameter `IOverSigma`.
The output of the algorithm is a peaks workspace containing all of the
satellite peaks found by the algorithm in fractional coordinates. Each of the
peaks will have an intensity value from the :ref:`IntegratePeaksMD
-<algm-IntegratePeaksMD-v2>` algorithm.
+<algm-IntegratePeaksMD-v2>` algorithm.
.. warning:: This integration is very approximate and may not produce the best
possible values. It is recommended that satellite peaks are reintegrated
using one of the many peak integration algorithms and to tune their
- parameters to obtain the best possible peak integration.
+ parameters to obtain the best possible peak integration.
For more information on superspace crystallography see:
-- Van Smaalen, Sander. "An elementary introduction to superspace
- crystallography." Zeitschrift für Kristallographie-Crystalline Materials
- 219, no. 11 (2004): 681-691.
+- Van Smaalen, Sander. "An elementary introduction to superspace
+ crystallography." Zeitschrift für Kristallographie-Crystalline Materials
+ 219, no. 11 (2004): 681-691.
-- Van Smaalen, Sander. "Incommensurate crystal structures." Crystallography
- Reviews 4, no. 2 (1995): 79-202.
+- Van Smaalen, Sander. "Incommensurate crystal structures." Crystallography
+ Reviews 4, no. 2 (1995): 79-202.
Related Algorithms
------------------
@@ -93,7 +93,7 @@ Related Algorithms
position of fractional peaks given a :ref:`PeaksWorkspace <PeaksWorkspace>` of
nuclear peaks and a set of HKL offsets.
-- :ref:`CentroidPeaksMD <algm-CentroidPeaksMD-v2>` is used to find the local
+- :ref:`CentroidPeaksMD <algm-CentroidPeaksMD-v2>` is used to find the local
centroid from a predicted peak position.
- :ref:`IntegratePeaksMD <algm-IntegratePeaksMD-v2>` is used to integrate
diff --git a/docs/source/algorithms/Fit-v1.rst b/docs/source/algorithms/Fit-v1.rst
index bb770e1b74c65d5c4c2f72e71e1ad81fe11d648a..cd17174c53bdb411e813dc8809858e783b5ae544 100644
--- a/docs/source/algorithms/Fit-v1.rst
+++ b/docs/source/algorithms/Fit-v1.rst
@@ -224,7 +224,7 @@ The "Histogram" evaluation type will typically give more accurate results when f
histograms with very large bins. It also less sensitive to a particular binning.
For the next example a spectrum was generated and rebinned to different bin sizes.
-Each binned spectrum was fitted using both "CentrePoint" (left column) and "Histogram"
+Each binned spectrum was fitted using both "CentrePoint" (left column) and "Histogram"
evaluation (right column). As it can be seen form the plots the "Histogram" fitting
gives more consistent results which are also closer to the correct values (Amplitude=20.0,
PeakCentre=0.0, FWHM=1.0).
@@ -324,14 +324,14 @@ Multiple Fit
It is possible to fit to multiple data sets using the fit algorithm. This
can be either simultaneously or sequentially. There are a few differences
to a single fit. Firstly is that the :ref:`CompositeFunction <func-CompositeFunction>`
-must be a :code:`MultiDomainFunction` and each of the individual fitting functions must include
+must be a :code:`MultiDomainFunction` and each of the individual fitting functions must include
:code:`$domain=i`. The extra workspaces can be added by placing an :code:`_i` after :code:`InputWorkspace` and
-:code:`InputWorkspaceIndex` starting with :math:`i=1` for the second workspace. It is also possible to
-set the fitting range for each data set individually in the same way as the :code:`InputWorkspace`.
-If a variable is to be fitted using data from multiple data sets then a :code:`tie` has
+:code:`InputWorkspaceIndex` starting with :math:`i=1` for the second workspace. It is also possible to
+set the fitting range for each data set individually in the same way as the :code:`InputWorkspace`.
+If a variable is to be fitted using data from multiple data sets then a :code:`tie` has
to be used. The values that are tied will have the same value and be calculated from multiple
-data sets.
-
+data sets.
+
Examples
--------
@@ -541,7 +541,7 @@ Output:
Constant 1: 2.00
Constant 2: 5.00
-
+
**Example - Fit to two data sets with shared parameter:**
.. testcode:: shareFit
@@ -571,7 +571,7 @@ Output:
# print results
print("Constant 1: {0:.2f}".format(paramTable.column(1)[0]))
print("Constant 2: {0:.2f}".format(paramTable.column(1)[1]))
-
+
Output:
.. testoutput:: shareFit
diff --git a/docs/source/algorithms/FitPeak-v1.rst b/docs/source/algorithms/FitPeak-v1.rst
index 515a0d3929a85e1ffa9a4e14dfb22543a069939f..0cd12a48bc3c61dff90448d51755bb1acdb86593 100644
--- a/docs/source/algorithms/FitPeak-v1.rst
+++ b/docs/source/algorithms/FitPeak-v1.rst
@@ -18,19 +18,19 @@ columns...
Peak profile
############
-All peak profiles supported by Mantid are supported by FitPeak.
+All peak profiles supported by Mantid are supported by FitPeak.
Starting parameter values specified by user should be close to the real values,
-unless the automatic starting values determination algorithm works well with that
-profile type.
+unless the automatic starting values determination algorithm works well with that
+profile type.
-But only [[Gaussian]] has been well tested with this functionalities.
+But only [[Gaussian]] has been well tested with this functionalities.
-Background
+Background
##########
There are only three types of backgrounds that are supported, including
-FlatBackground, LinearBackground and Quadratic.
+FlatBackground, LinearBackground and Quadratic.
Input and Output
################
@@ -43,13 +43,13 @@ implemented.
Default function parameters' names
==================================
-Input function parameters' names should be exactly the same as those defined in Mantid.
-This brings some inconvenience to users through MantidPlot GUI.
+Input function parameters' names should be exactly the same as those defined in Mantid.
+This brings some inconvenience to users through MantidPlot GUI.
Thus user can input function parameters values in the default order,
-which is instructed in the list of functions.
+which is instructed in the list of functions.
For example, one background function type is defined as 'Linear (A0, A1)'.
-As user chooses this function, he does not need to input background function parameter names,
-but writes values of A0 and A1, respectively.
+As user chooses this function, he does not need to input background function parameter names,
+but writes values of A0 and A1, respectively.
Output of function parameters
=============================
@@ -68,10 +68,10 @@ FindPeaks uses a more complicated approach to fit peaks if '''HighBackground'''
Simple fit
==========
In the 'simple fit' mode, the algorithm will make a composite function including
-peak and background function and fit it against the observed data.
+peak and background function and fit it against the observed data.
It works well with good starting values of the peak and background function,
-especially when the peak is significant with low background.
+especially when the peak is significant with low background.
High background fit
@@ -79,19 +79,19 @@ High background fit
In the 'high background fit' mode, the background will be removed first;
then the fitting is focussed on the 'pure' peak function;
-and a composite function is fit against the original data as the last step.
+and a composite function is fit against the original data as the last step.
This approach is developed due to the failure of 'simple fit' mode on the cases
-that background level is much higher than the peak height.
+that background level is much higher than the peak height.
Without the background being removed, the optimizer intends to favor the background
-rather than the peak function.
+rather than the peak function.
Starting values of the peak function
====================================
* Peak height is estimated by the maximum value, with background removed, inside the peak range;
-* Peak position can be set up either to the X value of the maximum Y value in the peak range, or to the value specified by user accordin to user's selection. For example, in the case of calibrating the offsets of detectors of powder diffractometers, the peak positions are unknown. Then it is better to use the X value with the maximum Y value as the starting peak centre. While in the case of striping vanadium peaks, all peaks' centres should be exactly same as the theortical values.
+* Peak position can be set up either to the X value of the maximum Y value in the peak range, or to the value specified by user accordin to user's selection. For example, in the case of calibrating the offsets of detectors of powder diffractometers, the peak positions are unknown. Then it is better to use the X value with the maximum Y value as the starting peak centre. While in the case of striping vanadium peaks, all peaks' centres should be exactly same as the theortical values.
Criteria To Validate Peaks Found
@@ -108,7 +108,7 @@ fitted peak position must be within a short distance to the give one.
2. Peak height. In the certain number of trial, peak height can be used
to select the best fit among various starting sigma values.
-3. Peak width: Peak width cannot be equal or wider than the given fit window.
+3. Peak width: Peak width cannot be equal or wider than the given fit window.
Fit Window and Peak Range
diff --git a/docs/source/algorithms/FlatPlateAbsorption-v1.rst b/docs/source/algorithms/FlatPlateAbsorption-v1.rst
index b7807180e3d3f46d57cf663de6053bab7464d382..13a5d487fae74d4141be371b67da88c61469c8a4 100644
--- a/docs/source/algorithms/FlatPlateAbsorption-v1.rst
+++ b/docs/source/algorithms/FlatPlateAbsorption-v1.rst
@@ -37,7 +37,7 @@ Usage
**Example:**
.. testcode:: ExSimpleSpere
-
+
ws = CreateSampleWorkspace("Histogram",NumBanks=1,BankPixelWidth=2)
ws = ConvertUnits(ws,"Wavelength")
SetSampleMaterial(ws,ChemicalFormula="V")
diff --git a/docs/source/algorithms/FlippingRatioCorrectionMD-v1.rst b/docs/source/algorithms/FlippingRatioCorrectionMD-v1.rst
index 2cac6f13d4a01b1a2a9461a99d3d6e0ca789c734..d02e369529c6ec014a3b6d819c480c9d3ea7036f 100644
--- a/docs/source/algorithms/FlippingRatioCorrectionMD-v1.rst
+++ b/docs/source/algorithms/FlippingRatioCorrectionMD-v1.rst
@@ -11,15 +11,15 @@ Description
-----------
Measurements using polarized neutrons can be used to identify magnetic and nuclear contribution.
-In the case of coherent scattering, nuclear spins generally do not change the spin polarization
+In the case of coherent scattering, nuclear spins generally do not change the spin polarization
of the neutrons (non spin flip scattering).
For magnetic scattering, the magnetization parallel to the neutron spin direction produces
non spin flip scattering, while magnetization perpendicular to the spin direction will flip
the neutron spin.
-When measuring spin flip and non spin flip cross sections, the finite capabilities of the instrument
-will allow a certain percentage of the other component to leak through. This is denoted by the
-flipping ratio :math:`F`. Using subscript "m" for measured and "c" for corrected, the corrected
+When measuring spin flip and non spin flip cross sections, the finite capabilities of the instrument
+will allow a certain percentage of the other component to leak through. This is denoted by the
+flipping ratio :math:`F`. Using subscript "m" for measured and "c" for corrected, the corrected
intensities for the spin flip (SF) and non spin flip (NSF) scattering are given by [1]_:
.. math::
@@ -31,7 +31,7 @@ intensities for the spin flip (SF) and non spin flip (NSF) scattering are given
Given a multidimensional event workspace, this algorithm will output the workspace where events
are multiplied by :math:`F/(F-1)` (in ``OutputWorkspace1``) and by :math:`1/(F-1)` (in ``OutputWorkspace2``).
Note however that the flipping ratio might be angle dependent. For example, in the case of
-type II superconductors, the flux lattice will depolarize the neutrons differently, depending
+type II superconductors, the flux lattice will depolarize the neutrons differently, depending
on the orientation of the neutron beam with respect to the superconducting planes. In this case
one must use a formula that would use a different flipping ratio for each neutron, that
depends on a goniometer angle. Assuming that we have a log value ``omega`` for the sample rotation,
diff --git a/docs/source/algorithms/GSASIIRefineFitPeaks-v1.rst b/docs/source/algorithms/GSASIIRefineFitPeaks-v1.rst
index 93a2bc9c4c0f15ea566a2bb9eee1bca121febcbb..55385722531d39c8b00e382374b7f67ff68e3bc2 100644
--- a/docs/source/algorithms/GSASIIRefineFitPeaks-v1.rst
+++ b/docs/source/algorithms/GSASIIRefineFitPeaks-v1.rst
@@ -110,7 +110,7 @@ Usage
tested for correctness on our servers, due to the requirement to
have GSAS-II installed. Please contact the Mantid developers if
something is awry.
-
+
**Example - Pawley refinement of lattice parameters from a diffraction spectrum**
.. code-block:: python
diff --git a/docs/source/algorithms/GeneralisedSecondDifference-v1.rst b/docs/source/algorithms/GeneralisedSecondDifference-v1.rst
index 94359793ffba5a2e51dce897d24fc25840f9c0b5..09bd03e3d53ee573d773c37c4ebdf3af0740cc90 100644
--- a/docs/source/algorithms/GeneralisedSecondDifference-v1.rst
+++ b/docs/source/algorithms/GeneralisedSecondDifference-v1.rst
@@ -26,7 +26,7 @@ Usage
# Create Workspace with peak around x=15.0
ws = CreateSampleWorkspace(BankPixelWidth=1, Xmax=30, BinWidth=1)
- # Apply algorithm.
+ # Apply algorithm.
wsD = GeneralisedSecondDifference(ws,M=2,Z=2)
# Show values around the peak
diff --git a/docs/source/algorithms/GenerateEventsFilter-v1.rst b/docs/source/algorithms/GenerateEventsFilter-v1.rst
index 75c65fae1591a7bad99bbb5c97c870fce60cc632..1e79760dead6a65cd6c4d27d2a6895c4b1b9c1b5 100644
--- a/docs/source/algorithms/GenerateEventsFilter-v1.rst
+++ b/docs/source/algorithms/GenerateEventsFilter-v1.rst
@@ -35,9 +35,9 @@ frequency sample logs, which can be even faster than chopper frequencies.
Input Workspace
###############
-This algorithm mainly uses the information retrieved from sample logs to create
+This algorithm mainly uses the information retrieved from sample logs to create
event splitters.
-Therefore, EventWorkspace is only required if the run end time cannot be determined by sample logs.
+Therefore, EventWorkspace is only required if the run end time cannot be determined by sample logs.
For example, proton charge log cannot be found.
@@ -82,10 +82,10 @@ this algorithm:
by 1 from 0 along with their orders in time.
- A series of filters for multiple continuous time intervals, which
- have various lengths of period.
- Each of them has an individual workspace index associated.
+ have various lengths of period.
+ Each of them has an individual workspace index associated.
These workspace indices are incremented by 1 from 0 along with their
- order in time.
+ order in time.
- A filter containing one or multiple time intervals according to a
specified log value. Any log value of the time that falls into the
@@ -103,37 +103,37 @@ this algorithm:
Generate event filters by time
##############################
-Event filters can be created by defining start time, stop time and time intervals.
-The three input properties for them are ``StartTime``, ``StopTime`` and ``TimeInterval``,
-respectively.
+Event filters can be created by defining start time, stop time and time intervals.
+The three input properties for them are ``StartTime``, ``StopTime`` and ``TimeInterval``,
+respectively.
-``TimeInterval`` accepts an array of doubles.
-If the array size is zero, then there will be one and only splitter will be
-created from ``StartTime`` and ``StopTime``.
+``TimeInterval`` accepts an array of doubles.
+If the array size is zero, then there will be one and only splitter will be
+created from ``StartTime`` and ``StopTime``.
If the size of the array is one, then all event splitters will have the same duration
-of time.
-In general if the array is composed as :math:`t_1, t_2, \cdots, t_n`,
-and :math:`T_0` is the run start time,
-then the event splitters will have the time boundaries as
+of time.
+In general if the array is composed as :math:`t_1, t_2, \cdots, t_n`,
+and :math:`T_0` is the run start time,
+then the event splitters will have the time boundaries as
.. math:: (T_0, T_0+t_1), (T_0+t_1, T_0+t_1+t_2), \cdots, (T_0+\sum_{i=1}^{n-1}t_i, T_0+\sum_{i=1}^nt_i), (T_0+\sum_{i=1}^nt_i, T_0+\sum_{i=1}^nt_i+t_1), \cdots
-until the stop time is reached.
+until the stop time is reached.
Unit of time
============
-There are three types of units that are supported for time.
-They are second, nanosecond and percentage of duration from ``StartTime`` to ``StopTime``.
+There are three types of units that are supported for time.
+They are second, nanosecond and percentage of duration from ``StartTime`` to ``StopTime``.
.. _filterbylogv-GenerateEventFilter-ref:
Generate event filters by sample log value
##########################################
-The sample log will be divided to intervals as :math:`v_0, v_1, \cdots, v_{i-1}, v_i, v_{i+1}, \cdots`.
+The sample log will be divided to intervals as :math:`v_0, v_1, \cdots, v_{i-1}, v_i, v_{i+1}, \cdots`.
All log entries, whose values falls into range :math:`[v_j, v_{j+1})`, will be assigned to
-a same workspace group.
+a same workspace group.
About how log value is recorded
@@ -164,7 +164,7 @@ resolution to 1 microsecond.
Algorithm Parameters and Examples
---------------------------------
-Here are the introductions to some important parameters (i.e., algorithm's properties).
+Here are the introductions to some important parameters (i.e., algorithm's properties).
Parameter: ``Centre``
@@ -193,9 +193,9 @@ filtering events.
Double value log
================
-Let user-specified minimum log value to be :math:`L_{min}`,
-LogValueTolerance to be :math:`t`, and LogValueInterval to be :math:`\delta`,
-then the log value intervals are
+Let user-specified minimum log value to be :math:`L_{min}`,
+LogValueTolerance to be :math:`t`, and LogValueInterval to be :math:`\delta`,
+then the log value intervals are
.. math:: [L_{min}-t, L_{min}-tol+\delta), [L_{min}-tol+\delta, L_{min}-tol+2\cdot\delta), \cdots
@@ -204,35 +204,35 @@ The default value of LogValueTolerance is LogValueInterval divided by 2.
Integer value log
=================
-It is a little bit different for sample log recorded with integer.
+It is a little bit different for sample log recorded with integer.
-- ``MinimumLogValue`` and ``MaximumLogValue`` can be same such that only entries with exactly the same log value
+- ``MinimumLogValue`` and ``MaximumLogValue`` can be same such that only entries with exactly the same log value
will be considered;
- If ``LogValueInterval`` is not give (i.e., default value is used), then any log enetry with log value
- larger and equal to ``MinimumLogValue`` and smaller and equal to ``MaximumLogValue`` will be considered.
+ larger and equal to ``MinimumLogValue`` and smaller and equal to ``MaximumLogValue`` will be considered.
Be noticed that in the same case for double value log, log entry with value equal to ``MaximumLogValue``
- will be excluded.
+ will be excluded.
Example: Filter by double log value from :math:`s_0` to :math:`s_f`
###################################################################
-There are two setup to acquire the same result:
+There are two setup to acquire the same result:
- Use single-log-value mode:
- MinimumLogValue = :math:`s_0`
- MaximumLogValue = :math:`s_f`
- LogValueInterval is left to default
-
+
- Use multiple-log-value mode:
- MinimumLogValue = :math:`s_0`
- MaximumLogValue = :math:`s_f`
- LogValueInterval = :math:`s_f - s_0`
- LogValueTolerance = 0
-
+
@@ -280,9 +280,9 @@ Output:
**Example - Generate event filter by temperature value with an empty workspace**
-The following is a contrived example to show how one would use the algorithm to
+The following is a contrived example to show how one would use the algorithm to
generate event splitters from an empty workspace, which has sample logs in run object,
-by a temperature log.
+by a temperature log.
The resulting workspaces would then be fed to
:ref:`FilterEvents <algm-FilterEvents>`
for further processing.
diff --git a/docs/source/algorithms/GenerateGroupingPowder-v1.rst b/docs/source/algorithms/GenerateGroupingPowder-v1.rst
index 835167a43408c8866b4f766af60aaef8c1e66b20..5f2d1687e0f792a8603edbcff0d9f7f5fed0593a 100644
--- a/docs/source/algorithms/GenerateGroupingPowder-v1.rst
+++ b/docs/source/algorithms/GenerateGroupingPowder-v1.rst
@@ -19,7 +19,7 @@ average distances to the detector groups, and average scattering angles.
The x and y extents in the par file are radians(step)\*distance and
0.01, and are not supposed to be accurate.
-The grouping file (.xml) can be used with :ref:`GroupDetectors
+The grouping file (.xml) can be used with :ref:`GroupDetectors
<algm-GroupDetectors>` to perform the grouping.
Usage
@@ -32,13 +32,13 @@ Usage
# create some grouping file
import mantid
outputFilename=mantid.config.getString("defaultsave.directory")+"powder.xml"
-
+
#load some file
ws=Load("CNCS_7860")
-
+
#generate the files
GenerateGroupingPowder(ws,10,outputFilename)
-
+
#check that it works
import os.path
if(os.path.isfile(outputFilename)):
@@ -52,12 +52,12 @@ Usage
DeleteWorkspace(ws)
DeleteWorkspace(wsg)
- import os,mantid
+ import os,mantid
filename=mantid.config.getString("defaultsave.directory")+"powder.xml"
os.remove(filename)
filename=mantid.config.getString("defaultsave.directory")+"powder.par"
os.remove(filename)
-
+
Output:
.. testoutput:: GenerateGroupingPowder
@@ -70,7 +70,7 @@ If one would use LoadDetectorsGroupingFile on powder.xml one would get a workspa
.. figure:: /images/GenerateGroupingPowder.png
:alt: GenerateGroupingPowder.png
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/GenerateGroupingSNSInelastic-v1.rst b/docs/source/algorithms/GenerateGroupingSNSInelastic-v1.rst
index 9247cc1f73f6e535422e685ec37063c0abd9c35f..64803cef48f18e87977f19b71c195633f510b21c 100644
--- a/docs/source/algorithms/GenerateGroupingSNSInelastic-v1.rst
+++ b/docs/source/algorithms/GenerateGroupingSNSInelastic-v1.rst
@@ -11,9 +11,9 @@ Description
Generate grouping files for ARCS, CNCS, HYSPEC, and SEQUOIA, by grouping
py pixels along a tube and px tubes. py is 1, 2, 4, 8, 16, 32, 64, or
-128. px is 1, 2, 4, or 8.
+128. px is 1, 2, 4, or 8.
-.. Note ::
+.. Note ::
All parameters are strings. Using integers for AlongTubes or AcrossTubes will cause errors
@@ -28,12 +28,12 @@ Usage
import mantid
outputFilename=mantid.config.getString("defaultsave.directory")+"cncs.xml"
GenerateGroupingSNSInelastic(outputFilename,AlongTubes="16",AcrossTubes="4",Instrument="CNCS")
-
+
#check that it works
import os.path
if(os.path.isfile(outputFilename)):
print("Found file cncs.xml")
-
+
ws=Load("CNCS_7860")
wsg=GroupDetectors(ws,outputFilename)
print("The grouped workspace has {} histograms".format(wsg.getNumberHistograms()))
@@ -42,7 +42,7 @@ Usage
DeleteWorkspace(ws)
DeleteWorkspace(wsg)
- import os,mantid
+ import os,mantid
filename=mantid.config.getString("defaultsave.directory")+"cncs.xml"
os.remove(filename)
@@ -57,7 +57,7 @@ If one would use LoadDetectorsGroupingFile on cncs.xml one would get a workspace
.. figure:: /images/GenerateGroupingSNSInelastic.png
:alt: GenerateGroupingSNSInelastic.png
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/GenerateIPythonNotebook-v1.rst b/docs/source/algorithms/GenerateIPythonNotebook-v1.rst
index fe434664c108c08d82ebbe1257404dd31aba4a65..16e3dfa9146181b7dc8b5ba3b5f63a6fe5974205 100644
--- a/docs/source/algorithms/GenerateIPythonNotebook-v1.rst
+++ b/docs/source/algorithms/GenerateIPythonNotebook-v1.rst
@@ -23,7 +23,7 @@ for example 3:25 PM on July the 4th 2014 would be 2014-07-04 15:25:00.
Usage
-----
-.. The examples for this algorithm do not show output as the output
+.. The examples for this algorithm do not show output as the output
is a large quantity of JSON. The algorithm is tested by unit tests.
**Example - generate an IPython notebook for a workspace:**
@@ -66,7 +66,7 @@ Usage
.. code-block:: python
import os
-
+
#create a workspace and run some operations on it
ws = CreateSampleWorkspace()
ws = CropWorkspace(ws, XMin=7828.162291, XMax=11980.906921)
diff --git a/docs/source/algorithms/GeneratePythonScript-v1.rst b/docs/source/algorithms/GeneratePythonScript-v1.rst
index a447ce8dc67417d449a630be34e3dc345ed78894..39a79d98aa9a16c58840a64231c035d9115aab05 100644
--- a/docs/source/algorithms/GeneratePythonScript-v1.rst
+++ b/docs/source/algorithms/GeneratePythonScript-v1.rst
@@ -46,14 +46,14 @@ Output:
# SHA-1 ...
from mantid.simpleapi import *
-
+
CreateSampleWorkspace(OutputWorkspace='ws')
CropWorkspace(InputWorkspace='ws', OutputWorkspace='ws', XMin=7828.1622909999996, XMax=11980.906921)
Power(InputWorkspace='ws', OutputWorkspace='ws', Exponent=1.5)
RenameWorkspace(InputWorkspace='ws', OutputWorkspace='MyTestWorkspace')
.. testcleanup:: ExGeneratePythonScriptSimple
-
+
import os
def removeFiles(files):
for ws in files:
@@ -102,7 +102,7 @@ Output:
RenameWorkspace(InputWorkspace='ws', OutputWorkspace='MyTestWorkspace')
.. testcleanup:: ExGeneratePythonScriptWithTimeRanges
-
+
import os
def removeFiles(files):
for ws in files:
@@ -120,7 +120,7 @@ Output:
.. testcode:: ExGeneratePythonScriptFile
import os
-
+
#create a workspace and run some operations on it
ws = CreateSampleWorkspace()
ws = CropWorkspace(ws, XMin=7828.162291, XMax=11980.906921)
@@ -141,7 +141,7 @@ Output:
# Python script generated by Mantid
# Version ...
# SHA-1 ...
-
+
from mantid.simpleapi import *
CreateSampleWorkspace(OutputWorkspace='ws')
@@ -150,7 +150,7 @@ Output:
RenameWorkspace(InputWorkspace='ws', OutputWorkspace='MyTestWorkspace')
.. testcleanup:: ExGeneratePythonScriptFile
-
+
import os
def removeFiles(files):
for ws in files:
diff --git a/docs/source/algorithms/GetAllEi-v1.rst b/docs/source/algorithms/GetAllEi-v1.rst
index b5585acaaea5895352c2cd63becf03da933b5a78..a8e473c457754e5cdeb5a8d6fc95ddc9e375f061 100644
--- a/docs/source/algorithms/GetAllEi-v1.rst
+++ b/docs/source/algorithms/GetAllEi-v1.rst
@@ -16,18 +16,18 @@ These estimates can be used as guess value for :ref:`algm-GetEi` algorithm or a
Algorithm performs number of steps to identify the values requested:
#. It takes appropriate log names from instrument definition file (IDF), namely chopper-position component and calculates last chopper speed and delay as average
- of the filtered log values. Guess chopper opening times are calculated from chopper speed and delay time. The "chopper-position" component with appropriate properties
+ of the filtered log values. Guess chopper opening times are calculated from chopper speed and delay time. The "chopper-position" component with appropriate properties
has to be present in IDF for this algorithm to work. See ISIS MARI or MAPS instrument definition files for example of "chopper-position" component.
-#. Algorithm uses estimate for the minimal energy resolution of an instrument and searches for real peaks around guess values obtained
+#. Algorithm uses estimate for the minimal energy resolution of an instrument and searches for real peaks around guess values obtained
earlier within 4 sigma of this resolution interval.
-#. If peaks are found, the algorithm performs running averages over signal in the appropriate time interval until first derivative
- of the signal has only one zero. The position of this zero is returned as the guess energy and the distance between closest to
- the guess energy zeros of the second derivative are returned as the guess values for the peak width. The peak amplitude
+#. If peaks are found, the algorithm performs running averages over signal in the appropriate time interval until first derivative
+ of the signal has only one zero. The position of this zero is returned as the guess energy and the distance between closest to
+ the guess energy zeros of the second derivative are returned as the guess values for the peak width. The peak amplitude
is estimated from the total intensity of the signal within the search interval, assuming that the peak shape is Gaussian.
-#. Similar procedure is performed for second monitor. The peak is accepted only if the peak width lies between the minimal and maximal instrument resolution values
+#. Similar procedure is performed for second monitor. The peak is accepted only if the peak width lies between the minimal and maximal instrument resolution values
and the distance between peaks positions on two monitors (on energy scale) is smaller then two sigma.
Algorithm returns matrix workspace containing single spectrum, with x-values representing peak positions, y-values: peak heights and the error: peak width. X-values are
@@ -35,8 +35,8 @@ sorted according to energy in peaks (peaks with maximal energy are returned firs
Used Subalgorithms
------------------
-The algorithm uses :ref:`Unit Factory <Unit Factory>` and :ref:`algm-ConvertUnits` algorithm
-to convert units from TOF to energy.
+The algorithm uses :ref:`Unit Factory <Unit Factory>` and :ref:`algm-ConvertUnits` algorithm
+to convert units from TOF to energy.
**Example: Find all incident energies for test workspace**
@@ -44,14 +44,14 @@ to convert units from TOF to energy.
.. testcode:: foundAllEi
# BUILD SAMPLE WORKSPACE
- # Build sample workspace with chopper and in energy units to
+ # Build sample workspace with chopper and in energy units to
# have defined peaks in defined energy positions
wsEn=CreateSampleWorkspace(Function='Multiple Peaks', NumBanks=1, BankPixelWidth=2, NumEvents=10000, XUnit='Energy', XMin=10, XMax=200, BinWidth=0.1)
# convert units to TOF to simulate real workspace obtained from experiment
ws = ConvertUnits(InputWorkspace=wsEn, Target='TOF')
# find chopper log values would be present in real workspace
l_chop = 7.5 # chopper position build into test workspace
- l_mon1 = 15. # monitor 1 position (detector 1), build into test workspace
+ l_mon1 = 15. # monitor 1 position (detector 1), build into test workspace
t_mon1 = 3100. # the time of flight defined by incident energy of the peak generated by CreateSampelpWorkspace algorithm.
t_chop = (l_chop/l_mon1)*t_mon1
# Add these log values to simulated workspace to represent real sample logs
@@ -78,9 +78,9 @@ to convert units from TOF to energy.
for ind,val in enumerate(resEi):
print("! {0: >6.1f} ! {1: >6.2f} ! {2: >6.2f} ! {3: >6.2f} !".format(allEi[ind],val[1],peakHeight[ind],peakWidth[ind]))
#
- # NOTE: incident energy of GetEi is calculated from distance between monitor 1 and 2, and this distance is not correct in
+ # NOTE: incident energy of GetEi is calculated from distance between monitor 1 and 2, and this distance is not correct in
# the test workspace. The tested point is that getEi can find energies from guess values and TOF for peaks is correct.
-
+
Output:
.. testoutput:: foundAllEi
@@ -89,7 +89,7 @@ Output:
! Guess Ei ! peak TOF ! peak height ! peak width !
! 67.0 ! 4188.03 ! 34.68 ! 2.35 !
! 124.1 ! 3079.09 ! 14.01 ! 4.35 !
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/GetDetOffsetsMultiPeaks-v1.rst b/docs/source/algorithms/GetDetOffsetsMultiPeaks-v1.rst
index 60b3ad41361715522918994f589011e2be934f9d..ca5ee62d2f92eefc943ba4b1cf0793d062c9be63 100644
--- a/docs/source/algorithms/GetDetOffsetsMultiPeaks-v1.rst
+++ b/docs/source/algorithms/GetDetOffsetsMultiPeaks-v1.rst
@@ -50,14 +50,14 @@ A peak will not be used if
- its :math:`\chi^2` of peak fitting is larger than pre-defined maximum
value;
- its height is lower than pre-defined lowest peak height;
-- its observed maximum value corrected by background is smaller than user specified value;
+- its observed maximum value corrected by background is smaller than user specified value;
- its signal/noise ratio is less than 5
:math:`H\cdot FWHM\_To\_SIGMA/width < 5`;
- its height is not outside of error bars of background
:math:`H < \sqrt{H + B}/2`;
- its z-value on :math:`\frac{\delta d}{d}` is larger than 2.0;
-- its offset from theoretical position exceeds the limitation specified by user;
-- its resolution (:math:`\Delta(d)/d`) is out of user-specified range.
+- its offset from theoretical position exceeds the limitation specified by user;
+- its resolution (:math:`\Delta(d)/d`) is out of user-specified range.
Generate fit window
###################
@@ -198,9 +198,9 @@ Spectra to be masked
--------------------
A MaskWorskpace is output from the algorithm. Along with it, a TableWorkspace is output
-to describe the status of offset calculation.
+to describe the status of offset calculation.
-Here are the cases that a spectra (i.e., a detector) will be masked in the output MaskWorkspace.
+Here are the cases that a spectra (i.e., a detector) will be masked in the output MaskWorkspace.
- An empty spectrum (i.e., the corresponding EventList is empty). It is noted as "empty det";
diff --git a/docs/source/algorithms/GetEi-v2.rst b/docs/source/algorithms/GetEi-v2.rst
index f18f493f4797b3fb3cfb1c1da1f36741f2c6f160..fc4cdeee1cb8a4f799a9fce9fdb5431fc0b21cad 100644
--- a/docs/source/algorithms/GetEi-v2.rst
+++ b/docs/source/algorithms/GetEi-v2.rst
@@ -59,7 +59,7 @@ Usage
**Example: Fixing the Ei**
.. testcode:: fixEi
-
+
ws = CreateSampleWorkspace(bankPixelWidth=1,binWidth=10)
(ei, firstMonitorPeak, FirstMonitorIndex, tzero) = GetEi(ws,Monitor1Spec=1,Monitor2Spec=2,EnergyEstimate=15.0,FixEi=True)
diff --git a/docs/source/algorithms/GetEiMonDet-v3.rst b/docs/source/algorithms/GetEiMonDet-v3.rst
index e22a91b865934cc52a56a15b8d68b96d5f231340..4dbae7c1bcc9c738fd05eed28397be12ee0d6e14 100644
--- a/docs/source/algorithms/GetEiMonDet-v3.rst
+++ b/docs/source/algorithms/GetEiMonDet-v3.rst
@@ -13,7 +13,7 @@ This algorithm calculates the incident energy from the time-of-flight between on
If the monitor peak has been previously fitted using :ref:`FindEPP <algm-FindEPP>`, one fitting step can be omitted by supplying the EPP table via ``MonitorEPPWorkspace``.
-If no *MonitorWorkspace* is specified, the monitor spectrum is expected to be in the detector workspace. *DetectorWorkspaceIndexSet* understands complex expression, for example ``2,3,5-7,101`` would use detectors 2, 3, 5, 6, 7, and 101 for the computation.
+If no *MonitorWorkspace* is specified, the monitor spectrum is expected to be in the detector workspace. *DetectorWorkspaceIndexSet* understands complex expression, for example ``2,3,5-7,101`` would use detectors 2, 3, 5, 6, 7, and 101 for the computation.
Usage
-----
@@ -50,7 +50,7 @@ Output:
import numpy
from scipy.constants import elementary_charge, neutron_mass
-
+
spectrum = 'name = Gaussian, PeakCentre = 1000.0, Height = 500.0, Sigma = 30.0'
ws = CreateSampleWorkspace(WorkspaceType='Histogram', XUnit='TOF',
XMin=100.0, XMax=1100.0, BinWidth=10.0,
@@ -64,7 +64,7 @@ Output:
monitorEPPs = FindEPP('monitors')
calibratedE_i = GetEiMonDet(DetectorWorkspace='detectors',
DetectorWorkspaceIndexSet="0-99", MonitorWorkspace='monitors', MonitorEPPTable=monitorEPPs, MonitorIndex=0)
-
+
print('Calibrated energy: {0:.3f}'.format(calibratedE_i))
Output:
diff --git a/docs/source/algorithms/GetEiT0atSNS-v1.rst b/docs/source/algorithms/GetEiT0atSNS-v1.rst
index 1d24e66455a54b453a5c833bb65d69543d122120..9ec8128178abf63f2d99c90f2774c4b0404af76b 100644
--- a/docs/source/algorithms/GetEiT0atSNS-v1.rst
+++ b/docs/source/algorithms/GetEiT0atSNS-v1.rst
@@ -18,21 +18,21 @@ following:
will be ignored
- when vChTrans is 2, on ARCS and SEQUOIA there is no chopper in the
beam (white beam). Will return not a number for both Ei and T0
-
+
The algorithm is doing the following:
- Check which spectra corresponds to a physical monitor (as per instrument definition file)
- Change the time of flight in the monitor spectra to the correct frame
- Rebins the monitor workspace with a step of 1 microsecond
- Uses :ref:`GetEi <algm-GetEi>` to calculate incident energy and T0
-
+
Usage
-----
.. include:: ../usagedata-note.txt
.. testcode:: GetEiT0atSNS
-
+
w=Load('ADARAMonitors.nxs')
run=w.getRun()
from mantid.kernel import DateAndTime
@@ -43,8 +43,8 @@ Usage
LoadInstrument(Workspace=w,InstrumentName='SEQUOIA',RewriteSpectraMap=False)
AddSampleLog(Workspace=w,LogName='vChTrans',LogText='1',LogType='Number Series')
AddSampleLog(Workspace=w,LogName='EnergyRequest',LogText='20',LogType='Number Series')
- res=GetEiT0atSNS(w)
-
+ res=GetEiT0atSNS(w)
+
print("Incident energy: {:2.2f} meV".format(res[0]))
print("T0: {:2.2f} microseconds".format(res[1]))
@@ -57,7 +57,7 @@ Usage
Output:
.. testoutput:: GetEiT0atSNS
-
+
Incident energy: 20.09 meV
T0: 30.42 microseconds
diff --git a/docs/source/algorithms/GetSpiceDataRawCountsFromMD-v1.rst b/docs/source/algorithms/GetSpiceDataRawCountsFromMD-v1.rst
index b9f6afae76083fcc16702d32a75840620e9443d2..d136cae63e9840876075881f88b6c4bb68b67af1 100644
--- a/docs/source/algorithms/GetSpiceDataRawCountsFromMD-v1.rst
+++ b/docs/source/algorithms/GetSpiceDataRawCountsFromMD-v1.rst
@@ -10,59 +10,59 @@ Description
-----------
This algorithm is to export raw experimental data from MDEventWorkspaces,
-to which a SPICE data file is loaded.
+to which a SPICE data file is loaded.
It provides 3 modes, *Pt.*, *Detector* and *Sample Log* for various types
-of experimental data to export.
+of experimental data to export.
Limitation
##########
-This algorithm fully supports the SPICE data of powder diffractometers.
-Some features may not work with other SPICE data.
+This algorithm fully supports the SPICE data of powder diffractometers.
+Some features may not work with other SPICE data.
Inputs
######
-Two input MDEventWorkspaces that are required.
+Two input MDEventWorkspaces that are required.
-**InputWorkspace** is an MDEventWorkspace that stores detectors counts and sample logs.
-Each run in this MDEventWorkspace corresponds to an individual measurement point in experiment run.
-Each run has its own instrument object.
+**InputWorkspace** is an MDEventWorkspace that stores detectors counts and sample logs.
+Each run in this MDEventWorkspace corresponds to an individual measurement point in experiment run.
+Each run has its own instrument object.
-The other input MDEventWorkspace, i.e., **MonitorWorkspace** contains the monitor counts of each measurement point.
+The other input MDEventWorkspace, i.e., **MonitorWorkspace** contains the monitor counts of each measurement point.
The signal value of each MDEvent in this workspace is the monitor counts
-corresponding to an individual detector.
+corresponding to an individual detector.
-These two MDEventWorkspace should have the same number of runs and same number of MDEvent.
+These two MDEventWorkspace should have the same number of runs and same number of MDEvent.
Outputs
#######
-One single-spectrum MatrixWorkspace is the output of this algorithm.
+One single-spectrum MatrixWorkspace is the output of this algorithm.
Mode *Pt.*
++++++++++
The x-values are the :math:`2\theta` positions of all detectors in a specific experiment measuring point (i.e., *Pt.* and
-run number).
+run number).
The y-values are the raw counts or normalized intensities (by monitor counts)
of all those detectors of the same *Pt.*.
Mode *Detector*
+++++++++++++++
-The x-values can be either :math:`2\theta` positions of all detectors or any sample log's values for all experiment measuring
-points (i.e., *Pt.*).
-The y-values are the raw counts or normalized intensities of a specified detector among all *Pt.*.
+The x-values can be either :math:`2\theta` positions of all detectors or any sample log's values for all experiment measuring
+points (i.e., *Pt.*).
+The y-values are the raw counts or normalized intensities of a specified detector among all *Pt.*.
Mode *Sample Log*
+++++++++++++++++
The x-values can be any sample log's values of all experiment measuring points (i.e., *Pt.*).
-The y-values are the values of a specified sample log among all *Pt.*.
+The y-values are the values of a specified sample log among all *Pt.*.
Usage
@@ -73,25 +73,25 @@ Usage
.. testcode:: ExLoadHB2ADataToMD
# create table workspace and parent log workspace
- LoadSpiceAscii(Filename='HB2A_exp0231_scan0001.dat',
+ LoadSpiceAscii(Filename='HB2A_exp0231_scan0001.dat',
IntegerSampleLogNames="Sum of Counts, scan, mode, experiment_number",
- FloatSampleLogNames="samplemosaic, preset_value, Full Width Half-Maximum, Center of Mass",
- DateAndTimeLog='date,MM/DD/YYYY,time,HH:MM:SS AM',
- OutputWorkspace='Exp0231DataTable',
+ FloatSampleLogNames="samplemosaic, preset_value, Full Width Half-Maximum, Center of Mass",
+ DateAndTimeLog='date,MM/DD/YYYY,time,HH:MM:SS AM',
+ OutputWorkspace='Exp0231DataTable',
RunInfoWorkspace='Exp0231ParentWS')
- # load for HB2A
- ConvertSpiceDataToRealSpace(InputWorkspace='Exp0231DataTable',
- RunInfoWorkspace='Exp0231ParentWS',
- OutputWorkspace='Exp0231DataMD',
+ # load for HB2A
+ ConvertSpiceDataToRealSpace(InputWorkspace='Exp0231DataTable',
+ RunInfoWorkspace='Exp0231ParentWS',
+ OutputWorkspace='Exp0231DataMD',
OutputMonitorWorkspace='Exp0231MonitorMD')
# Get raw counts of DetID = 20 out
- ws = GetSpiceDataRawCountsFromMD(InputWorkspace='Exp0231DataMD',
- MonitorWorkspace='Exp0231MonitorMD',
+ ws = GetSpiceDataRawCountsFromMD(InputWorkspace='Exp0231DataMD',
+ MonitorWorkspace='Exp0231MonitorMD',
OutputWorkspace='Det20Counts', DetectorID=20)
-
+
# output
for i in [3, 9, 44, 60]:
print("X[{}] = {:.5f}, Y[{}] = {:.5f}".format(i, ws.readX(0)[i], i, ws.readY(0)[i]))
@@ -113,7 +113,7 @@ Output:
X[9] = 58.13600, Y[9] = 0.00354
X[44] = 61.63600, Y[44] = 0.00315
X[60] = 63.23600, Y[60] = 0.00325
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/GetTimeSeriesLogInformation-v1.rst b/docs/source/algorithms/GetTimeSeriesLogInformation-v1.rst
index bd1c6e92217cb9f70c199ff4fc3c2ad51a08af46..8d390ae1ed82ad6e0a10ff7a813e13e6203d0bd8 100644
--- a/docs/source/algorithms/GetTimeSeriesLogInformation-v1.rst
+++ b/docs/source/algorithms/GetTimeSeriesLogInformation-v1.rst
@@ -36,7 +36,7 @@ Output:
Max(dT) 53.984
Min(dT) 29.953
Sigma(dt) 10.543
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/GoniometerAnglesFromPhiRotation-v1.rst b/docs/source/algorithms/GoniometerAnglesFromPhiRotation-v1.rst
index c13a7586e6cb430b0e92ad1b968444e94807b9f3..688565d6ac328705848a81b3302263356aabccf3 100644
--- a/docs/source/algorithms/GoniometerAnglesFromPhiRotation-v1.rst
+++ b/docs/source/algorithms/GoniometerAnglesFromPhiRotation-v1.rst
@@ -22,9 +22,9 @@ Usage
.. include:: ../usagedata-note.txt
-.. testcode:: exGoniometerAnglesFromPhiRotation
+.. testcode:: exGoniometerAnglesFromPhiRotation
- # Load Peaks found in SXD23767.raw
+ # Load Peaks found in SXD23767.raw
ws1 =Load(Filename='SXD23767.peaks')
ws2 = ws1.clone()
@@ -32,7 +32,7 @@ Usage
ublist = [-0.06452276, 0.2478114, -0.23742194, 0.29161678, -0.00914316, -0.12523779, 0.06958942, -0.1802702, -0.14649001]
SetUB(Workspace=ws1,UB=ublist)
- # Run Algorithm
+ # Run Algorithm
result = GoniometerAnglesFromPhiRotation(ws1,ws2,Tolerance=0.5,MIND=0,MAXD=2)
print("Chi: {:.1f}, Omega: {:.1f}, Indexed: {}, AvErrIndex: {:.2f} AvErrAll: {:.2f}".format(*result))
diff --git a/docs/source/algorithms/GroupDetectors-v1.rst b/docs/source/algorithms/GroupDetectors-v1.rst
index a9abcab27904a56dbb8e46caf7c5f3c87c9f265a..95c12c0c785c3671bbcc0770473a5e374827f36b 100644
--- a/docs/source/algorithms/GroupDetectors-v1.rst
+++ b/docs/source/algorithms/GroupDetectors-v1.rst
@@ -79,12 +79,12 @@ In addition the following XML grouping format is also supported
.. code-block:: xml
<?xml version="1.0" encoding="UTF-8" ?>
- <detector-grouping>
- <group name="fwd1"> <ids val="1-32"/> </group>
- <group name="bwd1"> <ids val="33,36,38,60-64"/> </group>
+ <detector-grouping>
+ <group name="fwd1"> <ids val="1-32"/> </group>
+ <group name="bwd1"> <ids val="33,36,38,60-64"/> </group>
- <group name="fwd2"><detids val="1,2,17,32"/></group>
- <group name="bwd2"><detids val="33,36,38,60,64"/> </group>
+ <group name="fwd2"><detids val="1,2,17,32"/></group>
+ <group name="bwd2"><detids val="33,36,38,60,64"/> </group>
</detector-grouping>
where is used to specify spectra IDs and detector IDs.
diff --git a/docs/source/algorithms/GroupDetectors-v2.rst b/docs/source/algorithms/GroupDetectors-v2.rst
index 64303c1ce87c79458597136f28569d5a6fa0367a..155b6e4063b57ef143ce937e5dbebac90f1c01be 100644
--- a/docs/source/algorithms/GroupDetectors-v2.rst
+++ b/docs/source/algorithms/GroupDetectors-v2.rst
@@ -34,15 +34,15 @@ An input file allows the specification of many groups. The file has the
following format::
[number of groups in file]
-
+
[first group's number]
[number of spectra in first group]
[spectrum 1] [spectrum 2] [spectrum 3] [...] [spectrum n]
-
+
[second group's number]
[number of spectra in second group]
[spectrum 1] [spectrum 2] [spectrum 3] [...] [spectrum n]
-
+
[repeat as necessary]
Mantid will still work if the number of groups specified at the start is
@@ -82,12 +82,12 @@ In addition the following XML grouping format is also supported
.. code-block:: xml
<?xml version="1.0" encoding="UTF-8" ?>
- <detector-grouping>
- <group name="fwd1"> <ids val="1-32"/> </group>
- <group name="bwd1"> <ids val="33,36,38,60-64"/> </group>
+ <detector-grouping>
+ <group name="fwd1"> <ids val="1-32"/> </group>
+ <group name="bwd1"> <ids val="33,36,38,60-64"/> </group>
- <group name="fwd2"><detids val="1,2,17,32"/></group>
- <group name="bwd2"><detids val="33,36,38,60,64"/> </group>
+ <group name="fwd2"><detids val="1,2,17,32"/></group>
+ <group name="bwd2"><detids val="33,36,38,60,64"/> </group>
</detector-grouping>
where is used to specify spectra IDs and detector IDs.
@@ -394,9 +394,9 @@ Output
# create spectra with signal equal to spectra number
yy=[]
for i in range(1,11):
- yy=yy+[i for _ in range(10)]
-
- ws=CreateWorkspace(DataX=xx,DataY=yy,NSpec=10);
+ yy=yy+[i for _ in range(10)]
+
+ ws=CreateWorkspace(DataX=xx,DataY=yy,NSpec=10);
# Group detectors
wsg0 = GroupDetectors(ws,SpectraList=[1,2,3],KeepUngroupedSpectra=True,Behaviour='Sum')
print("Grouped first 3 spectra results in workspace with {0} spectra and the grouped spectra is spectrum 0:".format(wsg0.getNumberHistograms()))
@@ -404,17 +404,17 @@ Output
print("First unaffected spectrum is now spectrum 1, former spectrum 4:")
print(wsg0.dataY(1) )
print("*********************************************************")
-
- # Group detectors differently
+
+ # Group detectors differently
wsg1 = GroupDetectors(ws,SpectraList=[2,3,4],KeepUngroupedSpectra=True,Behaviour='Sum')
print("Grouped 3 spectra starting with second results in workspace with {0} spectra and the grouped spectra is spectrum 0:".format(wsg1.getNumberHistograms()))
print(wsg1.dataY(0))
print("First unaffected spectrum is now spectrum 1, former spectrum 0:")
print(wsg1.dataY(1))
print("*********************************************************")
-
+
# Group detectors in a chain:
- wsg2 = GroupDetectors(wsg0,SpectraList=[4,5,6],KeepUngroupedSpectra=True,Behaviour='Sum')
+ wsg2 = GroupDetectors(wsg0,SpectraList=[4,5,6],KeepUngroupedSpectra=True,Behaviour='Sum')
print("Grouped 6 spectra 3x3 twice results in workspace with {0} spectra and the grouped spectra is spectrum 0 and 1:".format(wsg2.getNumberHistograms()))
print(wsg2.dataY(0))
print(wsg2.dataY(1))
@@ -430,7 +430,7 @@ Output:
[ 6. 6. 6. 6. 6. 6. 6. 6. 6. 6.]
First unaffected spectrum is now spectrum 1, former spectrum 4:
[ 4. 4. 4. 4. 4. 4. 4. 4. 4. 4.]
- *********************************************************
+ *********************************************************
Grouped 3 spectra starting with second results in workspace with 8 spectra and the grouped spectra is spectrum 0:
[ 9. 9. 9. 9. 9. 9. 9. 9. 9. 9.]
First unaffected spectrum is now spectrum 1, former spectrum 0:
@@ -444,7 +444,7 @@ Output:
*********************************************************
**Example 7: Group detectors using map file:**
-
+
.. testcode:: ExGroupDetectorsWithMap
import os
@@ -453,37 +453,37 @@ Output:
# create spectra with signal equal to spectra number
yy=[]
for i in range(1,11):
- yy=yy+[i for _ in range(10)]
-
- ws=CreateWorkspace(DataX=xx,DataY=yy,NSpec=10);
-
+ yy=yy+[i for _ in range(10)]
+
+ ws=CreateWorkspace(DataX=xx,DataY=yy,NSpec=10);
+
# Create map file
- file_name = os.path.join(config["defaultsave.directory"], "TestMapFile.map")
+ file_name = os.path.join(config["defaultsave.directory"], "TestMapFile.map")
f=open(file_name,'w');
f.write('4\n'); # header, four groups
f.write('1\n3\n'); # header group 1
- f.write('1 2 3\n'); # group 1
- f.write('2\n3\n'); # header group 2
+ f.write('1 2 3\n'); # group 1
+ f.write('2\n3\n'); # header group 2
f.write('4 5 6\n'); # group 2
f.write('3\n2\n'); # header group 3
f.write('7 8\n'); # group 3
f.write('4\n2\n'); # header group 4
f.write('9 10\n'); # group 4
f.close()
-
+
# Group detectors
wsg = GroupDetectors(ws,MapFile=file_name,KeepUngroupedSpectra=True,Behaviour='Sum')
-
+
print("Grouped workspace has {0} spectra".format(wsg.getNumberHistograms()))
print("spectrum 1 (sum of spectra 1-3): {}".format(wsg.dataY(0)))
print("spectrum 2 (sum of spectra 4-6): {}".format(wsg.dataY(1)))
- print("spectrum 3 (sum of spectra 7-8): {}".format(wsg.dataY(2)))
+ print("spectrum 3 (sum of spectra 7-8): {}".format(wsg.dataY(2)))
print("spectrum 4 (sum of spectra 9-10): {}".format(wsg.dataY(3)))
-
+
.. testcleanup:: ExGroupDetectorsWithMap
- os.remove(file_name)
-
+ os.remove(file_name)
+
Output:
.. testoutput:: ExGroupDetectorsWithMap
diff --git a/docs/source/algorithms/HB2AReduce-v1.rst b/docs/source/algorithms/HB2AReduce-v1.rst
index 1fbfe86985b56a5b535f723eed59f4849b99da62..8f44c67e4700540a168efd75a23cb70ea1380bf2 100644
--- a/docs/source/algorithms/HB2AReduce-v1.rst
+++ b/docs/source/algorithms/HB2AReduce-v1.rst
@@ -69,7 +69,7 @@ The output workspace can be saved to ``XYE``, ``Maud`` and ``TOPAS`` format usin
You can also save the reduced data as ``GSAS`` or ``XYE`` format by adding additional arguments to the reduction call
.. code-block:: python
-
+
ws = HB2AReduce(
'/HFIR/HB2A/IPTS-21073/exp666/Datafiles/HB2A_exp0666_scan0024.dat',
SaveData=True,
diff --git a/docs/source/algorithms/HFIRDarkCurrentSubtraction-v1.rst b/docs/source/algorithms/HFIRDarkCurrentSubtraction-v1.rst
index cb4a74af464ef18d737c31e87084071e68627f72..098d149082056a8830d70c27c97b7060a7402910 100644
--- a/docs/source/algorithms/HFIRDarkCurrentSubtraction-v1.rst
+++ b/docs/source/algorithms/HFIRDarkCurrentSubtraction-v1.rst
@@ -9,8 +9,8 @@
Description
-----------
-Subtract the dark current from a HFIR SANS data set.
-This algorithm is rarely called directly. It is called by
+Subtract the dark current from a HFIR SANS data set.
+This algorithm is rarely called directly. It is called by
:ref:`HFIRSANSReduction <algm-HFIRSANSReduction>`.
diff --git a/docs/source/algorithms/HFIRLoad-v1.rst b/docs/source/algorithms/HFIRLoad-v1.rst
index ed9733f4b43df287070828118adffd384656fad9..c9c4d2714d975ef8162a1080f12552072ccad6d7 100644
--- a/docs/source/algorithms/HFIRLoad-v1.rst
+++ b/docs/source/algorithms/HFIRLoad-v1.rst
@@ -9,8 +9,8 @@
Description
-----------
-Workflow algorithm that loads HFIR SANS data using the
-:ref:`LoadSpice2D <algm-LoadSpice2D>`
+Workflow algorithm that loads HFIR SANS data using the
+:ref:`LoadSpice2D <algm-LoadSpice2D>`
algorithm and applies basic corrections to the workspace. Those include:
- Moving the detector at its proper position in Z.
@@ -24,7 +24,7 @@ algorithm and applies basic corrections to the workspace. Those include:
- Compute the beam diameter according to the distances and apertures, and store it in the logs:
:math:`D_{beam} = (A_{source}+A_{sample})\frac{SDD}{SSD} + A_{sample}`
-This algorithm is rarely called directly. It is called by
+This algorithm is rarely called directly. It is called by
:ref:`HFIRSANSReduction <algm-HFIRSANSReduction>`, which will
pass along the relevant beam center information through the *ReductionProperties* property.
@@ -41,14 +41,14 @@ Usage
workspace = HFIRLoad('BioSANS_empty_cell.xml')
r= mtd['workspace'].run()
print('SDD = {:4.0f}'.format(r.getProperty('sample-detector-distance').value))
-
+
Output:
.. testoutput:: ExHfirLoad
SDD = 6000
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/HFIRSANSReduction-v1.rst b/docs/source/algorithms/HFIRSANSReduction-v1.rst
index 1e332d172849de8b3879482a9066462317b05bd6..9db3f9e542ed7590fac926be165655b60a030976 100644
--- a/docs/source/algorithms/HFIRSANSReduction-v1.rst
+++ b/docs/source/algorithms/HFIRSANSReduction-v1.rst
@@ -9,7 +9,7 @@
Description
-----------
-Executes the HFIR SANS reduction workflow according to the options set by
+Executes the HFIR SANS reduction workflow according to the options set by
:ref:`SetupHFIRReduction <algm-SetupHFIRReduction>`.
Those options are saved in a PropertyManager object that is passed through *ReductionProperties*.
@@ -17,7 +17,7 @@ The workflow proceeds as follows:
1. Execute the beam finder algorithm. Usually :ref:`SANSBeamFinder <algm-SANSBeamFinder>`.
-2. Load the data to be reduced, usually with :ref:`HFIRLoad <algm-HFIRLoad>`,
+2. Load the data to be reduced, usually with :ref:`HFIRLoad <algm-HFIRLoad>`,
which will move the detector to the right position.
3. Subtract the dark current, usually with :ref:`HFIRDarkCurrentSubtraction <algm-HFIRDarkCurrentSubtraction>`.
@@ -28,21 +28,21 @@ The workflow proceeds as follows:
6. Apply the solid angle correction, usually with :ref:`SANSSolidAngleCorrection <algm-SANSSolidAngleCorrection>`.
-7. Apply the sensitivity correction, usually with :ref:`SANSSensitivityCorrection <algm-SANSSensitivityCorrection>`.
+7. Apply the sensitivity correction, usually with :ref:`SANSSensitivityCorrection <algm-SANSSensitivityCorrection>`.
When applicable, a separate beam center position can be determined for the sensitivity data.
-
-8. Compute and apply the transmission correction, usually with :ref:`SANSDirectBeamTransmission <algm-SANSDirectBeamTransmission>`.
+
+8. Compute and apply the transmission correction, usually with :ref:`SANSDirectBeamTransmission <algm-SANSDirectBeamTransmission>`.
When applicable, a separate beam center position can be determined for the transmission data.
9. Repeat steps 2 to 8 for the background run, then subtract the background from the sample data.
-10. Perform the absolute scaling, usually with :ref:`SANSAbsoluteScale <algm-SANSAbsoluteScale>`.
+10. Perform the absolute scaling, usually with :ref:`SANSAbsoluteScale <algm-SANSAbsoluteScale>`.
-11. Perform any geometrical correction, which is usually a call to :ref:`NormaliseByThickness <algm-NormaliseByThickness>`.
+11. Perform any geometrical correction, which is usually a call to :ref:`NormaliseByThickness <algm-NormaliseByThickness>`.
-12. Perform the I(Q) calculation with :ref:`SANSAzimuthalAverage1D <algm-SANSAzimuthalAverage1D>`.
+12. Perform the I(Q) calculation with :ref:`SANSAzimuthalAverage1D <algm-SANSAzimuthalAverage1D>`.
-13. Perform the I(Qx,Qy) calculation with :ref:`EQSANSQ2D <algm-EQSANSQ2D>`
+13. Perform the I(Qx,Qy) calculation with :ref:`EQSANSQ2D <algm-EQSANSQ2D>`
(This is not a typo. This algorithm is used for both HFIR SANS and EQSANS).
14. Save the I(Q) output using :ref:`SaveAscii <algm-SaveAscii>`
diff --git a/docs/source/algorithms/HRPDSlabCanAbsorption-v1.rst b/docs/source/algorithms/HRPDSlabCanAbsorption-v1.rst
index bb96eea9d53a7abbe715d5e573a06a5a0c773a25..13bd44b061fb8f689e97bcc9e9e860450a0c83c7 100644
--- a/docs/source/algorithms/HRPDSlabCanAbsorption-v1.rst
+++ b/docs/source/algorithms/HRPDSlabCanAbsorption-v1.rst
@@ -49,7 +49,7 @@ Usage
**Example:**
.. testcode:: ExSimpleHRPDSlab
-
+
ws = CreateSampleWorkspace("Histogram",NumBanks=1,BankPixelWidth=1)
ws = ConvertUnits(ws,"Wavelength")
ws = Rebin(ws,Params=[1])
diff --git a/docs/source/algorithms/HyspecScharpfCorrection-v1.rst b/docs/source/algorithms/HyspecScharpfCorrection-v1.rst
index 1ca4fb5fe2fcb8138841a90302e8ab04bda4f3e9..4e6daa6338af29f144614c3036c920214afbb978 100644
--- a/docs/source/algorithms/HyspecScharpfCorrection-v1.rst
+++ b/docs/source/algorithms/HyspecScharpfCorrection-v1.rst
@@ -11,15 +11,15 @@ Description
-----------
This algorithm is applying a polarization correction for single crystal
-inelastic experiments. If one measures scattering intensity with polarization
-along the momentum transfer :math:`Q`, perpendicular to it in the horizontal
-plane, and in the vertical direction, one can write the spin incoherent
+inelastic experiments. If one measures scattering intensity with polarization
+along the momentum transfer :math:`Q`, perpendicular to it in the horizontal
+plane, and in the vertical direction, one can write the spin incoherent
contribution as:
.. math::
-
+
I_{SI}=\frac{3}{2}\left(\Sigma_x^{nsf}-\Sigma_y^{nsf}+\Sigma_z^{sf}\right)
-
+
where the *sf* and *nsf* subscripts stand for spin flip and non-spin flip.
The *x* direction is parallel to :math:`Q`, *y* is perpendicular in the horizontal
plane, while *z* is vertically up. **NOTE**: this is not the Mantid convention.
@@ -30,34 +30,34 @@ If we call this angle :math:`\alpha` (Scharpf angle), the above equation can
be written as:
.. math::
-
+
I_{SI}=\frac{3}{2}\left(\frac{\Sigma_{x'}^{nsf}-\Sigma_{y'}^{nsf}}{\cos^2\alpha-\sin^2\alpha}\right)+\frac{3}{2}\Sigma_z^{sf}
This algorithm calculates the Scharpf angle for every event or energy transfer bin,
-then divides the intensity by :math:`F=\cos^2\alpha-\sin^2\alpha=\cos(2\alpha)`.
+then divides the intensity by :math:`F=\cos^2\alpha-\sin^2\alpha=\cos(2\alpha)`.
In places where *F* is less than the `Precision`, the intensity of the output workspace is set to 0.
For a detector at angle :math:`\theta` in the horizontal plane, the angle
between :math:`Q` and :math:`k_i` is given by
.. math::
-
+
\gamma=\arctan2\left(-\frac{k_f}{k_i}\sin\theta, 1-\frac{k_f}{k_i}\cos\theta\right)
-
+
The Scharpf angle is then:
.. math::
\alpha = \gamma- PolarizationAngle
-
+
.. Note::
This algorithm assumes that all scattering is in the horizontal plane (good enough approximation
for Hyspec instrument, in polarized mode).
-
-For more information, see
+
+For more information, see
#. Werner Schweika - *XYZ-polarisation analysis of diffuse magnetic neutron scattering from single crystals*, Journal of Physics: Conference Series, **211**,012026, (2010) doi: `10.1088/1742-6596/211/1/012026 <http://dx.doi.org/10.1088/1742-6596/211/1/012026>`_
-
+
Usage
@@ -68,7 +68,7 @@ Usage
.. testcode:: HyspecScharpfCorrectionExample
# Create a workspace (NXSPE equivalent)
- w = CreateSampleWorkspace(Function='Flat background', NumBanks=1,
+ w = CreateSampleWorkspace(Function='Flat background', NumBanks=1,
BankPixelWidth=1, XUnit='DeltaE',
XMin=-10.25, XMax=20, BinWidth=0.5)
MoveInstrumentComponent(Workspace=w, ComponentName='bank1', X=3, Z=3, RelativePosition=False)
@@ -86,7 +86,7 @@ Usage
# If polarization angle is -10 degrees, the intensity should be 0
# Below this energy, the Scharpf angle correction is negative, above
# is positive. If energy transfer is greater than Ei, intensity is
- # set to 0
+ # set to 0
print('Intensity at DeltaE= 0meV: {0:.2f}'.format((intensity[energy_transfer==0])[0]))
print('Intensity at DeltaE= 5meV: {0:.2f}'.format((intensity[energy_transfer==5])[0]))
print('Intensity at DeltaE=10meV: {0:.2f}'.format((intensity[energy_transfer==10])[0]))
@@ -101,7 +101,7 @@ Output:
Intensity at DeltaE= 5meV: 0.00
Intensity at DeltaE=10meV: 1.99
Intensity at DeltaE=19meV: 0.00
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/IQTransform-v1.rst b/docs/source/algorithms/IQTransform-v1.rst
index e761d70aec645974c2066e2488d172456f3641f1..d0c6775face039bb3ea790a12ac60bb4456cc379 100644
--- a/docs/source/algorithms/IQTransform-v1.rst
+++ b/docs/source/algorithms/IQTransform-v1.rst
@@ -114,7 +114,7 @@ Output:
print('Output Y: {}'.format(output.readY(0)))
print('Output X: {}'.format(output.readX(0)))
-
+
Output:
.. testoutput:: ExGeneral
diff --git a/docs/source/algorithms/IndexSXPeaks-v1.rst b/docs/source/algorithms/IndexSXPeaks-v1.rst
index 5a69e4ec6d14aabcd4dfad4f88a9cf311372bad3..1d1e97e5ba05e9d2db84fd42a954ea6ad068fddc 100644
--- a/docs/source/algorithms/IndexSXPeaks-v1.rst
+++ b/docs/source/algorithms/IndexSXPeaks-v1.rst
@@ -33,7 +33,7 @@ Usage
# Load Peaks
ws=LoadIsawPeaks(Filename='TOPAZ_3007.peaks')
-
+
# Run Algorithm
IndexSXPeaks(PeaksWorkspace=ws, a=8.605819, b=11.935925, c=11.941813, alpha=107.429088, beta=98.752912, gamma=98.951193, dTolerance=0.15)
@@ -44,7 +44,7 @@ Usage
Output:
.. testoutput:: ExIndexSXPeaksSimple
-
+
Number of Indexed Peaks: 43
Related Algorithms
diff --git a/docs/source/algorithms/IndexSatellitePeaks-v1.rst b/docs/source/algorithms/IndexSatellitePeaks-v1.rst
index d6e20bb537dadd118080b2282c8da58ce68b93ca..74dc8d826efee5c745f477491feb13e33b80f522 100644
--- a/docs/source/algorithms/IndexSatellitePeaks-v1.rst
+++ b/docs/source/algorithms/IndexSatellitePeaks-v1.rst
@@ -20,7 +20,7 @@ described in the :ref:`FindSatellitePeaks <algm-FindSatellitePeaks-v1>`
algorithm. The basis set is then chosen from this list. If there are multiple
choices of vectors the algorithm will always choose the smallest one. This
defines the number of additional dimensions required to index the crystal with
-integer indices.
+integer indices.
Once a basis of `q` vectors has been chosen for indexing the system all integer
multiples of the basis set are generated. Each `q` vector is then compared with
@@ -32,7 +32,7 @@ tolerance are set to (0,0,0).
.. warning:: The current version of the algorithm returns a
:ref:`TableWorkspace <Table Workspaces>` and not a :ref:`PeaksWorkspace
<PeaksWorkspace>`. This means that the workspace cannot be overlaid on the
- slice viewer or the instrument view.
+ slice viewer or the instrument view.
.. seealso:: As well as being able to export the data to the nexus file format,
saving the data to the Jana format is supported via the :ref:`SaveReflections
@@ -40,12 +40,12 @@ tolerance are set to (0,0,0).
For more information on superspace crystallography see:
-- Van Smaalen, Sander. "An elementary introduction to superspace
- crystallography." Zeitschrift für Kristallographie-Crystalline Materials
- 219, no. 11 (2004): 681-691.
+- Van Smaalen, Sander. "An elementary introduction to superspace
+ crystallography." Zeitschrift für Kristallographie-Crystalline Materials
+ 219, no. 11 (2004): 681-691.
-- Van Smaalen, Sander. "Incommensurate crystal structures." Crystallography
- Reviews 4, no. 2 (1995): 79-202.
+- Van Smaalen, Sander. "Incommensurate crystal structures." Crystallography
+ Reviews 4, no. 2 (1995): 79-202.
Related Algorithms
------------------
diff --git a/docs/source/algorithms/IndirectQuickRun-v1.rst b/docs/source/algorithms/IndirectQuickRun-v1.rst
index 26faafb397598a2c24799d26da74c64a714e34b1..dcd12dc495e8b2d5c384548f9abada2311d08dc0 100644
--- a/docs/source/algorithms/IndirectQuickRun-v1.rst
+++ b/docs/source/algorithms/IndirectQuickRun-v1.rst
@@ -10,7 +10,7 @@ Description
-----------
Runs the :ref:`EnergyWindowScan <algm-EnergyWindowScan>` algorithm with slightly customised inputs. It also
-provides the option to perform a Width Fit which utilizes the :ref:`IndirectTwoPeakFit <algm-IndirectTwoPeakFit>`
+provides the option to perform a Width Fit which utilizes the :ref:`IndirectTwoPeakFit <algm-IndirectTwoPeakFit>`
algorithm.
Usage
diff --git a/docs/source/algorithms/IndirectReplaceFitResult-v1.rst b/docs/source/algorithms/IndirectReplaceFitResult-v1.rst
index b472821ee19c9b8a6698d351f760f3df7d852970..76aef8c61a72862cb1f593a6b894931e5ef1e781 100644
--- a/docs/source/algorithms/IndirectReplaceFitResult-v1.rst
+++ b/docs/source/algorithms/IndirectReplaceFitResult-v1.rst
@@ -9,17 +9,17 @@
Description
-----------
-During a sequential fit in Indirect Data Analysis, the parameters fitted for a spectrum become the start parameters
-for the next spectrum. This can be a problem if the next spectrum is not 'related' to the previous spectrum and will
-lead to a poor fit for that spectrum. The ReplaceIndirectFitResult algorithm allows you to replace this poorly fitted
+During a sequential fit in Indirect Data Analysis, the parameters fitted for a spectrum become the start parameters
+for the next spectrum. This can be a problem if the next spectrum is not 'related' to the previous spectrum and will
+lead to a poor fit for that spectrum. The ReplaceIndirectFitResult algorithm allows you to replace this poorly fitted
value.
-This algorithm takes a *_Result* workspace from a sequential fit for multiple spectra (1), and a *_Result* workspace
-for a singly fit spectrum (2) and it will replace the corresponding fit data in workspace (1) with the single fit
+This algorithm takes a *_Result* workspace from a sequential fit for multiple spectra (1), and a *_Result* workspace
+for a singly fit spectrum (2) and it will replace the corresponding fit data in workspace (1) with the single fit
data found in workspace (2).
-Note that workspaces (1) and (2) should be *_Result* workspaces generated by a fit with the same fit functions and
-minimizers. Also note that the output workspace is inserted back into the *_Results* workspace group in which the Input
+Note that workspaces (1) and (2) should be *_Result* workspaces generated by a fit with the same fit functions and
+minimizers. Also note that the output workspace is inserted back into the *_Results* workspace group in which the Input
workspace (1) is found.
Uses the :ref:`CopyDataRange <algm-CopyDataRange>` algorithm to replace the data in workspace (1) with data in workspace (2).
diff --git a/docs/source/algorithms/IndirectTwoPeakFit-v1.rst b/docs/source/algorithms/IndirectTwoPeakFit-v1.rst
index 4e70e09119af67b2dbfd507e84754c6a9bcc34d6..ddb76c9ef8cb7fe64d37b0b94691afc4ec342226 100644
--- a/docs/source/algorithms/IndirectTwoPeakFit-v1.rst
+++ b/docs/source/algorithms/IndirectTwoPeakFit-v1.rst
@@ -25,7 +25,7 @@ Usage
TotalRange='-0.5,0.5', ReducedWorkspace='__reduced_group', ScanWorkspace='__scan_workspace')
# Perform a two peak fit
- IndirectTwoPeakFit(SampleWorkspace='osiris92762_graphite002_red', EnergyMin=-0.5,
+ IndirectTwoPeakFit(SampleWorkspace='osiris92762_graphite002_red', EnergyMin=-0.5,
EnergyMax=0.5, OutputName='osiris92762_graphite002_two_peak_fit')
.. categories::
diff --git a/docs/source/algorithms/IntegrateByComponent-v1.rst b/docs/source/algorithms/IntegrateByComponent-v1.rst
index f2460e09aac2a246aa905165b8efd0dbe52450b9..748c120d7e7fa45e48297fd101d1d4c96f187aa5 100644
--- a/docs/source/algorithms/IntegrateByComponent-v1.rst
+++ b/docs/source/algorithms/IntegrateByComponent-v1.rst
@@ -60,7 +60,7 @@ Usage
Output:
.. testoutput:: IntegrateByComponent
-
+
For LevelsUp=1 we found that:
- two pixels in the same tube have the same value True
- two pixels in different tubes have the same value False
diff --git a/docs/source/algorithms/IntegrateEPP-v1.rst b/docs/source/algorithms/IntegrateEPP-v1.rst
index 2e2c65a53e45120e1869e51e8963f7b7c5ae7984..21bd70e4e0b8dc469180131d8ad96ec19770872e 100644
--- a/docs/source/algorithms/IntegrateEPP-v1.rst
+++ b/docs/source/algorithms/IntegrateEPP-v1.rst
@@ -28,7 +28,7 @@ Usage
ws = CreateSampleWorkspace('Histogram', 'User Defined', gaussian)
epps = FindEPP(ws)
-
+
integrated = IntegrateEPP(ws, epps, 3)
xs = integrated.readX(0)
diff --git a/docs/source/algorithms/IntegrateFlux-v1.rst b/docs/source/algorithms/IntegrateFlux-v1.rst
index 6163fd6714351d49793954df790997481cbfa6be..c6dc504bae219ffb471d6e049d4e773b2739325d 100644
--- a/docs/source/algorithms/IntegrateFlux-v1.rst
+++ b/docs/source/algorithms/IntegrateFlux-v1.rst
@@ -27,7 +27,7 @@ Usage
ws = CreateSampleWorkspace(WorkspaceType="Event", XUnit="Momentum")
# Integrate all spectra.
wsOut = IntegrateFlux( ws )
-
+
# Print the result
print("The input workspace has {} spectra".format(ws.getNumberHistograms()))
print("The output workspace has {} spectra".format(wsOut.getNumberHistograms()))
diff --git a/docs/source/algorithms/IntegrateMDHistoWorkspace-v1.rst b/docs/source/algorithms/IntegrateMDHistoWorkspace-v1.rst
index 40bd6a3c80b4e2ae817a8ef751c88d7b6fd4db8c..0eb1926b9e040a960dd5027d1b7f2e44530dedb4 100644
--- a/docs/source/algorithms/IntegrateMDHistoWorkspace-v1.rst
+++ b/docs/source/algorithms/IntegrateMDHistoWorkspace-v1.rst
@@ -17,7 +17,7 @@ Binning
The *P1Bin* corresponds to the first dimension of the MDHistoWorkspace, *P2Bin* to the second and so on. *P1Bin=[-1, 1]* indicates that we will integrate this dimension between -1 and 1. *P1Bins=[]* indicates that the shape of this dimension should be unchanged from the input. *P1Bins=[-1,0,1]* is a special case, the zero indicates that the same bin width as the input dimension would be used, but the minimum and maximum will also be used to crop the dimension. In this latter form, the limits may be expanded to ensure that there is no partial bins in the non-integrated dimension (see warning messages).
-Weights
+Weights
#######
The algorithm works by creating the *OutputWorkspace* in the correct shape. Each bin in the OutputWorkspace is treated in turn. For each bin in the OutputWorkspace, we find those bins in the *InputWorkspace* that overlap and therefore could contribute to the OutputBin. For any contributing bin, we calculate the fraction overlap and treat this a weighting factor. For each contributing bin *Signal*, and :math:`Error^{2}`, and *Number of Events* values are extracted and multiplied by the weight. These values are summed for all contributing input bins before being assigned to the corresponding output bin. For plotting the *OutputWorkspace*, it is important to select the Number of Events normalization option to correctly account for the weights.
@@ -26,16 +26,16 @@ The algorithm works by creating the *OutputWorkspace* in the correct shape. Each
:alt: PreIntegrateMD.png
:width: 400px
:align: center
-
+
Integration Input. 3D.
-
+
.. figure:: /images/IntegrateMD.png
:alt: IntegrateMD.png
:width: 400px
:align: center
-
- Integration Output. 2nd and 3rd dimensions integrated out.
-
+
+ Integration Output. 2nd and 3rd dimensions integrated out.
+
Usage
-----
@@ -82,7 +82,7 @@ maximum and minimum limits may need to be adjusted to ensure no partial binning
high_d_cut =CutMD(InputWorkspace=mdws, P1Bin=[-10, 0.1, 10], P2Bin=[-10, 0.1, 10], P3Bin=[-10, 0.1, 10], NoPix=True)
#Integrate out 2 dimensions
copy_key = 0
-
+
low_d_cut=IntegrateMDHistoWorkspace(InputWorkspace=high_d_cut,P1Bin=[-9.48,copy_key,9.01], P2Bin=[-2,2], P3Bin=[-5,5])
dim = high_d_cut.getDimension(0)
@@ -97,14 +97,14 @@ maximum and minimum limits may need to be adjusted to ensure no partial binning
Output:
-.. testoutput:: IntegrateMDHistoWorkspaceExampleLineCut
+.. testoutput:: IntegrateMDHistoWorkspaceExampleLineCut
Input bin width is 0.10
Number of non integrated dimensions after integration are 1
Non integrated dimension is ['zeta', 0, 0]
Limits are from -9.50 to 9.10
Output bin width is 0.10
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/IntegratePeaksHybrid-v1.rst b/docs/source/algorithms/IntegratePeaksHybrid-v1.rst
index 3931de47d523a1a8b84fd62348d8ea0d48323263..0bc28bf31293cc81ae32e4c0d2002e4e33b6fede 100644
--- a/docs/source/algorithms/IntegratePeaksHybrid-v1.rst
+++ b/docs/source/algorithms/IntegratePeaksHybrid-v1.rst
@@ -9,7 +9,7 @@
Description
-----------
-This is a hybrid between :ref:`algm-IntegratePeaksMD` and :ref:`algm-IntegratePeaksUsingClusters`. Each peak region is treated as a separate image and rebinned accordingly. The background threshold is automatically determined around each peak, by averaging over all pixels in that region.
+This is a hybrid between :ref:`algm-IntegratePeaksMD` and :ref:`algm-IntegratePeaksUsingClusters`. Each peak region is treated as a separate image and rebinned accordingly. The background threshold is automatically determined around each peak, by averaging over all pixels in that region.
The NumberOfBins and BackgroundOuterRadius are global to all Peaks. The actual background threshold is calculated independently for each peak based on NumberOfBins, BackgroundOuterRadius and the signal values in that region. This algorithm is in general faster than :ref:`algm-IntegratePeaksUsingClusters` and has a better ability to distinguish peaks from the background because each peak is treated independently.
Integrates arbitrary shaped single crystal peaks defined on an
@@ -72,11 +72,11 @@ Usage
# Predict peaks
predicted = PredictPeaks(sxd)
# Keep every 20th predicted peak for speed
- rows_to_delete = set(range(predicted.getNumberPeaks())) - set([i for i in range(predicted.getNumberPeaks()) if i % 20 == 0])
+ rows_to_delete = set(range(predicted.getNumberPeaks())) - set([i for i in range(predicted.getNumberPeaks()) if i % 20 == 0])
DeleteTableRows(predicted, Rows=list(rows_to_delete))
# Set the Frame to QLab
- mdws = CreateMDWorkspace(Dimensions=3, Extents='-10,10,-10,10,-10,10',
+ mdws = CreateMDWorkspace(Dimensions=3, Extents='-10,10,-10,10,-10,10',
Names='Q_lab_x,Q_lab_y,Q_lab_z', Frames = "QLab,QLab,QLab",
Units='U,U,U')
qlab = predicted.column('QLab')
diff --git a/docs/source/algorithms/IntegratePeaksMD-v2.rst b/docs/source/algorithms/IntegratePeaksMD-v2.rst
index f89ae07d8daa5ab5592aeb5d52ae3e9f47d21f3d..ac4e7ff49612c429b6c8a1a9f0ab3b983ae96987 100644
--- a/docs/source/algorithms/IntegratePeaksMD-v2.rst
+++ b/docs/source/algorithms/IntegratePeaksMD-v2.rst
@@ -68,8 +68,8 @@ the provided radii. Errors are also summed in quadrature.
- **AdaptiveQMultiplier** can be used for the radius to vary as a function of the modulus of Q. If the AdaptiveQBackground option is set to True, the background radius also changes so each peak has a different integration radius. Q includes the 2*pi factor.
- - PeakRadius + AdaptiveQMultiplier * **|Q|**
- - BackgroundOuterRadius + AdaptiveQMultiplier * **|Q|**
+ - PeakRadius + AdaptiveQMultiplier * **|Q|**
+ - BackgroundOuterRadius + AdaptiveQMultiplier * **|Q|**
- BackgroundInnerRadius + AdaptiveQMultiplier * **|Q|**
Background Subtraction
@@ -107,19 +107,19 @@ If BackgroundInnerRadius is left blank, then **BackgroundInnerRadius** =
IntegrateIfOnEdge option
###################################
-Edges for each bank or pack of tubes of the instrument are defined by masking the edges in the PeaksWorkspace instrument.
+Edges for each bank or pack of tubes of the instrument are defined by masking the edges in the PeaksWorkspace instrument.
e.g. For TOPAZ pixels 0 and 255 in both directions for the Rectangular Detector.
Q in the lab frame for every peak is calculated, call it C
For every point on the edge, the trajectory in reciprocal space is a straight line, going through:
:math:`\vec{O}=(0,0,0)`
-Calculate a point at a fixed momentum, say k=1.
+Calculate a point at a fixed momentum, say k=1.
Q in the lab frame:
:math:`\vec{E}=(-k*sin(\theta)*cos(\phi),-k*sin(\theta)*sin(\phi),k-k*cos(\phi))`
-Normalize E to 1:
+Normalize E to 1:
:math:`\vec{E}=\vec{E}*(1./\left|\vec{E}\right|)`
@@ -131,19 +131,19 @@ If:
:math:`\left|dv\right|<PeakRadius`
-for the integration, one of the detector trajectories on the edge is too close to the peak
+for the integration, one of the detector trajectories on the edge is too close to the peak
This method is also applied to all masked pixels. If there are masked pixels trajectories inside an integration volume, the peak must be rejected.
-
+
CorrectIfOnEdge option
###################################
-This is an extension of what was calculated for the IntegrateIfOnEdge option. It will only be calculated if this option
-is true and the minimum dv is less than PeakRadius or BackgroundOuterRadius.
+This is an extension of what was calculated for the IntegrateIfOnEdge option. It will only be calculated if this option
+is true and the minimum dv is less than PeakRadius or BackgroundOuterRadius.
For the background if
-:math:`\left|dv\right|_{min}<BackgroundOuterRadius`
+:math:`\left|dv\right|_{min}<BackgroundOuterRadius`
:math:`h = BackgroundOuterRadius - \left|dv\right|_{min}`
@@ -181,17 +181,17 @@ The integrated intensity is multiplied by the ratio of the volume of the sphere
:math:`I_{peakMultiplier} = V_{sphere} / (V_{sphere} - V_{cap})`
-
+
Usage
------
**Example - IntegratePeaks:**
-User should provide its own
+User should provide its own
event nexus file instead of **TOPAZ_3132_event.nxs** used within this example. The original **TOPAZ_3132_event.nxs**
file is available in `Mantid system tests repository <https://github.com/mantidproject/systemtests/tree/master/Data/TOPAZ_3132_event.nxs>`_.
-.. The code itself works but disabled from doc tests as takes too long to complete.
+.. The code itself works but disabled from doc tests as takes too long to complete.
.. .. testcode:: exIntegratePeaksMD
.. code-block:: python
@@ -206,7 +206,7 @@ file is available in `Mantid system tests repository <https://github.com/mantidp
name= name[:8]
row += "| {:8} ".format(name)
print(row + "|")
-
+
for i in range(nRows):
row = ""
for name in tab_names:
@@ -228,9 +228,9 @@ file is available in `Mantid system tests repository <https://github.com/mantidp
peaks= IntegratePeaksMD(InputWorkspace='TOPAZ_3132_md', PeaksWorkspace='peaks',\
PeakRadius=0.12, BackgroundOuterRadius=0.2, BackgroundInnerRadius=0.16,\
OutputWorkspace='peaks')
-
+
# print the integration results
- print_tableWS(peaks,10)
+ print_tableWS(peaks,10)
**Output:**
diff --git a/docs/source/algorithms/IntegratePeaksMDHKL-v1.rst b/docs/source/algorithms/IntegratePeaksMDHKL-v1.rst
index fecbb7bbb719d16e2d4216ab3916038101396bb5..69dc053308baefa56ba5fd2e875822345b001ae8 100644
--- a/docs/source/algorithms/IntegratePeaksMDHKL-v1.rst
+++ b/docs/source/algorithms/IntegratePeaksMDHKL-v1.rst
@@ -10,12 +10,12 @@
Description
-----------
-:ref:`IntegratePeaksMDHKL <algm-IntegratePeaksMDHKL>` provides integration of a
-:ref:`MDHistoWorkspace <MDHistoWorkspace>` or :ref:`MDEventWorkspace <MDWorkspace>` in 3-dimensions.
-The units of the workspace must be HKL. The main usage will be for data normalized by
+:ref:`IntegratePeaksMDHKL <algm-IntegratePeaksMDHKL>` provides integration of a
+:ref:`MDHistoWorkspace <MDHistoWorkspace>` or :ref:`MDEventWorkspace <MDWorkspace>` in 3-dimensions.
+The units of the workspace must be HKL. The main usage will be for data normalized by
:ref:`MDNormSCD <algm-MDNormSCD>`.
-A 3D box is created for each peak and the background and peak data are separated. The intensity and sigma of the
-intensity is found from the grid inside the peak and the background is subtracted. The boxes are created and integrated
+A 3D box is created for each peak and the background and peak data are separated. The intensity and sigma of the
+intensity is found from the grid inside the peak and the background is subtracted. The boxes are created and integrated
in parallel and less memory is required than binning all HKL at once.
:math:`I_{corr} = I_{peak} - pts_{peak}/pts_{bg} * I_{bg}`
@@ -24,16 +24,16 @@ with the errors summed in quadrature:
:math:`\sigma_{I,corr}^2 = \sigma_{I,peak}^2 + (pts_{peak}/pts_{bg})^2 * \sigma_{I,bg}^2`
-Using the DeltaHKL parameter, the problem of nearly peaks or regions of diffuse scattering can be avoided. Also for
+Using the DeltaHKL parameter, the problem of nearly peaks or regions of diffuse scattering can be avoided. Also for
normalized data, the unmeasured data points are excluded from the background. See white regions in last figure.
.. figure:: /images/peak3d.png
:alt: peak3d.png
:width: 400px
:align: center
-
+
Peak Integration Input. 3D Box.
-
+
.. figure:: /images/IntegratePeaksMDHKLbox.png
:alt: IntegratePeaksMDHKLbox.png
:width: 400px
@@ -52,9 +52,9 @@ normalized data, the unmeasured data points are excluded from the background. Se
:alt: IntegratePeaksMDHKLbkg.png
:width: 400px
:align: center
-
+
Integration slice of background grid points.
-
+
Usage
-----
@@ -93,12 +93,12 @@ Output:
.. testoutput:: IntegratePeaksMDHKLExample
- 99913.3212993 316.123352485
- 99913.3212993 316.123352485
- 99913.3212993 316.123352485
- 99945.2374619 316.157736186
- 99951.6716018 316.164910575
- 99926.3456269 316.133414893
+ 99913.3212993 316.123352485
+ 99913.3212993 316.123352485
+ 99913.3212993 316.123352485
+ 99945.2374619 316.157736186
+ 99951.6716018 316.164910575
+ 99926.3456269 316.133414893
.. categories::
diff --git a/docs/source/algorithms/IntegratePeaksProfileFitting-v1.rst b/docs/source/algorithms/IntegratePeaksProfileFitting-v1.rst
index de0e287509b74387497ca19ff4a9a88b86e2ca6f..561ee31b71e5f4b08eee77aaec5d20361d0ec8dc 100644
--- a/docs/source/algorithms/IntegratePeaksProfileFitting-v1.rst
+++ b/docs/source/algorithms/IntegratePeaksProfileFitting-v1.rst
@@ -40,7 +40,7 @@ Instrument-Defined Parameters
In addition to the input parameters defined above, there are several other parameters
to be aware of which are pre-defined for each instrument. The instrument is determined
from the instrument that is loaded into PeaksWorkspace. If the instrument parameters file
-does not contain parameters, the algorithm defaults to MaNDi parameters. Default
+does not contain parameters, the algorithm defaults to MaNDi parameters. Default
values are below:
+--------------+----------------------------+----------+----------+---------+
@@ -81,10 +81,10 @@ Constructing the Measured Intensity Distribution
##################################################
To construct the measured distribution to be fit, a histogram of events is made around the peak.
This histogram is in (q\ :sub:`x`\ , q\ :sub:`y`\, q\ :sub:`z`\) and composed of voxels of side
-length **DQPixel**. To minimize the effect of neighboring peaks on profile fitting, the variable
+length **DQPixel**. To minimize the effect of neighboring peaks on profile fitting, the variable
**qMask** is used to only consider a region around the peak in (h,k,l) space. It will filter voxels
outside of (h ± **FracHKL**, k ± **FracHKL**, l ± **FracHKL**) from calculations used for profile
-fitting. In practice, values of 0.25 < **fracHKL** < 0.5 seem to work best.
+fitting. In practice, values of 0.25 < **fracHKL** < 0.5 seem to work best.
Fitting the Time-of-Flight Coordinate
#####################################
@@ -93,10 +93,10 @@ The time-of-flight (TOF), t, of each voxel is determined as:
.. math::
t = k \times \frac{(L_1 + L_2)\sin(\theta)}{|\vec{q}|}
-The events are histogrammed by their `t` values to create a TOF profile. This profile can then be fit
+The events are histogrammed by their `t` values to create a TOF profile. This profile can then be fit
to the Ikeda Carpenter function. To separate the peak and background, different levels of intensity are
filtered out. The predicted background level is determined as the average background not near the peak or off the edge
-and values within **Minppl_frac** and **Maxppl_frac** times the predicted value are tried. The best fit to the expected
+and values within **Minppl_frac** and **Maxppl_frac** times the predicted value are tried. The best fit to the expected
moderator emission (determined by the moderator coefficients defined in **ModeratorCoefficientsFile**) is
taken and these voxels are considered to be signal.
@@ -109,25 +109,25 @@ which is fit to a bivariate normal distribution. The histogram has **NTheta** :
For weak peaks or peaks near detector edges, the 2D histogram likely does not reflect the full profile. To address this, the
profile of the nearest strong peaks is forced when doing the BVG fit. The profile is fit (allowed to vary 10% in
-:math:`\sigma_x, \sigma_y, \rho` ) and location and amplitude are not fixed. Weak peaks are defined as peaks with fewer
+:math:`\sigma_x, \sigma_y, \rho` ) and location and amplitude are not fixed. Weak peaks are defined as peaks with fewer
than **IntensityCutoff** counts from peak-minus-background integration or within **EdgeCutoff** pixels of the detector edge.
The strong peaks library can be generated in two ways. First, it can be provided as an input file through **StrongPeakParamsFile**.
The **StrongPeakParamsFile** should be a .pkl file which contains a Numpy array containing the parameters used for strong peaks.
Alternatively, if no file is provided, the algorithm will go through and fit strong peaks first, building the strong peaks library
-as it goes. After fitting all of the strong peaks, defined as peaks with spherical intensities above **IntensityCutoff** and further
+as it goes. After fitting all of the strong peaks, defined as peaks with spherical intensities above **IntensityCutoff** and further
than **EdgeCutoff** pixels from the edge, it will fit weak peaks using those profiles. For initial guesses, the algorithm will fit
the first 30 peaks using the instrument default parameters. After that, it will use already fit peaks to determine initial guesses.
Integrating the Model
#####################
-The final intensity profile is given by
+The final intensity profile is given by
.. math::
Y(\vec{q}) = A \times Y_{TOF}(\vec{q}) \times Y_{BVG}(\vec{q}) + B
-where :math:`A` and :math:`B` are scaling constants. Here the background is assumed to be constant :math:`B` over the volume of
-the peak, so the model of the peak itself is :math:`Y_{model}(\vec{q}) = A \times Y_{TOF}(\vec{q}) \times Y_{BVG}(\vec{q})`.
+where :math:`A` and :math:`B` are scaling constants. Here the background is assumed to be constant :math:`B` over the volume of
+the peak, so the model of the peak itself is :math:`Y_{model}(\vec{q}) = A \times Y_{TOF}(\vec{q}) \times Y_{BVG}(\vec{q})`.
The peak intensity :math:`I`, is given by summing :math:`Y_{model}(\vec{q})` over voxels which are greater than **FracStop** of the maximum.
:math:`\sigma(I)` is given as
@@ -135,21 +135,21 @@ The peak intensity :math:`I`, is given by summing :math:`Y_{model}(\vec{q})` ove
.. math::
\sigma(I) = \sqrt{\Sigma N_{obs} + \Sigma N_{BG} + \frac{\Sigma N_{obs}(N_{obs}-N_{model})^2}{\Sigma N_{obs}}}
-where the first two terms come from Poissionian statistics and the final term is the variance of the fit. Those
+where the first two terms come from Poissionian statistics and the final term is the variance of the fit. Those
sums are over the same voxels used to calculate intensity.
-
+
Usage
------
**Example - IntegratePeaksProfileFitting**
-.. The code itself works but disabled from doc tests as takes too long to complete.
+.. The code itself works but disabled from doc tests as takes too long to complete.
.. .. testcode:: exIntegratePeaksMD
.. code-block:: python
:linenos:
-
+
Load(Filename='/SNS/MANDI/IPTS-8776/0/5921/NeXus/MANDI_5921_event.nxs', OutputWorkspace='MANDI_5921_event')
MANDI_5921_md = ConvertToMD(InputWorkspace='MANDI_5921_event', QDimensions='Q3D', dEAnalysisMode='Elastic',
Q3DFrames='Q_lab', QConversionScales='Q in A^-1',
diff --git a/docs/source/algorithms/Integration-v1.rst b/docs/source/algorithms/Integration-v1.rst
index 254e64df5340ff2b091cbedea9644c905a29c3b2..ecc5ba14b6da52b88b9092fcb85dc529d447fbe7 100644
--- a/docs/source/algorithms/Integration-v1.rst
+++ b/docs/source/algorithms/Integration-v1.rst
@@ -50,14 +50,14 @@ output will be a :ref:`MatrixWorkspace <MatrixWorkspace>`.
:ref:`algm-Rebin` is recommended if you want to keep the workspace as an
EventWorkspace.
-**Integration for event workspaces refers to internal binning, provided by**
-:ref:`algm-Rebin` **or load algorithm and may ignore limits, provided as algorithm
-input.** For example, attempt to integrate loaded ISIS event workspace in the
+**Integration for event workspaces refers to internal binning, provided by**
+:ref:`algm-Rebin` **or load algorithm and may ignore limits, provided as algorithm
+input.** For example, attempt to integrate loaded ISIS event workspace in the
range [18000,20000] yields workspace integrated in the range [0,200000],
assuming the data were collected in the time range [0,20000]. This happens because
the event data would have single histogram workspace bin in range [0,20000].
-To obtain integral in the desired range, user have to :ref:`algm-Rebin` first,
-and one of the binning intervals have to start from 18000 and another (or the same)
+To obtain integral in the desired range, user have to :ref:`algm-Rebin` first,
+and one of the binning intervals have to start from 18000 and another (or the same)
end at 20000.
@@ -65,7 +65,7 @@ end at 20000.
Usage
-----
-**Example - Integration over limited number of histograms:**
+**Example - Integration over limited number of histograms:**
.. testcode:: ExWsIndices
@@ -73,7 +73,7 @@ Usage
ws=CreateSampleWorkspace('Histogram','Flat background')
# Integrate 10 spectra over all X values
intg=Integration(ws,StartWorkspaceIndex=11,EndWorkspaceIndex=20)
-
+
# Check the result
print('The result workspace has {0} spectra'.format(intg.getNumberHistograms()))
print('Integral of spectrum 11 is {0}'.format(intg.readY(0)[0]))
@@ -91,7 +91,7 @@ Output:
Integral of spectrum 13 is 100.0
Integration range is [ 0.0, 20000.0 ]
-**Example - Total peak intensity:**
+**Example - Total peak intensity:**
.. testcode:: ExRangeLists
@@ -103,15 +103,15 @@ Output:
XMax=12000,
BinWidth=20)
nHisto = ws.getNumberHistograms()
-
+
# Add elastic peaks to 'ws'. They will be at different TOFs
# since the detector banks will be 5 and 10 metres from the sample.
-
+
# First, a helper function for the peak shape
def peak(shift, xs):
xs = (xs[:-1] + xs[1:]) / 2.0 # Convert to bin centres.
return 50 * numpy.exp(-numpy.square(xs - shift) / 1200)
-
+
# Now, generate the elastic peaks.
Ei = 23.0 # Incident energy, meV
L1 = 10.0 # Source-sample distance, m
@@ -122,11 +122,11 @@ Output:
tof = UnitConversion.run('Energy', 'TOF', Ei, L1, L2, 0.0, DeltaEModeType.Direct, Ei)
ys = ws.dataY(i)
ys += peak(tof, ws.readX(i))
-
+
# Fit Gaussians to the workspace.
# Fit results will be put into a table workspace 'epps'.
epps = FindEPP(ws)
-
+
# Integrate the peaks over +/- 3*sigma
lowerLimits = numpy.empty(nHisto)
upperLimits = numpy.empty(nHisto)
@@ -135,11 +135,11 @@ Output:
sigma = epps.cell('Sigma', i)
lowerLimits[i] = peakCentre - 3 * sigma
upperLimits[i] = peakCentre + 3 * sigma
-
+
totalIntensity = Integration(ws,
RangeLowerList=lowerLimits,
RangeUpperList=upperLimits)
-
+
print('Intensity of the first peak: {:.5}'.format(totalIntensity.dataY(0)[0]))
print('Intensity of the last peak: {:.5}'.format(totalIntensity.dataY(nHisto-1)[0]))
diff --git a/docs/source/algorithms/InvertMDDim-v1.rst b/docs/source/algorithms/InvertMDDim-v1.rst
index e007c5c9601e78b55d3feb10c2d0b91357cda2b1..50a19b56fb9dc647759721edd0d346e5496f2ce5 100644
--- a/docs/source/algorithms/InvertMDDim-v1.rst
+++ b/docs/source/algorithms/InvertMDDim-v1.rst
@@ -30,7 +30,7 @@ Usage
dim.name, dim.getNBins(), dim.getMinimum(), dim.getMaximum()))
#create a test MD event workspace
- mdew = CreateMDWorkspace(Dimensions=3, Extents=[-1,1,-5,5,-9,10],
+ mdew = CreateMDWorkspace(Dimensions=3, Extents=[-1,1,-5,5,-9,10],
Names='A, B, C', Units='U, U, U')
FakeMDEventData(mdew, PeakParams=[100000, 0, 0, 0, 1])
diff --git a/docs/source/algorithms/IqtFitMultiple-v1.rst b/docs/source/algorithms/IqtFitMultiple-v1.rst
index 6bbba0c5f27ff1c8446bb75ce5156d7664b1d3ed..33048246e797efeeb42ab601a25f2dbfdbe34f37 100644
--- a/docs/source/algorithms/IqtFitMultiple-v1.rst
+++ b/docs/source/algorithms/IqtFitMultiple-v1.rst
@@ -29,7 +29,7 @@ Usage
**Example - Running IqtFitMultiple on an reduced workspace.**
.. code-block:: python
-
+
#Load in iqt data
input_ws = Load(Filename='iris26176_graphite002_iqt.nxs')
function = r'name=LinearBackground,A0=0.027668,A1=0,ties=(A1=0);name=UserFunction,Formula=Intensity*exp(-(x/Tau)^Beta),Intensity=0.972332,Tau=0.0247558,Beta=1;ties=(f1.Intensity=1-f0.A0)'
diff --git a/docs/source/algorithms/IqtFitSequential-v1.rst b/docs/source/algorithms/IqtFitSequential-v1.rst
index 63e55619807e4cdd2b1c573f4b8ece21a4c823f0..d71048cde9708f9f78eb6f48e6ad82b7ef613452 100644
--- a/docs/source/algorithms/IqtFitSequential-v1.rst
+++ b/docs/source/algorithms/IqtFitSequential-v1.rst
@@ -24,7 +24,7 @@ Usage
**Example - Running IqtFitSequential on an reduced workspace.**
.. code-block:: python
-
+
#Load in iqt data
input_ws = Load(Filename='iris26176_graphite002_iqt.nxs')
function = r'name=LinearBackground,A0=0.027668,A1=0,ties=(A1=0);
diff --git a/docs/source/algorithms/IqtFitSimultaneous-v1.rst b/docs/source/algorithms/IqtFitSimultaneous-v1.rst
index a6f7faad93bf4bcd05b1a0db3f28adee0506b875..86779053d16eef7a898bb1f93f05276bf9ff06de 100644
--- a/docs/source/algorithms/IqtFitSimultaneous-v1.rst
+++ b/docs/source/algorithms/IqtFitSimultaneous-v1.rst
@@ -24,7 +24,7 @@ Usage
**Example - Running IqtFitSimultaneous on an reduced workspace.**
.. code-block:: python
-
+
#Load in iqt data
input_ws = Load(Filename='iris26176_graphite002_iqt.nxs')
function = r'name=LinearBackground,A0=0.027668,A1=0,ties=(A1=0);
@@ -32,7 +32,7 @@ Usage
ties=(f1.Intensity=1-f0.A0)'
#run IqtFitSimultaneous
- result, params, fit_group = IqtFitSimultaneous(Function=function, InputWorkspace=input_ws,
+ result, params, fit_group = IqtFitSimultaneous(Function=function, InputWorkspace=input_ws,
WorkspaceIndex=0, StartX=0, EndX=0.2)
diff --git a/docs/source/algorithms/JoinISISPolarizationEfficiencies-v1.rst b/docs/source/algorithms/JoinISISPolarizationEfficiencies-v1.rst
index a04dc5a2770c23ceae1e10a2acd1687788e59c9c..e0c987ac069d803173ef1e8569779c9f38b1abf1 100644
--- a/docs/source/algorithms/JoinISISPolarizationEfficiencies-v1.rst
+++ b/docs/source/algorithms/JoinISISPolarizationEfficiencies-v1.rst
@@ -18,7 +18,7 @@ Usage
-----
.. testcode:: Example
-
+
# Create input workspaces which can have different sizes
ws1 = CreateWorkspace([1, 2, 3], [1, 1])
ws2 = CreateWorkspace([2, 3, 4, 5], [1, 1, 1])
@@ -32,7 +32,7 @@ Usage
Output:
-.. testoutput:: Example
+.. testoutput:: Example
Number of spectra = 2
Number of bins = 3
diff --git a/docs/source/algorithms/LRAutoReduction-v1.rst b/docs/source/algorithms/LRAutoReduction-v1.rst
index 7f8726567c2a45d9c0d22cb4e96bc1377b7fba56..ca5b3869beb0e9cf4ba0bcdfaaa630efc4d94957 100644
--- a/docs/source/algorithms/LRAutoReduction-v1.rst
+++ b/docs/source/algorithms/LRAutoReduction-v1.rst
@@ -9,19 +9,19 @@
Description
-----------
-This algorithm gathers the information needed to launch the LR reduction. It is called by the
+This algorithm gathers the information needed to launch the LR reduction. It is called by the
post-processing system after a new data file is created.
If a reduction template file is provided, the reduction will use the options in that file.
If no reduction template is provided, reduction parameters will be read from the Nexus file.
-For sample data runs, the :ref:`LiquidsReflectometryReduction <algm-LiquidsReflectometryReduction>`
-algorithm is called to perform the reduction, followed by the
-:ref:`LRReflectivityOutput <algm-LRReflectivityOutput>` algorithm to put the different pieces of
+For sample data runs, the :ref:`LiquidsReflectometryReduction <algm-LiquidsReflectometryReduction>`
+algorithm is called to perform the reduction, followed by the
+:ref:`LRReflectivityOutput <algm-LRReflectivityOutput>` algorithm to put the different pieces of
the reduced data into a single reflectivity file.
-For direct beams, the :ref:`LRDirectBeamSort <algm-LRDirectBeamSort>` workflow algorithm is
-called to generate a scaling factor file.
+For direct beams, the :ref:`LRDirectBeamSort <algm-LRDirectBeamSort>` workflow algorithm is
+called to generate a scaling factor file.
.. categories::
diff --git a/docs/source/algorithms/LRPrimaryFraction-v1.rst b/docs/source/algorithms/LRPrimaryFraction-v1.rst
index 793948ac21b98faf9995606bb0eb2208994312b2..19a612d8e2ff98e46444e4aa3da6f1554dc605c6 100644
--- a/docs/source/algorithms/LRPrimaryFraction-v1.rst
+++ b/docs/source/algorithms/LRPrimaryFraction-v1.rst
@@ -12,7 +12,7 @@ Description
Used in the Liquids Reflectometer reduction at the SNS, this algorithm
computes the primary fraction (aka 'clocking correction') for the given data.
The primary fraction is the fraction of the counts within a specified range
-that should contain the reflected beam to the total number of counts on the detector.
+that should contain the reflected beam to the total number of counts on the detector.
.. categories::
diff --git a/docs/source/algorithms/LRScalingFactors-v1.rst b/docs/source/algorithms/LRScalingFactors-v1.rst
index 7b7f19534b2cbb9363d7155d1d8b220d37dc18f4..fe636ccc448bf6f8f1c7cf4541216d4e7f9c375f 100644
--- a/docs/source/algorithms/LRScalingFactors-v1.rst
+++ b/docs/source/algorithms/LRScalingFactors-v1.rst
@@ -10,7 +10,7 @@ Description
-----------
Used in the Liquids Reflectometer reduction at the SNS, this algorithm
-computes the absolute scaling factors for the data sets that we are going to stitch
+computes the absolute scaling factors for the data sets that we are going to stitch
together.
The algorithm runs through a sequence of direct beam data sets
@@ -25,7 +25,7 @@ no attenuators.
The normalization run for a data set taken in a given slit setting
configuration can then be expressed in terms of the standard 0-attenuator
-data set with: :math:`D_i = F_i D_0`
+data set with: :math:`D_i = F_i D_0`
Here's an example of runs and how they are related to F.
diff --git a/docs/source/algorithms/LRSubtractAverageBackground-v1.rst b/docs/source/algorithms/LRSubtractAverageBackground-v1.rst
index dc380f3d0abace9c48bc6fd17861063c5e3c6a2e..11517235467807bc97f02ed53d7463fd6adc28b0 100644
--- a/docs/source/algorithms/LRSubtractAverageBackground-v1.rst
+++ b/docs/source/algorithms/LRSubtractAverageBackground-v1.rst
@@ -10,7 +10,7 @@ Description
-----------
Used in the Liquids Reflectometer reduction at the SNS, this algorithm
-compute and subtracts the background from the reflectivity peak.
+compute and subtracts the background from the reflectivity peak.
.. categories::
diff --git a/docs/source/algorithms/LineProfile-v1.rst b/docs/source/algorithms/LineProfile-v1.rst
index 6aaff42833ce8f38acf97e4b8220122709d8503d..a12bba252d9e62d4939a1d80113319ad6cbfd4e6 100644
--- a/docs/source/algorithms/LineProfile-v1.rst
+++ b/docs/source/algorithms/LineProfile-v1.rst
@@ -49,12 +49,12 @@ Usage
.. testcode:: HorizontalLineProfileExample
import numpy
-
+
ws = CreateSampleWorkspace(
Function='Quasielastic Tunnelling',
NumBanks=1
)
-
+
# Horizontal profile over spectra 5-10
horProfile = LineProfile(
InputWorkspace=ws,
@@ -63,7 +63,7 @@ Usage
Start=3000,
End=13000
)
-
+
indexMax = numpy.argmax(horProfile.readY(0))
epp = horProfile.readX(0)[indexMax]
print('Elastic peak at {}'.format(epp))
@@ -79,19 +79,19 @@ Output:
.. testcode:: VerticalLineProfile
import numpy
-
+
ws = CreateSampleWorkspace(
Function='Quasielastic Tunnelling',
NumBanks=1
)
-
+
wsInTheta = ConvertSpectrumAxis(
InputWorkspace=ws,
Target='Theta'
)
-
+
# Verical cuts.
-
+
tofs = numpy.arange(3000, 7000, 500)
cutWSs = list()
for tof in tofs:
@@ -105,7 +105,7 @@ Output:
End=0.9
)
cutWSs.append(cutWS)
-
+
for cut in cutWSs:
# Vertical axis holds the TOF bin edges of the cut
axis = cut.getAxis(1)
diff --git a/docs/source/algorithms/LinkedUBs-v1.rst b/docs/source/algorithms/LinkedUBs-v1.rst
index 174508fd99abf22f26ad5a67e2ffa03532730940..25508e966aa24945a0b05b9f31271af38a0fffb5 100644
--- a/docs/source/algorithms/LinkedUBs-v1.rst
+++ b/docs/source/algorithms/LinkedUBs-v1.rst
@@ -17,11 +17,11 @@ for grouping of reflections and refinement.
On chopper instruments, when the sample is lowered into the
blockhouse there is often no possibility to adjust its position. When rotating the
crystal via the goniometer, since the crystal is likely not centred exactly, the
-predicted peaks from the initial UB often do not capture the data. As well as
+predicted peaks from the initial UB often do not capture the data. As well as
consistently indexing the peaks, the algorithm also effectively carries out a U
-matrix correction that accounts for sample miscentering. Use of this algorithm
-will result in a seperate UB matrix for each orientation which can then be used
-for integration.
+matrix correction that accounts for sample miscentering. Use of this algorithm
+will result in a seperate UB matrix for each orientation which can then be used
+for integration.
The algorithm requires a set of predicted peaks that have been generated from
the initial UB via goniometer rotation, a set of observed (found) peaks, and
@@ -37,14 +37,14 @@ used for the first cycle. As the refinement of the UB is carried out, more
peaks at shorter d are added, encoded by the PeakIncrement parameter. This adds
a defined number of peaks after each cycle.
-The main limitation of this approach is that the lattice parameters of the sample should be known accurately. It is recommended that at least 10 iterations are carried out, but in cases where the crystal is well centred and the goniometer angles are known accurately fewer iterations are necessary.
+The main limitation of this approach is that the lattice parameters of the sample should be known accurately. It is recommended that at least 10 iterations are carried out, but in cases where the crystal is well centred and the goniometer angles are known accurately fewer iterations are necessary.
Useage
-----------
**Example:**
-.. code-block:: python
+.. code-block:: python
# WISH single crystal
# demonstration of linkedUBs algorithm on D10 Ruby (cyle 18/1)
@@ -59,7 +59,7 @@ Useage
beta = 90
gamma = 120
- # parameters for PredictPeaks
+ # parameters for PredictPeaks
MinDSpacing = 0.5
MaxDSpacing = 20
MinWavelength = 0.8
@@ -68,14 +68,14 @@ Useage
# parameters for LinkedUBs
QTolerance = 0.5
- QDecrement = 0.95
- DTolerance = 0.02
+ QDecrement = 0.95
+ DTolerance = 0.02
NumPeaks = 25
PeakIncrement = 10
Iterations = 10
DeleteWorkspace = False
- # phi axis at omega = 270
+ # phi axis at omega = 270
u_phi_x, u_phi_y, u_phi_z = 0.58779, 0.80902, 0.0
# load and process 41598
@@ -102,32 +102,32 @@ Useage
CopySample(InputWorkspace='WISH00041598_predict_peaks', OutputWorkspace='WISH00041598', CopyName=False, CopyMaterial=False, CopyEnvironment=False, CopyShape=False)
- # set gonio on 41598 and predict the peaks of 41599
+ # set gonio on 41598 and predict the peaks of 41599
SetGoniometer(Workspace='WISH00041598', Axis0='0,0,1,0,1', Axis1='25,{},{},{},-1'.format(u_phi_x, u_phi_y, u_phi_z))
PredictPeaks(InputWorkspace='WISH00041598', WavelengthMin=MinWavelength, WavelengthMax=MaxWavelength, MinDSpacing=MinDSpacing, ReflectionCondition=ReflectionCondition, OutputWorkspace='WISH00041599_predict_peaks')
# linkedUBs
LinkedUBs(QTolerance=QTolerance,
- QDecrement=QDecrement,
- DTolerance=DTolerance,
+ QDecrement=QDecrement,
+ DTolerance=DTolerance,
NumPeaks=NumPeaks,
PeakIncrement=PeakIncrement,
- Iterations=Iterations,
- a=a,
- b=b,
- c=c,
+ Iterations=Iterations,
+ a=a,
+ b=b,
+ c=c,
alpha=alpha,
beta=beta,
gamma=gamma,
MinWavelength=MinWavelength,
MaxWavelength=MaxWavelength,
- MinDSpacing=MinDSpacing,
+ MinDSpacing=MinDSpacing,
MaxDSpacing=MaxDSpacing,
ReflectionCondition=ReflectionCondition,
- Workspace='WISH00041599',
- ObservedPeaks='WISH00041599_find_peaks',
- PredictedPeaks='WISH00041599_predict_peaks',
- LinkedPeaks='WISH00041599_linked_peaks',
+ Workspace='WISH00041599',
+ ObservedPeaks='WISH00041599_find_peaks',
+ PredictedPeaks='WISH00041599_predict_peaks',
+ LinkedPeaks='WISH00041599_linked_peaks',
LinkedPredictedPeaks='WISH00041599_linked_peaks_predicted',
DeleteWorkspace=DeleteWorkspace)
diff --git a/docs/source/algorithms/LoadAndApplyMuonDetectorGrouping-v1.rst b/docs/source/algorithms/LoadAndApplyMuonDetectorGrouping-v1.rst
index 3ddff0a8e2437e3702c7569fb612d7a5f59bba37..b37c362a240127cd46f9c8a8d05eed1f825beeeb 100644
--- a/docs/source/algorithms/LoadAndApplyMuonDetectorGrouping-v1.rst
+++ b/docs/source/algorithms/LoadAndApplyMuonDetectorGrouping-v1.rst
@@ -16,7 +16,7 @@ The analysis is performed via the :ref:`algm-ApplyMuonDetectorGrouping` and :ref
Analysis
########
-All the grouping information (the groupings of detector IDs, and the pairs of groups) is loaded from the XML file specified by the **Filename** property. This information specifies how to perform grouping/pairing analysis on the contents of **InputWorkspace**, which are saved to **WorkspaceGroup**.
+All the grouping information (the groupings of detector IDs, and the pairs of groups) is loaded from the XML file specified by the **Filename** property. This information specifies how to perform grouping/pairing analysis on the contents of **InputWorkspace**, which are saved to **WorkspaceGroup**.
If WorkspaceGroup is not specified then the default format is "<INSTRUMENT><RUN NUMBER>" where for example if the data is from the "EMU" instrument for run number "12345" the name would be "EMU00012345", with the run numbers padded by zero up to 8 digits. If the instrument is not recognized (e.g. "LHC") run numbers below 100 are padded to three digits with zeros, so for run number 10 this would be "LHC010".
@@ -62,7 +62,7 @@ Usage
.. testcode:: ExMUSRPairAsymmetry
-
+
Output:
@@ -75,25 +75,25 @@ Output:
# Create the workspace group in which the analysed workspaces will be placed
ws = CreateSampleWorkspace()
wsGroup = GroupWorkspaces("ws")
- RenameWorkspace(
- InputWorkspace="wsGroup",
- OutputWorkspace='MUSR00015189',
+ RenameWorkspace(
+ InputWorkspace="wsGroup",
+ OutputWorkspace='MUSR00015189',
OverwriteExisting=True)
# Load the data
- LoadMuonNexus( Filename='MUSR00015189.nxs',
+ LoadMuonNexus( Filename='MUSR00015189.nxs',
OutputWorkspace='MuonAnalysis')
LoadAndApplyMuonDetectorGrouping(
- Filename='MUSRGrouping.xml',
- InputWorkspace='MuonAnalysis',
- WorkspaceGroup='MUSR00015189',
+ Filename='MUSRGrouping.xml',
+ InputWorkspace='MuonAnalysis',
+ WorkspaceGroup='MUSR00015189',
ApplyAsymmetryToGroups=False)
-
-
+
+
MUSR_asym = mtd["MUSR00015189; Pair; long; Asym; #1"]
-
+
print(map('{0:.2f}'.format, MUSR_asym.readY(0)[1:10]))
Output:
diff --git a/docs/source/algorithms/LoadAscii-v2.rst b/docs/source/algorithms/LoadAscii-v2.rst
index 263b65da527fe885f0ade4e0e3c24a3af96dbdc4..d37dbd857736bf551de2f021e2aa17213f37793f 100644
--- a/docs/source/algorithms/LoadAscii-v2.rst
+++ b/docs/source/algorithms/LoadAscii-v2.rst
@@ -49,8 +49,8 @@ The format must be (Table Workspace):
The following is an example valid file of two columns::
- # Instrument Name , Run Number
- # str , int
+ # Instrument Name , Run Number
+ # str , int
MUSR,10245
IRIS,8465
SANS2D,20462
diff --git a/docs/source/algorithms/LoadDNSLegacy-v1.rst b/docs/source/algorithms/LoadDNSLegacy-v1.rst
index 0e77d576bc0cac1a5526aaa38e760ae0516c5aae..ee6aa39111ae0bc7d77afa6f9f9db0d8433d524c 100644
--- a/docs/source/algorithms/LoadDNSLegacy-v1.rst
+++ b/docs/source/algorithms/LoadDNSLegacy-v1.rst
@@ -11,7 +11,7 @@ Description
.. warning::
- This algorithm is being developed for a specific instrument. It might get changed or even
+ This algorithm is being developed for a specific instrument. It might get changed or even
removed without a notification, should instrument scientists decide to do so.
This algorithm loads a DNS legacy data file into a :ref:`Workspace2D <Workspace2D>`. The loader rotates the detector bank
@@ -54,13 +54,13 @@ Alternatively, the text file with the coil currents table may be provided (optio
+--------------+----------+-------+-------+-------+-------+
| polarisation | comment | C_a | C_b | C_c | C_z |
+==============+==========+=======+=======+=======+=======+
-| x | 7 | 0 | -2 | -0.77 | 2.21 |
+| x | 7 | 0 | -2 | -0.77 | 2.21 |
+--------------+----------+-------+-------+-------+-------+
-| y | 7 | 0 | 1.6 | -2.77 | 2.21 |
+| y | 7 | 0 | 1.6 | -2.77 | 2.21 |
+--------------+----------+-------+-------+-------+-------+
-| z | 7 | 0 | 0.11 | -0.50 | 0 |
+| z | 7 | 0 | 0.11 | -0.50 | 0 |
+--------------+----------+-------+-------+-------+-------+
-| x | 7 | 0 | -2.1 | -0.97 | 2.21 |
+| x | 7 | 0 | -2.1 | -0.97 | 2.21 |
+--------------+----------+-------+-------+-------+-------+
First row must contain the listed column headers, other rows contain coil currents for each polarisation. Rows with different currents for one polarisation are allowed. Columns are separated by tab symbols.
diff --git a/docs/source/algorithms/LoadDetectorInfo-v1.rst b/docs/source/algorithms/LoadDetectorInfo-v1.rst
index 7fff57ebb66989bc47fdd0d1dcf8dc22717c39b3..a8d10e0dcc8832332e65868486290db1ff416eee 100644
--- a/docs/source/algorithms/LoadDetectorInfo-v1.rst
+++ b/docs/source/algorithms/LoadDetectorInfo-v1.rst
@@ -22,18 +22,18 @@
Description
------------
-The algorithm loads specific detector properties and, if *RelocateDets* property is true, the detector positions into the instrument,
+The algorithm loads specific detector properties and, if *RelocateDets* property is true, the detector positions into the instrument,
attached to the target workspace and modifies these properties as described below.
The detection time delay for each detector is subtracted from the time of flight bin boundaries in the spectrum associated with that detector.
-It is required that all the monitors have the same time delay and if this is non-zero the delay time is added to all TOF values.
-It is important that the units of the input workspace are TOF in microseconds, that :ref:`algm-GroupDetectors`
+It is required that all the monitors have the same time delay and if this is non-zero the delay time is added to all TOF values.
+It is important that the units of the input workspace are TOF in microseconds, that :ref:`algm-GroupDetectors`
has not been run and this algorithm is only applied once to a workspace.
-Values for the partial pressure of **3He** and **wall thickness** are added into the parameter map for each detector
+Values for the partial pressure of **3He** and **wall thickness** are added into the parameter map for each detector
in a form that can be read by :ref:`algm-DetectorEfficiencyCor`. That is, the values are assumed to be in atmospheres
and meters, respectively, and the properties are stored internally in the workspace parameter map as **3He(atm)** and **wallT(m)**.
-The values are likely to be read from the same **RAW** file that the workspace was loaded from or a
+The values are likely to be read from the same **RAW** file that the workspace was loaded from or a
**DAT** file that corresponds to the same run or series of experimental runs.
Spectra whose associated detector data are not found in the input **DAT** or **RAW** file will not have their
@@ -42,12 +42,12 @@ the algorithm will continue to process data as normal but a warning will be writ
Detectors that are listed in the input file but do not exist in the instrument definition file will be ignored and details will be written to the log.
If all the time offsets are the same and the file **appears** to contain enough data for all detectors
-all detector spectra will use same bin boundaries, where possible.
+all detector spectra will use same bin boundaries, where possible.
This will make the algorithm run much more quickly and use less memory.
-When using a **RAW** file the time offset for each detector is read from the "hold off" table in the file's
-header while pressure and wall thickness data must be present in the user table array.
-The format for **.DAT** files is specified in the document **DETECTOR.DAT format** written by Prof G Toby Perring and briefly described below.
+When using a **RAW** file the time offset for each detector is read from the "hold off" table in the file's
+header while pressure and wall thickness data must be present in the user table array.
+The format for **.DAT** files is specified in the document **DETECTOR.DAT format** written by Prof G Toby Perring and briefly described below.
If the RelocateDets option is set to true, (it is false by default)
then the detectors are moved to the corresponding positions specified in the data file provided.
@@ -61,17 +61,17 @@ See :ref:`algm-UpdateInstrumentFromFile` which can do similar job in modifying t
#############################
The the detector data can be stored as ASCII or `NeXus <http://download.nexusformat.org/>`_ data file. It contains roughly corresponds
-to the detector.dat file, present on the instrument and written to the run files. The contents of these data can be overwritten by the file,
+to the detector.dat file, present on the instrument and written to the run files. The contents of these data can be overwritten by the file,
provided as input for this algorithm
-The description of the ASCII DETECTOR.dat file is provided in the table below. Nexus file format can come in two flavors.
+The description of the ASCII DETECTOR.dat file is provided in the table below. Nexus file format can come in two flavors.
The first one is completely equivalent to the ASCII 19 column data format and introduced to increase the speed of accessing these data in binary format,
-where the second one left for the compatibility with Libisis.
-It has meaningful data corresponding to the columns 1-6, 17&18 below, but does not support multiple tube pressures and wall thickness.
+where the second one left for the compatibility with Libisis.
+It has meaningful data corresponding to the columns 1-6, 17&18 below, but does not support multiple tube pressures and wall thickness.
-The :ref:`algm-LoadDetectorInfo` algorithm currently reads and interprets rows 1-6,17&18 of the table,
-provided below (or columns of det.dat file) or correspondent data blocks from the NeXus file.
-It also does not understand the short (15 columns) MARI detector.dat ASCII file format (see **ISIS detector.dat files** below).
+The :ref:`algm-LoadDetectorInfo` algorithm currently reads and interprets rows 1-6,17&18 of the table,
+provided below (or columns of det.dat file) or correspondent data blocks from the NeXus file.
+It also does not understand the short (15 columns) MARI detector.dat ASCII file format (see **ISIS detector.dat files** below).
Co-ordinate frames
##################
@@ -85,7 +85,7 @@ For the purposes of the detector table we choose a right handed set of axes fixe
Centers of each detector element are defined in spherical polar co-ordinates as seen from the sample position:
- **THETA** -- Polar angle measured from the z-axis (what we would normally call the scattering angle PHI). Note that 0< **THETA** <180
-- **PHI** -- Azimuthal angle measured from the x-axis in a right handed sense (what TGP, CDF and RD01 call -BETA).
+- **PHI** -- Azimuthal angle measured from the x-axis in a right handed sense (what TGP, CDF and RD01 call -BETA).
For example, the West Bank of HET has PHI=0, the North Bank has PHI=90, the South Bank has PHI=270.
To specify the orientation of a detector, define axes x', y', z' as follows:
@@ -94,14 +94,14 @@ To specify the orientation of a detector, define axes x', y', z' as follows:
- y'-axis -- increasing PHI
- z'-axis -- parallel to the line joining sample and detector
-The natural coordinate frame for the detector, xd, yd, zd, may not coincide with x', y', z'.
+The natural coordinate frame for the detector, xd, yd, zd, may not coincide with x', y', z'.
For example, the natural frame for a gas tube is with zd along the axis of the tube, and the direction of xd chosen to be perpendicular to the line joining the detector with the sample.
The characteristic dimensions of the detector, W_x, W_y, W_z, are given in the frame xd, yd, zd.
The detector coordinate axes xd, yd, zd are related to x', y', z' by a rotation.
The transformation is be expressed by a three-component vector :math:`\alpha_{x},\alpha_{y},\alpha_{z}`,
-where the magnitude of the vector gives the angle of rotation in a right-hand sense,
-and the normalized elements give the components along x', y', z' of the unit vector about which the rotation takes place.
-The magnitude of the vector is in degrees.
+where the magnitude of the vector gives the angle of rotation in a right-hand sense,
+and the normalized elements give the components along x', y', z' of the unit vector about which the rotation takes place.
+The magnitude of the vector is in degrees.
- e.g. non-PSD gas tube on the Debye-Scherrer cone:
:math:`\alpha_{x} = -90^{o};\alpha_{y} = \alpha_{z} = 0^{o}; W_{x}=W_{y}= 0.0254, W_{z}=0.300`
@@ -216,12 +216,12 @@ ISIS DETECTOR.DAT raw files
The ISIS raw files seem to have two possible entries - MARI is non-standard for some reason. The table below describes correspondence between the fields
-in ASCII file above and the data containing in DETECTOR.DAT file present on data acquisition machine and the data written to the RAW file on different ISIS instruments.
+in ASCII file above and the data containing in DETECTOR.DAT file present on data acquisition machine and the data written to the RAW file on different ISIS instruments.
+----+--------------+------------------+---------------+
| | Field | Field name in RAW file |
-+----+--------------+------------------+---------------+
-| | Name in | All instruments: | MARI fields: |
++----+--------------+------------------+---------------+
+| | Name in | All instruments: | MARI fields: |
| N | ASCII file, | Fields in use:14 | In use:10. |
| | table above | ASCII ncol:19 | ASCII ncol:15 |
+====+==============+==================+===============+
@@ -263,30 +263,30 @@ in ASCII file above and the data containing in DETECTOR.DAT file present on data
+----+--------------+------------------+---------------+
| 19 | det_4 | ut14 | ut10 |
+----+--------------+------------------+---------------+
-
-
+
+
Usage
------------
**Example - LoadDetectorInfo:**
Calibrate **MARI** using full format detector calibration file.
-Note, that :ref:`algm-LoadDetectorInfo` algorithm does not modify the monitors. Test test below provides calibration file for six detectors and test output shows,
-that the first three detectors (monitors) were not touched and the next three were completely modified.
+Note, that :ref:`algm-LoadDetectorInfo` algorithm does not modify the monitors. Test test below provides calibration file for six detectors and test output shows,
+that the first three detectors (monitors) were not touched and the next three were completely modified.
.. testcode:: exLoadDetectorInfo
-
+
import math
import os
-
+
# printing procedure
def write_detectors(instr_type,instr,ndet):
''' print first ndet detectors from given instrument '''
print("{0} {1} instrument".format(instr_type, instr.getName()))
print('det ID | monitor? | polar angle| position X | position Y | position Z | Pressure | Wall thick |')
-
- # get first nder detectors using detector ID
+
+ # get first nder detectors using detector ID
for i in range(0,ndet):
if i<3:
detBase = 1
@@ -300,12 +300,12 @@ that the first three detectors (monitors) were not touched and the next three we
print(' {0:5} | {1:8} | {2:10.3f} | {3:>10.3f} | {4:>10.3f} | {5:>10.3f} | {6:10} | {7:10} |'.format(\
detID,det1.isMonitor(),(det1.getPhi()*(180/math.pi)),pos.X(),pos.Y(),pos.Z(),pressure[0],thickness[0]))
print('*********************************************************************************')
- #
+ #
def prepare_test_detector(ind):
""" prepare modified detector with random test values """
if ind<3:
detBase = 1
- offset=0;
+ offset=0;
l2 = -10 # incorrect L2 for testing changes
code=1
theta = 180 # incorrect theta for testing changes
@@ -331,9 +331,9 @@ that the first three detectors (monitors) were not touched and the next three we
det2 = 15 # incorrect tube pressure for testing changes
det3 = 0.9 # incorrect wall thickness for testing changes
det4 = 666 # incorrect for testing changes
-
+
return (detBase,offset,l2,code,theta,phi,w_xyz,f_xyz,a_xyz,det1,det2,det2,det4)
-
+
def write_test_cal_file(filename,instrument,ndet):
""" writes partial detector.dat file modified for testing purposes
@@ -346,7 +346,7 @@ that the first three detectors (monitors) were not touched and the next three we
f.write("Full format DETECTOR.DAT generated by CREATE_DETECTOR_FILE (part of it written for testing purposes)");
f.write("{0} 14\n".format(ndet))
f.write("det no. offset l2 code theta phi w_x w_y w_z f_x f_y f_z a_x a_y a_z det_1 det_2 det_3 det4\n");
-
+
for i in range(0,ndet):
detBase,offset,l2,code,theta,phi,w_xyz,f_xyz,a_xyz,det1,det2,det3,det4=prepare_test_detector(i);
detID = detBase+i
@@ -354,34 +354,34 @@ that the first three detectors (monitors) were not touched and the next three we
detID,offset,l2,code,theta,phi,w_xyz,w_xyz,w_xyz,f_xyz,f_xyz,f_xyz,a_xyz,a_xyz,a_xyz,a_xyz,det1,det2,det3,det4))
# end write loop
f.close()
-
- #-------------------- ------------------------------------------------------------------
+
+ #-------------------- ------------------------------------------------------------------
# TEST THE ALGORITHM
- #--------------------------------------------------------------------------------------
+ #--------------------------------------------------------------------------------------
# create sample workspace
- ws=CreateSampleWorkspace();
- #--------------------------------------------------------------------------------------
+ ws=CreateSampleWorkspace();
+ #--------------------------------------------------------------------------------------
# load MARI
- det=LoadInstrument(ws,InstrumentName='MARI', RewriteSpectraMap=True)
- inst1=ws.getInstrument();
- #
+ det=LoadInstrument(ws,InstrumentName='MARI', RewriteSpectraMap=True)
+ inst1=ws.getInstrument();
+ #
write_detectors('unCalibrated',inst1,10);
- #--------------------------------------------------------------------------------------
+ #--------------------------------------------------------------------------------------
# Prepare calibration file changing first 6 detectors & monitors
file_name = 'mari_det.dat'
write_test_cal_file(file_name ,inst1,6);
- #--------------------------------------------------------------------------------------
+ #--------------------------------------------------------------------------------------
# CALIBRATE mari using full det.dat calibration file
LoadDetectorInfo(ws,DataFilename=file_name,RelocateDets=True);
inst1=ws.getInstrument();
- #--------------------------------------------------------------------------------------
+ #--------------------------------------------------------------------------------------
# look at the result:
write_detectors('Calibrated',inst1,10);
-
+
.. testcleanup:: exLoadDetectorInfo
- os.remove(file_name)
+ os.remove(file_name)
**Output:**
diff --git a/docs/source/algorithms/LoadEMU-v1.rst b/docs/source/algorithms/LoadEMU-v1.rst
index c3d7a711b723cb2be981455e48e38c2a8a1c7b66..d745f11d692e9b717f55cb043fedfe5adce64a66 100644
--- a/docs/source/algorithms/LoadEMU-v1.rst
+++ b/docs/source/algorithms/LoadEMU-v1.rst
@@ -30,7 +30,7 @@ Output:
Number of spectra: 6528
-
+
.. categories::
.. sourcelink::
\ No newline at end of file
diff --git a/docs/source/algorithms/LoadElementalAnalysisData-v1.rst b/docs/source/algorithms/LoadElementalAnalysisData-v1.rst
index 5a31dc3c787fa559efc369b86d4228bc321f3819..ea8a27d3557c6a05b9eed85919067a2013569567 100644
--- a/docs/source/algorithms/LoadElementalAnalysisData-v1.rst
+++ b/docs/source/algorithms/LoadElementalAnalysisData-v1.rst
@@ -10,8 +10,8 @@ Description
-----------
The LoadElementalAnalysisData algorithm loads data from .dat files for the run chosen into a single
-:ref:`WorkspaceGroup <WorkspaceGroup>` containing a :ref:`Workspace <Workspace>` for each Detector identified. Each :ref:`Workspace <Workspace>` contains the identified spectra
-results. The name of the :ref:`WorkspaceGroup <WorkspaceGroup>` depends on the setting of GroupWorkspace. The path of the directory where the .dat files are located is provided
+:ref:`WorkspaceGroup <WorkspaceGroup>` containing a :ref:`Workspace <Workspace>` for each Detector identified. Each :ref:`Workspace <Workspace>` contains the identified spectra
+results. The name of the :ref:`WorkspaceGroup <WorkspaceGroup>` depends on the setting of GroupWorkspace. The path of the directory where the .dat files are located is provided
as an output property.
The algorithm searches the Data Search Directories for .dat files for the run specified. File names must be in the format 'ral[run number].rooth[detector number, spectra number].dat'.
diff --git a/docs/source/algorithms/LoadEmptyInstrument-v1.rst b/docs/source/algorithms/LoadEmptyInstrument-v1.rst
index f0b86511e64d68355c97f622197639b464fd08f1..acc27e23ff57ec89f36e312353cd696ca5481de3 100644
--- a/docs/source/algorithms/LoadEmptyInstrument-v1.rst
+++ b/docs/source/algorithms/LoadEmptyInstrument-v1.rst
@@ -10,7 +10,7 @@ Description
-----------
This algorithm is to enable you to inspect the instrument geometry without having
-to load a full data file.
+to load a full data file.
This algorithm works with both :ref:`Instrument Definition Files <InstrumentDefinitionFile>` and `NeXus format <https://www.nexusformat.org/>`_ (hdf5) files.
diff --git a/docs/source/algorithms/LoadEventNexus-v1.rst b/docs/source/algorithms/LoadEventNexus-v1.rst
index 8e000b2fb4ffa593297622206277cac556f7c39e..92a47856b14eff5356bd6371f674d7f85ba621f6 100644
--- a/docs/source/algorithms/LoadEventNexus-v1.rst
+++ b/docs/source/algorithms/LoadEventNexus-v1.rst
@@ -27,15 +27,15 @@ also loaded using :ref:`LoadNexusLogs <algm-LoadNexusLogs>`.
**Instrument geometry**
-There are a series of approaches for extracting the instrument geometry.
+There are a series of approaches for extracting the instrument geometry.
These follow the escalation path as follows:
-- Tries to load embedded instrument_xml from the NXinstrument if present
+- Tries to load embedded instrument_xml from the NXinstrument if present
using :ref:`LoadIDFFromNexus <algm-LoadIDFFromNexus>`.
- Else tries to load embedded nexus geometry from the NXinstrument if present
-- Else tries to load the instrument using the name extracted from NXinstrument
+- Else tries to load the instrument using the name extracted from NXinstrument
-The latter two possibilities are achieved via
+The latter two possibilities are achieved via
:ref:`LoadInstrument <algm-LoadInstrument>`
Optional properties
diff --git a/docs/source/algorithms/LoadFullprofFile-v1.rst b/docs/source/algorithms/LoadFullprofFile-v1.rst
index 1bd0a740c3078bc549c9a87b8af819b00638b14e..9b571d57bdeb02b0fa7e4402ba5e5ad452c2cff2 100644
--- a/docs/source/algorithms/LoadFullprofFile-v1.rst
+++ b/docs/source/algorithms/LoadFullprofFile-v1.rst
@@ -86,18 +86,18 @@ Output:
LoadFullprofFile(Filename=r'LB4854b3.hkl',
PeakParameterWorkspace='LaB6_Ref_Table',
OutputWorkspace='Fake')
-
+
fakedataws = mtd["Fake"]
reftablews = mtd["LaB6_Ref_Table"]
-
+
print("Reflection table imported {} peaks. Faked data workspace contains {} data points.".format(
reftablews.rowCount(), len(fakedataws.readX(0))))
-
+
index = 0
- print("Peak {} of ({}, {}, {}): Alpha = {:.5f}, Beta = {:.5f}, FWHM = {:.5f}".format(index, reftablews.cell(index, 0),
+ print("Peak {} of ({}, {}, {}): Alpha = {:.5f}, Beta = {:.5f}, FWHM = {:.5f}".format(index, reftablews.cell(index, 0),
reftablews.cell(index, 1), reftablews.cell(index, 2), reftablews.cell(index, 3), reftablews.cell(index, 4), reftablews.cell(index, 7)))
index = 75
- print("Peak {} of ({}, {}, {}): Alpha = {:.5f}, Beta = {:.5f}, FWHM = {:.5f}".format(index, reftablews.cell(index, 0),
+ print("Peak {} of ({}, {}, {}): Alpha = {:.5f}, Beta = {:.5f}, FWHM = {:.5f}".format(index, reftablews.cell(index, 0),
reftablews.cell(index, 1), reftablews.cell(index, 2), reftablews.cell(index, 3), reftablews.cell(index, 4), reftablews.cell(index, 7)))
diff --git a/docs/source/algorithms/LoadFullprofResolution-v1.rst b/docs/source/algorithms/LoadFullprofResolution-v1.rst
index 53081fe10c8362fa2074181b0bb3eb7cc41efbc7..d295a8ba25c002a0837f740a343b7ac9214230ed 100644
--- a/docs/source/algorithms/LoadFullprofResolution-v1.rst
+++ b/docs/source/algorithms/LoadFullprofResolution-v1.rst
@@ -57,9 +57,9 @@ Usage
print("Beta0 type = {}".format(inst.getParameterType('Beta0')))
print("SigmaSquared type = {}".format(inst.getParameterType('SigmaSquared')))
- # As of the time of writing,
- # fitting instrument parameters cannot be
- # accessed through the python API.
+ # As of the time of writing,
+ # fitting instrument parameters cannot be
+ # accessed through the python API.
# They can be accessed via the file in the lext line, if uncommented:
#SaveParameterFile(ws[0][0], "instParam.xml")
diff --git a/docs/source/algorithms/LoadHKL-v1.rst b/docs/source/algorithms/LoadHKL-v1.rst
index 6222531baef2c1a9d2b811a0d35fc6a28fb930f6..da63ca3362e9589edbc98cd6a4a360d9be00787c 100644
--- a/docs/source/algorithms/LoadHKL-v1.rst
+++ b/docs/source/algorithms/LoadHKL-v1.rst
@@ -13,7 +13,7 @@ Loads an ASCII .hkl file to a PeaksWorkspace.
HKL File Format
###############
-
+
File has same format that works successfully in GSAS and SHELX from
ISAW:
diff --git a/docs/source/algorithms/LoadIDFFromNexus-v1.rst b/docs/source/algorithms/LoadIDFFromNexus-v1.rst
index a133d05d647678f2e6f56d1aa38984166a8cd423..56e77bd2d12cbe4566ab272bd40fb3023fae6c95 100644
--- a/docs/source/algorithms/LoadIDFFromNexus-v1.rst
+++ b/docs/source/algorithms/LoadIDFFromNexus-v1.rst
@@ -12,19 +12,19 @@ Description
Some Nexus files contain an instrument definition. This algorithm loads
the instrument from this definition. You may need to tell this algorithm
where in the Nexus file to find the Instrument folder that contains
-the instrument definition.
+the instrument definition.
-It also looks to see if it contains a separate instrument parameter map.
+It also looks to see if it contains a separate instrument parameter map.
If yes this is loaded. If no, the algorithm will
attempt to load on parameter file on your disk from your instrument folder
-with the name INST_Parameters.xml.
-This may be overridden by a parameter correction file, which can be
+with the name INST_Parameters.xml.
+This may be overridden by a parameter correction file, which can be
used to correct out of date embedded parameters.
A parameter correction file contains a list of parameter files,
-each with a non-overlapping date range and an append flag.
+each with a non-overlapping date range and an append flag.
If a parameter correction file is found,
-its list is compared to the workspace's run start date.
+its list is compared to the workspace's run start date.
If this date occurs within one of the date ranges, the file with that date range
is used as the parameter file.
This parameter file must be in the same directory as the correction file.
@@ -58,7 +58,7 @@ Usage
inst2 = ws_2.getInstrument()
comp2 = inst2.getComponentByName("both rings")
print("Unmodified component name = {}".format(comp2.getName()))
-
+
Output:
.. testoutput:: ExLoadIDFFromnNexusSimple
diff --git a/docs/source/algorithms/LoadISISNexus-v2.rst b/docs/source/algorithms/LoadISISNexus-v2.rst
index 1347edd2b4769b3460989a0a27751814a0be8588..7b434b2e66c965cda6d8b97b1a6e42aed7c53f9d 100644
--- a/docs/source/algorithms/LoadISISNexus-v2.rst
+++ b/docs/source/algorithms/LoadISISNexus-v2.rst
@@ -20,7 +20,7 @@ The nexus file must have a ``raw_data_1`` top-level entry to be loaded.
The workspace data is loaded from ``raw_data_1/Detector_1``.
-Instrument information is loaded from ``raw_data_1/Instrument`` if available in file,
+Instrument information is loaded from ``raw_data_1/Instrument`` if available in file,
otherwise :ref:`instrument information <InstrumentDefinitionFile>` is read from a MantidInstall instrument directory.
If the main entry contains a ``/isis_vms_compat`` the following entries will be read by the Algorithm:
@@ -46,7 +46,7 @@ the main entry, i.e ``/group`` is equivalent to ``raw_data_1/group``.
| Description of Data | Found in Nexus file | Placed in Workspace (Workspace2D) |
| | (within 'raw_data_1') | |
+==============================+===========================================+=====================================+
-| Monitor Data | within groups of Class NXMonitor | Monitor histogram data (loaded |
+| Monitor Data | within groups of Class NXMonitor | Monitor histogram data (loaded |
| | (one monitor per group) | depending on prop. LoadMonitors) |
+------------------------------+-------------------------------------------+-------------------------------------+
| Detector Data | group ``Detector_1`` | Histogram Data |
@@ -59,8 +59,8 @@ the main entry, i.e ``/group`` is equivalent to ``raw_data_1/group``.
Run Object
''''''''''
-LoadISISNexus executes :ref:`algm-LoadNexusLogs` to load run logs from the Nexus ``runlog`` or some other appropriate group.
-It also loads the Nexus ``raw_data_1/periods/proton_charge`` group
+LoadISISNexus executes :ref:`algm-LoadNexusLogs` to load run logs from the Nexus ``runlog`` or some other appropriate group.
+It also loads the Nexus ``raw_data_1/periods/proton_charge`` group
into the ``proton_charge_by_period`` property of the workspace run object.
Properties of the workspace :ref:`Run <Run>` object are loaded as follows:
@@ -93,7 +93,7 @@ Properties of the workspace :ref:`Run <Run>` object are loaded as follows:
The group (data) indicates that the number is obtained from the histogram data in an appropriate manner.
-``IRPB`` and ``RRPB`` point to the same data. In ``IRPB``, the data is seen as 32-bit integer
+``IRPB`` and ``RRPB`` point to the same data. In ``IRPB``, the data is seen as 32-bit integer
and in RRPB it is seen as 32-bit floating point (same 32 bits).
In all cases, integers are passed. The 32-bit floating point numbers are used only to store larger integers.
diff --git a/docs/source/algorithms/LoadInstrumentFromNexus-v1.rst b/docs/source/algorithms/LoadInstrumentFromNexus-v1.rst
index 3abeea400bac981dc04d94eedb1f68b501b9b003..bd6f5e125ea99020d82ef0c4d6c2a039884c0611 100644
--- a/docs/source/algorithms/LoadInstrumentFromNexus-v1.rst
+++ b/docs/source/algorithms/LoadInstrumentFromNexus-v1.rst
@@ -9,12 +9,12 @@
Description
-----------
-Attempts to load information about the instrument from a ISIS NeXus file.
-In particular, it attempts to read the reference frame axis.
+Attempts to load information about the instrument from a ISIS NeXus file.
+In particular, it attempts to read the reference frame axis.
Also adds dummy source and samplepos components to instrument.
LoadInstrumentFromNexus is intended to be used as a child algorithm of
-other Load algorithms, rather than being used directly.
+other Load algorithms, rather than being used directly.
Usage
-----
diff --git a/docs/source/algorithms/LoadInstrumentFromRaw-v1.rst b/docs/source/algorithms/LoadInstrumentFromRaw-v1.rst
index 10277281419d3e77d88e045a192e0217021063bc..055ddf98fa7faf0875553d400e8b6a1a600ce767 100644
--- a/docs/source/algorithms/LoadInstrumentFromRaw-v1.rst
+++ b/docs/source/algorithms/LoadInstrumentFromRaw-v1.rst
@@ -15,8 +15,8 @@ add detectors which are positioned relative to the sample in spherical
coordinates as (r,theta,phi)=(L2,2-theta,0.0). Also adds dummy source and
samplepos components to instrument.
-LoadInstrumentFromRaw is intended to be used as a child algorithm of
-other Load algorithms, rather than being used directly.
+LoadInstrumentFromRaw is intended to be used as a child algorithm of
+other Load algorithms, rather than being used directly.
Usage
-----
diff --git a/docs/source/algorithms/LoadIsawDetCal-v1.rst b/docs/source/algorithms/LoadIsawDetCal-v1.rst
index b685a6b115ea812a4594c68786056e41ddc4a944..5c4f05f695ae2d9cd9145e7429cf50c5fab99408 100644
--- a/docs/source/algorithms/LoadIsawDetCal-v1.rst
+++ b/docs/source/algorithms/LoadIsawDetCal-v1.rst
@@ -14,31 +14,31 @@ the rotated plane from an ISAW DetCal file.
Usage
-----
-
+
.. testcode:: LoadIsawDetCal
-
- #Write a ISAW DetCal file
- import mantid
+
+ #Write a ISAW DetCal file
+ import mantid
filename=mantid.config.getString("defaultsave.directory")+"loadIsawDetCalTest.DetCal"
- f=open(filename,'w')
+ f=open(filename,'w')
f.write("5 1 256 256 50.1000 49.9000 0.2000 55.33 50.0000 16.7548 -16.7548 0.00011 -0.00002 1.00000 0.00000 1.00000 0.00000\n")
- f.close()
-
+ f.close()
+
iw = LoadEmptyInstrument(Filename="unit_testing/MINITOPAZ_Definition.xml",)
LoadIsawDetCal(InputWorkspace=iw,FileName=filename)
bank = iw.getInstrument().getComponentByName("bank1")
print("Position after LoadDetCal : {}".format(bank.getPos()))
-
+
.. testcleanup:: LoadIsawDetCal
-
- import os,mantid
+
+ import os,mantid
filename=mantid.config.getString("defaultsave.directory")+"loadIsawDetCalTest.DetCal"
os.remove(filename)
-
+
Output:
-
+
.. testoutput:: LoadIsawDetCal
-
+
Position after LoadDetCal : [0.5,0.167548,-0.167548]
.. categories::
diff --git a/docs/source/algorithms/LoadIsawSpectrum-v1.rst b/docs/source/algorithms/LoadIsawSpectrum-v1.rst
index a5fb42498577004698042e635f7a1efb7f209c7f..34df3d3a7a32602e176ca0062852776f439c9a0a 100644
--- a/docs/source/algorithms/LoadIsawSpectrum-v1.rst
+++ b/docs/source/algorithms/LoadIsawSpectrum-v1.rst
@@ -18,37 +18,37 @@ Usage
.. testcode:: LoadIsawSpectrum
- #Write a ISAW Spectrum file
- import mantid
- filename=mantid.config.getString("defaultsave.directory")+"loadIsawSpectrumTest.dat"
- f=open(filename,'w')
- f.write("# Column Unit Quantity\n")
- f.write("# ------ ------ --------\n")
- f.write("# 1 us time-of-flight\n")
- f.write("# 2 counts counts per us corrected for vanadium rod absorption\n")
- f.write("# 3 A wavelength\n")
- f.write("# 4 counts counts per us uncorrected for absorption\n")
- f.write("# 5 transmission\n")
- f.write("#\n")
- f.write("Bank 1 DetNum 17\n")
- f.write(" 400.000 -23.878 0.0856 -22.409 0.9385\n")
- f.write(" 401.600 -23.878 0.0859 -22.409 0.9385\n")
- f.write(" 403.200 -23.879 0.0863 -22.409 0.9385\n")
- f.write(" 404.800 -23.879 0.0866 -22.409 0.9385\n")
- f.write(" 406.400 -23.879 0.0870 -22.409 0.9384\n")
- f.write(" 408.000 -21.966 0.0873 -20.614 0.9384\n")
- f.close()
-
-
+ #Write a ISAW Spectrum file
+ import mantid
+ filename=mantid.config.getString("defaultsave.directory")+"loadIsawSpectrumTest.dat"
+ f=open(filename,'w')
+ f.write("# Column Unit Quantity\n")
+ f.write("# ------ ------ --------\n")
+ f.write("# 1 us time-of-flight\n")
+ f.write("# 2 counts counts per us corrected for vanadium rod absorption\n")
+ f.write("# 3 A wavelength\n")
+ f.write("# 4 counts counts per us uncorrected for absorption\n")
+ f.write("# 5 transmission\n")
+ f.write("#\n")
+ f.write("Bank 1 DetNum 17\n")
+ f.write(" 400.000 -23.878 0.0856 -22.409 0.9385\n")
+ f.write(" 401.600 -23.878 0.0859 -22.409 0.9385\n")
+ f.write(" 403.200 -23.879 0.0863 -22.409 0.9385\n")
+ f.write(" 404.800 -23.879 0.0866 -22.409 0.9385\n")
+ f.write(" 406.400 -23.879 0.0870 -22.409 0.9384\n")
+ f.write(" 408.000 -21.966 0.0873 -20.614 0.9384\n")
+ f.close()
+
+
ow = LoadIsawSpectrum(SpectraFile=filename,InstrumentName="TOPAZ")
-
- #check the results
+
+ #check the results
print("x= {}".format(ow.readX(0)))
print("y= {}".format(ow.readY(0)))
-
+
.. testcleanup:: LoadIsawSpectrum
- import os,mantid
+ import os,mantid
filename=mantid.config.getString("defaultsave.directory")+"loadIsawSpectrumTest.dat"
os.remove(filename)
diff --git a/docs/source/algorithms/LoadLogPropertyTable-v1.rst b/docs/source/algorithms/LoadLogPropertyTable-v1.rst
index f34dde7c6825fd6aba017333a143b24b8c8bafcb..6f17cea3ab03850d90e3f130f93e537202563e35 100644
--- a/docs/source/algorithms/LoadLogPropertyTable-v1.rst
+++ b/docs/source/algorithms/LoadLogPropertyTable-v1.rst
@@ -39,7 +39,7 @@ Usage
**Example:**
.. testcode:: Exlogtable
-
+
def print_table_workspace(wsOut):
print(" ".join(wsOut.getColumnNames()[i]
for i in range(wsOut.columnCount())))
@@ -48,12 +48,12 @@ Usage
print(" ".join(str(wsOut.column(i)[rowIndex])
for i in range(wsOut.columnCount())))
- wsComment = LoadLogPropertyTable(FirstFile = "MUSR00015189.nxs",
+ wsComment = LoadLogPropertyTable(FirstFile = "MUSR00015189.nxs",
LastFile = "MUSR00015193.nxs", LogNames="comment")
print("The comments of all the files")
print_table_workspace(wsComment)
- wsMultiple = LoadLogPropertyTable(FirstFile = "MUSR00015189.nxs",
+ wsMultiple = LoadLogPropertyTable(FirstFile = "MUSR00015189.nxs",
LastFile = "MUSR00015193.nxs", LogNames="Temp_Sample,dur")
print("\nThe Temp_Sample and dur logs")
print_table_workspace(wsMultiple)
diff --git a/docs/source/algorithms/LoadMD-v1.rst b/docs/source/algorithms/LoadMD-v1.rst
index 0efa702d369ffbd9f3dcf7199b95b4142251ea17..8e5324420522ab2861f82467032777f7e5d244c4 100644
--- a/docs/source/algorithms/LoadMD-v1.rst
+++ b/docs/source/algorithms/LoadMD-v1.rst
@@ -13,11 +13,11 @@ This algorithm loads a :ref:`MDEventWorkspace <MDWorkspace>` that was
previously saved using the :ref:`algm-SaveMD` algorithm to a .nxs file
format.
-If the workspace is too large to fit into memory, You can load the workspace
-as a :ref:`file-backed MDWorkspace <MDWorkspace File Backed>` by checking the
-FileBackEnd option. This will load the box structure (allowing for some
-visualization with no speed penalty) but leave the events on disk until
-requested. Processing file-backed MDWorkspaces is significantly slower than
+If the workspace is too large to fit into memory, You can load the workspace
+as a :ref:`file-backed MDWorkspace <MDWorkspace File Backed>` by checking the
+FileBackEnd option. This will load the box structure (allowing for some
+visualization with no speed penalty) but leave the events on disk until
+requested. Processing file-backed MDWorkspaces is significantly slower than
in-memory workspaces due to frequent file access!
For file-backed workspaces, the Memory option allows you to specify a
@@ -35,13 +35,13 @@ Usage
.. testcode:: ExLoadMD
- # Load sample MDEvent workspace, present in Mantid unit tests
+ # Load sample MDEvent workspace, present in Mantid unit tests
mdws = LoadMD('MAPS_MDEW.nxs');
-
+
# Check results
print("Workspace type is: {}".format(mdws.id()))
print("Workspace has:{0:2} dimensions and contains: {1:4} MD events".format(mdws.getNumDims(),mdws.getNEvents()))
-
+
Output:
.. testoutput:: ExLoadMD
diff --git a/docs/source/algorithms/LoadMLZ-v1.rst b/docs/source/algorithms/LoadMLZ-v1.rst
index 8efb00dbc4965ab958380542cbc0c06465459100..a779a86b0af0edeea3e38380a40f777589987713 100644
--- a/docs/source/algorithms/LoadMLZ-v1.rst
+++ b/docs/source/algorithms/LoadMLZ-v1.rst
@@ -31,7 +31,7 @@ Usage
print("Name of the instrument: {}".format(ws.getInstrument().getName()))
print("Number of spectra: {}".format(ws.getNumberHistograms()))
-
+
Output:
diff --git a/docs/source/algorithms/LoadMappingTable-v1.rst b/docs/source/algorithms/LoadMappingTable-v1.rst
index d77554517ca4537642de39fbff1f9b1b3bc550f5..ca870a110b0ac9eeef0297f99d9792d614e250dc 100644
--- a/docs/source/algorithms/LoadMappingTable-v1.rst
+++ b/docs/source/algorithms/LoadMappingTable-v1.rst
@@ -26,7 +26,7 @@ Usage
-----
.. testcode::
-
+
# Create a workspace
ws = CreateSampleWorkspace()
# Replace the instrument in the workspace with HRPD
diff --git a/docs/source/algorithms/LoadMcStas-v1.rst b/docs/source/algorithms/LoadMcStas-v1.rst
index d8edddbd827fd3035e4703e9ef7229333f601d1c..ad16d99934cc8d791fbfe869451314f3715600c4 100644
--- a/docs/source/algorithms/LoadMcStas-v1.rst
+++ b/docs/source/algorithms/LoadMcStas-v1.rst
@@ -9,8 +9,8 @@
Description
-----------
-Reads a McStas Nexus file into a Mantid WorkspaceGroup with the name of
-the algorithm property OutputWorkspace. Data generated by McStas monitor components are
+Reads a McStas Nexus file into a Mantid WorkspaceGroup with the name of
+the algorithm property OutputWorkspace. Data generated by McStas monitor components are
stored in workspaces of type Workspace2D and/or EventWorkspace. The name of a
workspace equals that of the mcstas component name + '_' + name of the OutputWorkspace.
In addition an EventWorkspace with the name 'EventData' + '_' + name of the OutputWorkspace
@@ -18,27 +18,27 @@ is created which contains the sum of all event datasets in the Nexus file.
Note if OutputOnlySummedEventWorkspace=True only this EventWorkspace is returned
by the algorithm.
-For information about how to create McStas outputs that can
+For information about how to create McStas outputs that can
readily be read by this loader, see `here <https://github.com/McStasMcXtrace/McCode/wiki/McStas-and-Mantid>`_.
For more information about McStas, and combined McStas and Mantid analyses see references below.
The ErrorBarsSetTo1 property applies to event data, but not to histogram data.
-LoadMcStas replaces LoadMcStasEventNexus. LoadMcStas can be used for
-reading McStas 2.1 histogram and event data.
-:ref:`algm-LoadMcStasNexus` can be used
-for reading McStas 2.0 histogram data.
+LoadMcStas replaces LoadMcStasEventNexus. LoadMcStas can be used for
+reading McStas 2.1 histogram and event data.
+:ref:`algm-LoadMcStasNexus` can be used
+for reading McStas 2.0 histogram data.
Information about the required structure of the input Nexus file
################################################################
-The input file must have an
+The input file must have an
``/entry1/simulation/name`` item whose value is ``"mccode"``.
The output workspace will contain one workspace for each group of
-class ``NXdata`` in the input NeXus file, which is not of name ``"content_nxs"``
+class ``NXdata`` in the input NeXus file, which is not of name ``"content_nxs"``
found in a group of class ``NXDetector`` of name ``"Data"``.
-The name of the workspace is the same as the name of the group,
+The name of the workspace is the same as the name of the group,
but with with the name of the outputworkspace, as specified in the algorithm properties,
added to the end.
@@ -62,10 +62,10 @@ added to the end.
| | ``"Neutron_ID"`` | |
+----------------------------------+------------------------------------------+---------------------------------------+
| Instrument | ``/instrument`` | loaded into workspace, only if |
-| | | events are loaded |
+| | | events are loaded |
+----------------------------------+------------------------------------------+---------------------------------------+
| Instrument definition | ``/instrument/instrument_xml/data`` | loaded into workspace, only if |
-| | is needed for events to be loaded | events are loaded |
+| | is needed for events to be loaded | events are loaded |
+----------------------------------+------------------------------------------+---------------------------------------+
The event data of the McStas file occurs in a NeXus table with six columns:
@@ -81,13 +81,13 @@ The event data of the McStas file occurs in a NeXus table with six columns:
References
##########
-For more information about McStas and its general usage for simulating neutron
+For more information about McStas and its general usage for simulating neutron
scattering instruments and experiments visit the `McStas homepage <http://www.mcstas.org>`_ .
-For examples of how combined McStas and Mantid analyses can help
+For examples of how combined McStas and Mantid analyses can help
instrument simulation and data treatment/analysis tasks see Nielsen., T.R. et al., McStas
and Mantid integration, Journal of Neutron Research, vol. 18, no. 2-3, pp. 61-77, 2015
-`DOI: 10.3233/JNR-160026 <http://dx.doi.org/10.3233/JNR-160026>`_
+`DOI: 10.3233/JNR-160026 <http://dx.doi.org/10.3233/JNR-160026>`_
[`arXiv <http://arxiv.org/abs/1607.02498>`_].
Usage
@@ -129,7 +129,7 @@ Output:
The mccode_multiple_scattering.h5 McStas Nexus file contains two event data entries:
named single_list_p_x_y_n_id_t and multi_list_p_x_y_n_id_t, one
-from each of two detector banks of the instrument simulated. Setting
+from each of two detector banks of the instrument simulated. Setting
OutputOnlySummedEventWorkspace=False these are loaded
individually into separate workspaces. In addition, this algorithm returns the
workspace EventData_ws, which contains the sum of all event data entries in the
diff --git a/docs/source/algorithms/LoadMultipleGSS-v1.rst b/docs/source/algorithms/LoadMultipleGSS-v1.rst
index 4e3caa68595bd4daa472eec2639d8dddac292904..fe7c2198ff4949cd7609db52a5089ce9ba65a16f 100644
--- a/docs/source/algorithms/LoadMultipleGSS-v1.rst
+++ b/docs/source/algorithms/LoadMultipleGSS-v1.rst
@@ -20,13 +20,13 @@ Usage
.. testcode:: LoadMultipleGSS
LoadMultipleGSS(FilePrefix="PG3",RunNumbers="11485,11486",Directory="")
-
+
#quick test:
print("Found workspace PG3_11485 {}".format(mtd.doesExist("PG3_11485")))
print("It has {} histogram, with {} bins".format(mtd["PG3_11485"].getNumberHistograms(), mtd["PG3_11485"].blocksize()))
print("Found workspace PG3_11486 {}".format(mtd.doesExist("PG3_11486")))
print("It has {} histogram, with {} bins".format(mtd["PG3_11486"].getNumberHistograms(), mtd["PG3_11486"].blocksize()))
-
+
.. testcleanup:: LoadMultipleGSS
DeleteWorkspace('PG3_11485')
diff --git a/docs/source/algorithms/LoadMuonNexusV2-v1.rst b/docs/source/algorithms/LoadMuonNexusV2-v1.rst
index 9124f828a0760b5b1614a535862405c516357e1d..afb1ae993efcaeec780fc0f9988673bf7003b3fb 100644
--- a/docs/source/algorithms/LoadMuonNexusV2-v1.rst
+++ b/docs/source/algorithms/LoadMuonNexusV2-v1.rst
@@ -148,7 +148,7 @@ Output:
# Load some spectra
ws, main_field_direction, time_zero, first_good_data, time_zero_list, time_zero_table, dead_time_table, detector_grouping_table = \
LoadMuonNexusV2(Filename="EMU00102347.nxs_v2",SpectrumMin=5,SpectrumMax=10,DeadTimeTable="deadTimeTable",TimeZeroTable="timeZeroTable")
-
+
print('Single time zero value is {:.2g}'.format(time_zero))
print("TimeZeroList values are:")
for timeZero in time_zero_list:
diff --git a/docs/source/algorithms/LoadNMoldyn4Ascii1D-v1.rst b/docs/source/algorithms/LoadNMoldyn4Ascii1D-v1.rst
index 619825c4b5fe3bb8c6aef229d065d73422f97135..ec5a26fde13dda3838c988ffff2a52b63d3ec438 100644
--- a/docs/source/algorithms/LoadNMoldyn4Ascii1D-v1.rst
+++ b/docs/source/algorithms/LoadNMoldyn4Ascii1D-v1.rst
@@ -8,16 +8,16 @@
Description
------------
-Loads density of states and velocity autocorrelation data from version 4 of
-nMOLDYN saved in an ASCII format after being extracted from the '.tar'
-archive. Will convolute this data with an instrument resolution function if
+Loads density of states and velocity autocorrelation data from version 4 of
+nMOLDYN saved in an ASCII format after being extracted from the '.tar'
+archive. Will convolute this data with an instrument resolution function if
required. Only a TOSCA resolution function is available at present. See below for
an example of resolution convolution.
.. image:: ../images/ResolutionFuncExample.png
:align: right
-Functions must be provided in the format of the filenames. For example, a
+Functions must be provided in the format of the filenames. For example, a
function 'dos_total' will be loaded if 'dos_total' is entered as a chosen
function.
@@ -25,17 +25,17 @@ function.
Assumptions on data format
--------------------------
-The 'Directory' property must be given the directory that is produced when
-you extract the '.tar' archive from nMOLDYN without modifications which must
-only contain the data files produced from a single nMOLDYN export operation.
-Crucially, there must be a '\\frequency.dat' file in order to load dos data
+The 'Directory' property must be given the directory that is produced when
+you extract the '.tar' archive from nMOLDYN without modifications which must
+only contain the data files produced from a single nMOLDYN export operation.
+Crucially, there must be a '\\frequency.dat' file in order to load dos data
and a '\\time.dat' file in order to load vacf data.
Axis Unit Conversions
---------------------
-When loading certain axes from nMOLDYN 4 the units may be converted to an
-equivalent unit in Mantid. The possible conversions are shown in the table
+When loading certain axes from nMOLDYN 4 the units may be converted to an
+equivalent unit in Mantid. The possible conversions are shown in the table
below:
+-----------+---------+------------------+--------------+
@@ -51,14 +51,14 @@ below:
Usage
-----
-**Example - Loading a simulation from an nMOLDYN 4 data file, without
+**Example - Loading a simulation from an nMOLDYN 4 data file, without
resolution convolution**
.. code-block:: python
data = LoadNMoldyn4Ascii1D(Directory='C:\MantidInstall\data\pristinedata',
Functions=['dos_total', 'vacf_total'])
-
+
for ws in data:
print(ws.name())
diff --git a/docs/source/algorithms/LoadNXSPE-v1.rst b/docs/source/algorithms/LoadNXSPE-v1.rst
index 3837d2d616c03742ee53ef5e6eb042c1a7a0e32e..e109a1c8d0598518d5966dc71c75277093f515dc 100644
--- a/docs/source/algorithms/LoadNXSPE-v1.rst
+++ b/docs/source/algorithms/LoadNXSPE-v1.rst
@@ -19,7 +19,7 @@ For indirect data, we recommend to save the data in NXS format instead.
**NOTE:** In the current implementation, the rendering of the NXSPE
instrument is VERY memory intensive.
-**NOTE:** This algorithm also sets to true the `distribution` flag on the output
+**NOTE:** This algorithm also sets to true the `distribution` flag on the output
workspace. This is because all examples of workspaces saved to `NXSPE` format
by the reduction algorithms are distributions (signal is count rate and should
be multiplied by bin widths to get counts). :ref:`algm-SaveNXSPE` does not
diff --git a/docs/source/algorithms/LoadNXcanSAS-v1.rst b/docs/source/algorithms/LoadNXcanSAS-v1.rst
index b0264acbbc72cded736b6df93a42539cd8f63556..53082fc93159f4c60f3e8e679acbb8dbdf7821d6 100644
--- a/docs/source/algorithms/LoadNXcanSAS-v1.rst
+++ b/docs/source/algorithms/LoadNXcanSAS-v1.rst
@@ -25,19 +25,19 @@ Usage
.. testcode:: LoadNXcanSAS
import os
-
+
# Create a example workspace with units of momentum transfer
ws = CreateSampleWorkspace("Histogram",NumBanks=1,BankPixelWidth=1)
ws = ConvertUnits(ws,Target="MomentumTransfer")
LoadInstrument(ws,False,InstrumentName="SANS2D")
-
- # Save the file
+
+ # Save the file
file_name = "test_file_for_nxcansas"
SaveNXcanSAS(ws,file_name)
-
+
# Load the file back
ws_loaded = LoadNXcanSAS(file_name)
-
+
#remove the file we created
alg = ws_loaded.getHistory().lastAlgorithm()
filePath = alg.getPropertyValue("Filename")
diff --git a/docs/source/algorithms/LoadNexus-v1.rst b/docs/source/algorithms/LoadNexus-v1.rst
index 3a943ba388b9d22d25ab8820c5a8a60f0f2b8f7a..f849315edc1868c9d158e216ef5d60ea891b5a1d 100644
--- a/docs/source/algorithms/LoadNexus-v1.rst
+++ b/docs/source/algorithms/LoadNexus-v1.rst
@@ -16,8 +16,8 @@ or .nx5.
The type of Nexus file is identified as follows:
-* If the file has a group of class ``SDS`` of name ``"definition"`` or ``"analysis"``
- with value ``"muonTD"`` or ``"pulsedTD"``,
+* If the file has a group of class ``SDS`` of name ``"definition"`` or ``"analysis"``
+ with value ``"muonTD"`` or ``"pulsedTD"``,
then it is taken to be a muon Nexus file and :ref:`algm-LoadMuonNexus` is called.
* Else if main entry is ``"mantid_workspace_1"``
@@ -27,10 +27,10 @@ The type of Nexus file is identified as follows:
* Else if main entry is ``"raw_data_1"``
then it is taken to be an ISIS Nexus file and :ref:`algm-LoadISISNexus` is called.
-* Else if instrument group has a ``"SNSdetector_calibration_id"`` item,
+* Else if instrument group has a ``"SNSdetector_calibration_id"`` item,
then :ref:`algm-LoadTOFRawNexus` is called.
-* Else exception indicating unsupported type of Nexus file is thrown.
+* Else exception indicating unsupported type of Nexus file is thrown.
If the file contains data for more than one period, a separate workspace
will be generated for each. After the first period the workspace names
diff --git a/docs/source/algorithms/LoadNexusLogs-v1.rst b/docs/source/algorithms/LoadNexusLogs-v1.rst
index 6044fa0ec490b28b745b01f73f1b821a53b48adc..ee4937f9a9a1d6e9f5d69c36fe26649b8c936ad4 100644
--- a/docs/source/algorithms/LoadNexusLogs-v1.rst
+++ b/docs/source/algorithms/LoadNexusLogs-v1.rst
@@ -22,7 +22,7 @@ calling this algorithm is not necessary, since it called as a child algorithm.
Data loaded from Nexus File
###########################
-Not all of the nexus file is loaded. This section tells you what is loaded and where it goes in the workspace.
+Not all of the nexus file is loaded. This section tells you what is loaded and where it goes in the workspace.
Items missing from the Nexus file are simply not loaded.
@@ -66,7 +66,7 @@ Items missing from the Nexus file are simply not loaded.
If the nexus file has a ``"proton_log"`` group, then this algorithm will do some event filtering to allow SANS2D files to load.
The ``AllowList`` option skips loading of the entire sample log, and loads only log entries specified in the list. This can be
-useful if only particular log entries are needed. Likewise, the ``BlockList`` option will skip loading log entries specified in
+useful if only particular log entries are needed. Likewise, the ``BlockList`` option will skip loading log entries specified in
the list, while loading all other sample log entries that are not found in the list. For both of these options, log entry names
should be separated by a space. Both ``AllowList`` and ``BlockList`` cannot be set at the same time.
diff --git a/docs/source/algorithms/LoadNexusMonitors-v2.rst b/docs/source/algorithms/LoadNexusMonitors-v2.rst
index 4a493c1276882b84e33a0c464496541b271c72a4..e3cbb889cb14d2960419edb18bb32aea36259540 100644
--- a/docs/source/algorithms/LoadNexusMonitors-v2.rst
+++ b/docs/source/algorithms/LoadNexusMonitors-v2.rst
@@ -48,10 +48,10 @@ For most files, the ``LoadOnly`` option can be set to an empty string
(the default) and the correct form of the data will be loaded
(i.e. events for event monitors and histograms for histogram
monitors). In some NeXus files, both histograms and events are
-provided. In this case, if ``LoadOnly`` is not defined, then histogram
+provided. In this case, if ``LoadOnly`` is not defined, then histogram
monitors will be loaded and a warning will be outputted to the Log.
-To suppress the warning, or to select which form of logs to load the
+To suppress the warning, or to select which form of logs to load the
user **must** use the ``LoadOnly``
option to specify what is desired.
diff --git a/docs/source/algorithms/LoadNexusProcessed-v1.rst b/docs/source/algorithms/LoadNexusProcessed-v1.rst
index 4ee1808037b1917e7cc2caef3821765d6dd1ae00..87fc7b3e2f2d3943af7f663b53870662e90042be 100644
--- a/docs/source/algorithms/LoadNexusProcessed-v1.rst
+++ b/docs/source/algorithms/LoadNexusProcessed-v1.rst
@@ -12,9 +12,9 @@ Description
The algorithm LoadNexusProcessed will read a Nexus data file created
by :ref:`algm-SaveNexusProcessed` and place the data into the named
workspace. The file name can be an absolute or relative path and
-should have the extension .nxs, .nx5 or .xml.
+should have the extension .nxs, .nx5 or .xml.
-.. warning::
+.. warning::
Using XML format can be extremely slow for large data sets and generate very
large files.
diff --git a/docs/source/algorithms/LoadNexusProcessed-v2.rst b/docs/source/algorithms/LoadNexusProcessed-v2.rst
index 4dc51a24d88d32259cb2e1bcccb649f127d7fb06..7427549f9a05181c03c882744db8d1985885fb76 100644
--- a/docs/source/algorithms/LoadNexusProcessed-v2.rst
+++ b/docs/source/algorithms/LoadNexusProcessed-v2.rst
@@ -12,9 +12,9 @@ Description
The algorithm LoadNexusProcessed will read a Nexus data file created
by :ref:`algm-SaveNexusProcessed` or `algm-SaveNexusESS` and place the data into the named workspace. The file name can be an absolute or relative path and
-should have the extension .nxs, .nx5 or .xml.
+should have the extension .nxs, .nx5 or .xml.
-.. warning::
+.. warning::
Using XML format can be extremely slow for large data sets and generate very
large files.
diff --git a/docs/source/algorithms/LoadPLN-v1.rst b/docs/source/algorithms/LoadPLN-v1.rst
index 5b7326b81492bbaf68367f110e29261a21e110b4..4945390e59380f44baae22783df000c190843200 100644
--- a/docs/source/algorithms/LoadPLN-v1.rst
+++ b/docs/source/algorithms/LoadPLN-v1.rst
@@ -30,7 +30,7 @@ Output:
Number of spectra: 12808
-
+
.. categories::
.. sourcelink::
\ No newline at end of file
diff --git a/docs/source/algorithms/LoadPSIMuonBin-v1.rst b/docs/source/algorithms/LoadPSIMuonBin-v1.rst
index fc4d81bde71b4023779b5deb9be9fb0301d2a0ed..6c924db62362091287deb5886c51ef917a383e7f 100644
--- a/docs/source/algorithms/LoadPSIMuonBin-v1.rst
+++ b/docs/source/algorithms/LoadPSIMuonBin-v1.rst
@@ -9,20 +9,20 @@
Description
-----------
-The algorithm LoadPSIMuonBin will read in a .bin file from the PSI
+The algorithm LoadPSIMuonBin will read in a .bin file from the PSI
facility, from one of the various machines that use that format.
The file name can be an absolute or relative path and should have the
extension .bin. The file should only be loaded if the first two bytes
are "1N" representing it as the format that this will load.
LoadPSIMuonBin is capable of loading in accompanying temperature files.
-There are two options for achieving this. If no file is provided and
-the temperature file searching enabled (it is by default), then it
+There are two options for achieving this. If no file is provided and
+the temperature file searching enabled (it is by default), then it
will recursively search for the file in the current directory of the
data file and up to 3 directories deeper than the file.
-Any temperature data loaded in from a separate file will be available
-from the resultant workspace's sample logs, as a number series that
+Any temperature data loaded in from a separate file will be available
+from the resultant workspace's sample logs, as a number series that
is plottable.
The times are automatically offset by the value for time zero for each spectra, such that the pulse is at approximatly time equals zero.
diff --git a/docs/source/algorithms/LoadParameterFile-v1.rst b/docs/source/algorithms/LoadParameterFile-v1.rst
index 17836f3b9ca98828829cf2e5c8f5251345be4c56..b2670e99369a79d93d9c98752b5b25f1f9f11009 100644
--- a/docs/source/algorithms/LoadParameterFile-v1.rst
+++ b/docs/source/algorithms/LoadParameterFile-v1.rst
@@ -8,7 +8,7 @@
Description
-----------
-
+
.. role:: xml(literal)
:class: highlight
diff --git a/docs/source/algorithms/LoadRawSpectrum0-v1.rst b/docs/source/algorithms/LoadRawSpectrum0-v1.rst
index 6ec923a6a9208822a26684cbfca420319dde819e..6a1693336b8cfc73030ef020d838cc4345e1213c 100644
--- a/docs/source/algorithms/LoadRawSpectrum0-v1.rst
+++ b/docs/source/algorithms/LoadRawSpectrum0-v1.rst
@@ -17,7 +17,7 @@ Usage
.. include:: ../usagedata-note.txt
-**Example - Only for .Raw Files**
+**Example - Only for .Raw Files**
.. testcode:: raw
diff --git a/docs/source/algorithms/LoadSESANS-v1.rst b/docs/source/algorithms/LoadSESANS-v1.rst
index 6d6126ae6029ab4afbb949786b845d2f6d6fe55c..4c91aaf1dff44aa3b56b117300fbba564785534c 100644
--- a/docs/source/algorithms/LoadSESANS-v1.rst
+++ b/docs/source/algorithms/LoadSESANS-v1.rst
@@ -24,24 +24,24 @@ Usage
.. testcode:: LoadSESANSRoundTrip
import os
-
+
# Create dummy workspace
dataX = [1,2,3,4,5]
dataY = [6,1,9,14]
dataE = [1,1,4,5]
out_ws = CreateWorkspace(dataX, dataY, dataE)
out_ws.setTitle("Dummy workspace")
-
+
file_path = os.path.join(config["defaultsave.directory"], "example.ses")
-
+
# Do a 'roundtrip' of the data
SaveSESANS(InputWorkspace=out_ws, Filename=file_path, ThetaZMax=1,ThetaYMax=1, EchoConstant=1, Sample="Sample")
LoadSESANS(Filename=file_path, OutputWorkspace="in_ws")
-
+
# Retrieve loaded workspace from ADS
in_ws = mtd["in_ws"]
print("Y values of loaded workspace = {}".format(in_ws.readY(0)))
-
+
.. testcleanup:: LoadSESANSRoundTrip
os.remove(file_path)
@@ -54,4 +54,4 @@ Output:
.. categories::
-.. sourcelink::
+.. sourcelink::
diff --git a/docs/source/algorithms/LoadSINQ-v1.rst b/docs/source/algorithms/LoadSINQ-v1.rst
index 9fb18dd5a80d6b08d2e7954733d385dc262e17bf..5dabd451cbf763516e7324625af1bb59acd66816 100644
--- a/docs/source/algorithms/LoadSINQ-v1.rst
+++ b/docs/source/algorithms/LoadSINQ-v1.rst
@@ -26,11 +26,11 @@ The following usage example loads a POLDI data file using the instrument name, y
.. testcode:: ExLoadSINQPOLDI
poldi_data = LoadSINQ(Instrument = "POLDI", Year = 2013, Numor = 6904)
-
+
print("Poldi sample 6904 has {} histograms.".format(poldi_data.getNumberHistograms()))
Output:
-
+
.. testoutput:: ExLoadSINQPOLDI
Poldi sample 6904 has 400 histograms.
diff --git a/docs/source/algorithms/LoadSINQFocus-v1.rst b/docs/source/algorithms/LoadSINQFocus-v1.rst
index 91edd2507ee9f53d87c0eda72410892918033fd4..5bb01a330ba882a88fdd960d1285abc41c55883c 100644
--- a/docs/source/algorithms/LoadSINQFocus-v1.rst
+++ b/docs/source/algorithms/LoadSINQFocus-v1.rst
@@ -26,11 +26,11 @@ The following example script loads a data file obtained at the FOCUS instrument
# Load FOCUS data
focus_2906 = LoadSINQFocus('focus2014n002906.hdf')
-
+
# Print out some information
print("Sample title: {}".format(focus_2906.getTitle()))
print("Number of spectra: {}".format(focus_2906.getNumberHistograms()))
-
+
Output:
.. testoutput:: ExFocus
@@ -45,7 +45,7 @@ Creating a color fill plot of the resulting workspace should result in an image
:figwidth: 15 cm
:align: center
:alt: FOCUS data of water at 320 K.
-
+
FOCUS data of water at 320 K.
.. categories::
diff --git a/docs/source/algorithms/LoadSQW-v1.rst b/docs/source/algorithms/LoadSQW-v1.rst
index 06f965192d5b9df53e947f32e6b2057ed0f47086..76caf0b54f656755c3fd6619453d8dc1ab01b429 100644
--- a/docs/source/algorithms/LoadSQW-v1.rst
+++ b/docs/source/algorithms/LoadSQW-v1.rst
@@ -178,11 +178,11 @@ Usage
#
# Load sample sqw file, present in Mantid unit tests as MD workspace
mdws = LoadSQW('test_horace_reader.sqw');
-
+
# Check results
print("Workspace type is: {}".format(mdws.id()))
print("Workspace has:{0:2} dimensions and contains: {1:4} MD events".format(mdws.getNumDims(),mdws.getNEvents()))
-
+
Output:
.. testoutput:: ExLoadSQW
diff --git a/docs/source/algorithms/LoadSampleEnvironment-v1.rst b/docs/source/algorithms/LoadSampleEnvironment-v1.rst
index beeb23313defdfb045ec218ab86dfbe1cad14789..34c1a1a61d75c0811715f40f0d79557de6010774 100644
--- a/docs/source/algorithms/LoadSampleEnvironment-v1.rst
+++ b/docs/source/algorithms/LoadSampleEnvironment-v1.rst
@@ -15,8 +15,8 @@ The following types of input file are supported:
* ``*.stl`` stereolithography `https://en.wikipedia.org/wiki/STL_(file_format) <https://en.wikipedia.org/wiki/STL_(file_format)>`_
This is a file format consisting of a list of faces specified by their vertex coordinates.
- The file may be in ASCII or Binary format, and all the faces must be triangular.
- The normals are ignored, but the vertices must be in the order required by the standard
+ The file may be in ASCII or Binary format, and all the faces must be triangular.
+ The normals are ignored, but the vertices must be in the order required by the standard
(counter-clockwise when viewed from outside).
* ``*.3mf`` `https://3mf.io <https://3mf.io>`_
This is a 3D printing format that allows multiple objects to be stored in a single file,
diff --git a/docs/source/algorithms/LoadSampleShape-v1.rst b/docs/source/algorithms/LoadSampleShape-v1.rst
index 5e800f0a2781e3236712854dd67006691dcb5747..57788fca85afb9b0cc6f74e5e0f6b3dade961822 100644
--- a/docs/source/algorithms/LoadSampleShape-v1.rst
+++ b/docs/source/algorithms/LoadSampleShape-v1.rst
@@ -15,11 +15,11 @@ The following types of input file are supported:
* ``*.stl`` stereolithography `https://en.wikipedia.org/wiki/STL_(file_format) <https://en.wikipedia.org/wiki/STL_(file_format)>`_
This is a file format consisting of a list of faces specified by their vertex coordinates.
- The file may be in ASCII or Binary format, and all the faces must be triangular.
- The normals are ignored, but the vertices must be in the order required by the standard
+ The file may be in ASCII or Binary format, and all the faces must be triangular.
+ The normals are ignored, but the vertices must be in the order required by the standard
(counter-clockwise when viewed from outside).
* ``*.off`` Object File Format `https://en.wikipedia.org/wiki/OFF_(file_format) <https://en.wikipedia.org/wiki/OFF_(file_format)>`_
- This is a file format consisting of a list of vertices and a list of faces specified by the position of
+ This is a file format consisting of a list of vertices and a list of faces specified by the position of
each vertex in the list of vertices.
The file must is in ASCII for and all the faces must be triangular. There are no normals.
The vertices of a face must be ordered counter-clockwise when viewed from outside.
diff --git a/docs/source/algorithms/LoadSassena-v1.rst b/docs/source/algorithms/LoadSassena-v1.rst
index 55038c756a38f1175e5091a9a4d50fa58c5745d7..8bbe287c70ddff3422a0e3e9e4324d5692bf70d9 100644
--- a/docs/source/algorithms/LoadSassena-v1.rst
+++ b/docs/source/algorithms/LoadSassena-v1.rst
@@ -63,7 +63,7 @@ Usage
center = 0.0
sigma = 200.0
startX = -900.0
- endX = 900.0
+ endX = 900.0
myFunc = 'name=Gaussian,Height={0},PeakCentre={1},Sigma={2}'.format(intensity,center,sigma)
# Call the Fit algorithm and perform the fit
diff --git a/docs/source/algorithms/LoadSpec-v1.rst b/docs/source/algorithms/LoadSpec-v1.rst
index d846c9b0693688878d938ace0647341d95daa01f..ba72715b546e07b62aef12838296e52da83f7ebf 100644
--- a/docs/source/algorithms/LoadSpec-v1.rst
+++ b/docs/source/algorithms/LoadSpec-v1.rst
@@ -10,7 +10,7 @@ Description
-----------
The LoadSpec algorithm reads in spectra data from a text file and stores
-it in a :ref:`Workspace2D <Workspace2D>` as data points.
+it in a :ref:`Workspace2D <Workspace2D>` as data points.
The data in the file must be organized by set of 3 columns (separated by any number of spaces). The
first column has to be the X values, the second column the Y values and
the third column the error values.
diff --git a/docs/source/algorithms/LoadSpiceAscii-v1.rst b/docs/source/algorithms/LoadSpiceAscii-v1.rst
index 4f3f2f6f15836644ff88fb778beb6032c3678cd0..d0ece0ed0f7d0b4baedb2a888fa2c7d498afb4eb 100644
--- a/docs/source/algorithms/LoadSpiceAscii-v1.rst
+++ b/docs/source/algorithms/LoadSpiceAscii-v1.rst
@@ -9,33 +9,33 @@
Description
-----------
-This algorithm is to import data file generated by SPICE, a
+This algorithm is to import data file generated by SPICE, a
data acquisition software used in HFIR ,
and record the data and run information to TableWorkspaces.
Format of SPICE data file
#########################
-There are two parts of content in SPICE data file.
-One is the run information, in which line that starts with #.
+There are two parts of content in SPICE data file.
+One is the run information, in which line that starts with #.
-In most cases, the run information is give as
+In most cases, the run information is give as
# run info name = run info value
-The other is the experimental data.
-The first item is an integer as the index of experimental data point.
+The other is the experimental data.
+The first item is an integer as the index of experimental data point.
Output Worskpaces
#################
-Two table worskpaces will be exported from the algorithm.
+Two table worskpaces will be exported from the algorithm.
-'OutputWorkspace' is the table workspace containing the measured experimental data.
-Each row of it contains all the measured parameters of one data point.
+'OutputWorkspace' is the table workspace containing the measured experimental data.
+Each row of it contains all the measured parameters of one data point.
-'RunInfoWorkspace' is the table workspace that
-stores the run information, such as scan number, IPTS, sample information and etc.
+'RunInfoWorkspace' is the table workspace that
+stores the run information, such as scan number, IPTS, sample information and etc.
Usage
@@ -45,12 +45,12 @@ Usage
.. testcode:: ExLoadHB2AData
- LoadSpiceAscii(Filename="HB2A_exp0231_scan0001.dat",
+ LoadSpiceAscii(Filename="HB2A_exp0231_scan0001.dat",
IntegerSampleLogNames="Sum of Counts, scan, mode, experiment_number",
- FloatSampleLogNames="samplemosaic, preset_value, Full Width Half-Maximum, Center of Mass",
- OutputWorkspace="HB2A_0231_0001_Data",
+ FloatSampleLogNames="samplemosaic, preset_value, Full Width Half-Maximum, Center of Mass",
+ OutputWorkspace="HB2A_0231_0001_Data",
RunInfoWorkspace="HB2A_0231_Info")
- datatbws = mtd['HB2A_0231_0001_Data']
+ datatbws = mtd['HB2A_0231_0001_Data']
infows = mtd['HB2A_0231_Info']
print("Number of measuring points = {}".format(datatbws.rowCount()))
@@ -61,7 +61,7 @@ Usage
print("Property {}: Name = {}".format(i, propertylist[i].name))
print("Sum of Counts = {}".format(infows.getRun().getProperty("Sum of Counts").value))
print("Center of Mass = {:.5f} +/- {:.5f}".format(
- infows.getRun().getProperty("Center of Mass").value,
+ infows.getRun().getProperty("Center of Mass").value,
infows.getRun().getProperty("Center of Mass.error").value))
.. testcleanup:: ExLoadHB2AData
diff --git a/docs/source/algorithms/LoadVisionInelastic-v1.rst b/docs/source/algorithms/LoadVisionInelastic-v1.rst
index 0d063c9125c3cdd7a6844e201ba1442fbdae7b0e..3dc435d0c20c66b733384b6e401f2d9f2c00137b 100644
--- a/docs/source/algorithms/LoadVisionInelastic-v1.rst
+++ b/docs/source/algorithms/LoadVisionInelastic-v1.rst
@@ -23,7 +23,7 @@ Usage
print("Number of spectra: {}".format(w1.getNumberHistograms()))
-.. testoutput::
+.. testoutput::
Number of spectra: 14336
diff --git a/docs/source/algorithms/Logarithm-v1.rst b/docs/source/algorithms/Logarithm-v1.rst
index b4293fb2fd1e69c9ed255bd5ee2239edc7d049ed..1236f764b213b78a4c62813cf69393b75ca57315 100644
--- a/docs/source/algorithms/Logarithm-v1.rst
+++ b/docs/source/algorithms/Logarithm-v1.rst
@@ -47,7 +47,7 @@ Usage
print('Log10 for spectra 0: {}'.format(ws.readY(0)))
print('Log10 for Err spectra 0: {}'.format(ws.readE(0)[0:4]))
-
+
.. testcleanup:: ExLogarithm
DeleteWorkspace(ws)
diff --git a/docs/source/algorithms/MDHistoToWorkspace2D-v1.rst b/docs/source/algorithms/MDHistoToWorkspace2D-v1.rst
index 45ee32e6b9f2ab1b9941b9681f7a3fa7f55156db..03942b84d75c0c681070eb981aab4db194d94b08 100644
--- a/docs/source/algorithms/MDHistoToWorkspace2D-v1.rst
+++ b/docs/source/algorithms/MDHistoToWorkspace2D-v1.rst
@@ -31,7 +31,7 @@ Usage
FakeMDEventData(InputWorkspace='demo', PeakParams='32,0,0,0,1')
input = BinMD(InputWorkspace='demo', AlignedDim0='A,-2,2,4', AlignedDim1='B,-2,2,4', AlignedDim2='C,-2,2,4')
- # Run the algorithm
+ # Run the algorithm
output = MDHistoToWorkspace2D(InputWorkspace='input')
# print 6th group of 4 bins in both input and output workspaces
diff --git a/docs/source/algorithms/MDNorm-v1.rst b/docs/source/algorithms/MDNorm-v1.rst
index eab6ac6f6a278363d32958b93662a445d79c3715..76b4cf07a039a2dae711dd82f3fab891a92b1488 100644
--- a/docs/source/algorithms/MDNorm-v1.rst
+++ b/docs/source/algorithms/MDNorm-v1.rst
@@ -11,7 +11,7 @@ Description
-----------
Starting from events in the momentum transfer space , this algorithm puts the data on a regular grid
-in either reciprocal space of the sample (if `RLU` is selected) or in the goniometer frame,
+in either reciprocal space of the sample (if `RLU` is selected) or in the goniometer frame,
then it normalizes to get the scattering cross section.
For diffraction data, the output workspace contains the differential cross section :math:`\frac{d\sigma}{d\Omega}`, while
for direct geometry inelastic data one obtains the double differential cross section :math:`\frac{d^2 \sigma}{dE d\Omega}`.
@@ -19,24 +19,24 @@ One can choose any orientation for the momentum axes (to get the first axis to b
**Note:** In order to calculate the trajectories, the algorithm relies on finding information about detector
trajectories stored in the workspace. The algorithm :ref:`CropWorkspaceForMDNorm <algm-CropWorkspaceForMDNorm>` must
-be run *before* converting to multidimensional workspace. Optionally, in aaddition, one can recalculate the extents of the trajectories
-using the :ref:`RecalculateTrajectoriesExtents <algm-RecalculateTrajectoriesExtents>` algorithm after convering to the
+be run *before* converting to multidimensional workspace. Optionally, in aaddition, one can recalculate the extents of the trajectories
+using the :ref:`RecalculateTrajectoriesExtents <algm-RecalculateTrajectoriesExtents>` algorithm after convering to the
multidimensional workspace.
The solid angle workspace is a :ref:`MatrixWorkspace <MatrixWorkspace>` that contains the solid angle/efficiency of the detectors.
-One can just integrate a vanadium file between some appropriate limits. For diffraction measurements, the flux workspace
+One can just integrate a vanadium file between some appropriate limits. For diffraction measurements, the flux workspace
is a mandatory input. It is a :ref:`MatrixWorkspace <MatrixWorkspace>`
-that contains the indefinite integral of the incident flux. It contains one or more spectra, each of them corresponding to
+that contains the indefinite integral of the incident flux. It contains one or more spectra, each of them corresponding to
detectors that have the same energy response. The algorithm :ref:`MDNormSCDPreprocessIncoherent
<algm-MDNormSCDPreprocessIncoherent>` can be used to process Vanadium
data for the Solid Angle and Flux workspaces.
The input workspace is binned using the :ref:`BinMD <algm-BinMD>` algorithm, to account for the selected momentum
dimensions. For each dimension to be binned, we specify a name (for example `Dimension0Name='QDimension0'`). For any momentum dimension
-the name is one of `QDimension0`, `QDimension1`, or `QDimension2` along the axes specified in the algorithm. All three momentum
-dimensions must be present in the parameter list of the algorithm. Any other dimension name, such as `DeltaE`, is optional,
-and must be identical to a dimension in the input workspace. If a dimension name is present in the input workspace but not within the
-parameters of this algorithm, the corresponding data will be integrated. The semnification of binning parameters is as following:
+the name is one of `QDimension0`, `QDimension1`, or `QDimension2` along the axes specified in the algorithm. All three momentum
+dimensions must be present in the parameter list of the algorithm. Any other dimension name, such as `DeltaE`, is optional,
+and must be identical to a dimension in the input workspace. If a dimension name is present in the input workspace but not within the
+parameters of this algorithm, the corresponding data will be integrated. The semnification of binning parameters is as following:
+----------------------------------+-------------------------------------------------------+
| Format | |
@@ -55,7 +55,7 @@ parameters of this algorithm, the corresponding data will be integrated. The sem
The binned workspace is stored in the `OutputDataWorkspace`.
Trajectories of each detector in reciprocal space are omputed, and the normalization is calculated between intersections with each
-MDBox. A brief introduction to the multi-dimensional data normalization can be found :ref:`here <MDNorm>`. The
+MDBox. A brief introduction to the multi-dimensional data normalization can be found :ref:`here <MDNorm>`. The
`OutputNormalizationWorkspace` contains the denominator of equations (2) or (3). In the :ref:`normalization document <MDNorm>`.
The `OutputWorkspace` contains the ratio of the `OutputDataWorkspace` and `OutputNormalizationWorkspace`.
@@ -80,9 +80,9 @@ For diffraction measurements a sample code is found below:
Load(Filename='SingleCrystalDiffuseReduction_Flux.nxs', OutputWorkspace= 'Flux')
MaskDetectors(Workspace='data', MaskedWorkspace='SolidAngle')
ConvertUnits(InputWorkspace='data',OutputWorkspace='data',Target='Momentum')
- CropWorkspaceForMDNorm(InputWorkspace='data',
- XMin=2.5,
- XMax=10,
+ CropWorkspaceForMDNorm(InputWorkspace='data',
+ XMin=2.5,
+ XMax=10,
OutputWorkspace='data')
LoadIsawUB(InputWorkspace='data',Filename='SingleCrystalDiffuseReduction_UB.mat')
SetGoniometer(Workspace='data',Axis0='BL9:Mot:Sample:Axis1,0,1,0,1')
@@ -90,30 +90,30 @@ For diffraction measurements a sample code is found below:
QDimensions='Q3D',
dEAnalysisMode='Elastic',
Q3DFrames='Q')
- ConvertToMD(InputWorkspace='data',
- QDimensions='Q3D',
+ ConvertToMD(InputWorkspace='data',
+ QDimensions='Q3D',
dEAnalysisMode='Elastic',
- Q3DFrames='Q_sample',
- OutputWorkspace='md',
- MinValues=min_vals,
- MaxValues=max_vals)
+ Q3DFrames='Q_sample',
+ OutputWorkspace='md',
+ MinValues=min_vals,
+ MaxValues=max_vals)
RecalculateTrajectoriesExtents(InputWorkspace= 'md', OutputWorkspace='md')
-
- MDNorm(InputWorkspace='md',
+
+ MDNorm(InputWorkspace='md',
SolidAngleWorkspace='SolidAngle',
FluxWorkspace='Flux',
QDimension0='1,1,0',
QDimension1='1,-1,0',
QDimension2='0,0,1',
- Dimension0Name='QDimension0',
- Dimension0Binning='-10.0,0.1,10.0',
- Dimension1Name='QDimension1',
- Dimension1Binning='-10.0,0.1,10.0',
- Dimension2Name='QDimension2',
+ Dimension0Name='QDimension0',
+ Dimension0Binning='-10.0,0.1,10.0',
+ Dimension1Name='QDimension1',
+ Dimension1Binning='-10.0,0.1,10.0',
+ Dimension2Name='QDimension2',
Dimension2Binning='-0.1,0.1',
SymmetryOperations='P 31 2 1',
- OutputWorkspace='result',
- OutputDataWorkspace='dataMD',
+ OutputWorkspace='result',
+ OutputDataWorkspace='dataMD',
OutputNormalizationWorkspace='normMD')
The output would look like:
@@ -127,56 +127,56 @@ Here is a sample code for inelastic data:
Load(Filename='HYS_13656-13658',OutputWorkspace='sum')
SetGoniometer(Workspace='sum', Axis0='s1,0,1,0,1')
- GenerateEventsFilter(InputWorkspace='sum',
- OutputWorkspace='splboth',
- InformationWorkspace='info',
- UnitOfTime='Nanoseconds',
- LogName='s1',
- MaximumLogValue=90,
+ GenerateEventsFilter(InputWorkspace='sum',
+ OutputWorkspace='splboth',
+ InformationWorkspace='info',
+ UnitOfTime='Nanoseconds',
+ LogName='s1',
+ MaximumLogValue=90,
LogValueInterval=1)
- FilterEvents(InputWorkspace='sum',
- SplitterWorkspace='splboth',
- InformationWorkspace='info',
- FilterByPulseTime=True,
+ FilterEvents(InputWorkspace='sum',
+ SplitterWorkspace='splboth',
+ InformationWorkspace='info',
+ FilterByPulseTime=True,
GroupWorkspaces=True,
- OutputWorkspaceIndexedFrom1=True,
+ OutputWorkspaceIndexedFrom1=True,
OutputWorkspaceBaseName='split')
DgsReduction(SampleInputWorkspace='split',
- SampleInputMonitorWorkspace='split_1',
- IncidentEnergyGuess=50,
- SofPhiEIsDistribution=False,
- TimeIndepBackgroundSub=True,
- TibTofRangeStart=10400,
- TibTofRangeEnd=12400,
+ SampleInputMonitorWorkspace='split_1',
+ IncidentEnergyGuess=50,
+ SofPhiEIsDistribution=False,
+ TimeIndepBackgroundSub=True,
+ TibTofRangeStart=10400,
+ TibTofRangeEnd=12400,
OutputWorkspace='reduced')
- SetUB(Workspace='reduced',
- a=5.823,
- b=6.475,
- c=3.186,
- u='0,1,0',
+ SetUB(Workspace='reduced',
+ a=5.823,
+ b=6.475,
+ c=3.186,
+ u='0,1,0',
v='0,0,1')
- CropWorkspaceForMDNorm(InputWorkspace='reduced',
- XMin=-25,
- XMax=49,
+ CropWorkspaceForMDNorm(InputWorkspace='reduced',
+ XMin=-25,
+ XMax=49,
OutputWorkspace='reduced')
- ConvertToMD(InputWorkspace='reduced',
- QDimensions='Q3D',
- Q3DFrames='Q_sample',
- OutputWorkspace='md',
- MinValues='-11,-11,-11,-25',
+ ConvertToMD(InputWorkspace='reduced',
+ QDimensions='Q3D',
+ Q3DFrames='Q_sample',
+ OutputWorkspace='md',
+ MinValues='-11,-11,-11,-25',
MaxValues='11,11,11,49')
MergeMD(InputWorkspaces='md', OutputWorkspace='merged')
- MDNorm(InputWorkspace='merged',
- Dimension0Name='QDimension1',
- Dimension0Binning='-5,0.05,5',
- Dimension1Name='QDimension2',
- Dimension1Binning='-5,0.05,5',
- Dimension2Name='DeltaE',
- Dimension2Binning='-2,2',
- Dimension3Name='QDimension0',
- Dimension3Binning='-0.5,0.5',
+ MDNorm(InputWorkspace='merged',
+ Dimension0Name='QDimension1',
+ Dimension0Binning='-5,0.05,5',
+ Dimension1Name='QDimension2',
+ Dimension1Binning='-5,0.05,5',
+ Dimension2Name='DeltaE',
+ Dimension2Binning='-2,2',
+ Dimension3Name='QDimension0',
+ Dimension3Binning='-0.5,0.5',
SymmetryOperations='x,y,z;x,-y,z;x,y,-z;x,-y,-z',
- OutputWorkspace='result',
+ OutputWorkspace='result',
OutputDataWorkspace='dataMD',
OutputNormalizationWorkspace='normMD')
diff --git a/docs/source/algorithms/MDNormDirectSC-v1.rst b/docs/source/algorithms/MDNormDirectSC-v1.rst
index 890c41cde2b7461502218dedd3f66837f331012a..eae893886bc72d901a72b1d9531cc8142fefead9 100644
--- a/docs/source/algorithms/MDNormDirectSC-v1.rst
+++ b/docs/source/algorithms/MDNormDirectSC-v1.rst
@@ -10,14 +10,14 @@
Description
-----------
-The algorithm calculates a normalization MD workspace for single crystal direct geometry inelastic experiments.
+The algorithm calculates a normalization MD workspace for single crystal direct geometry inelastic experiments.
Trajectories of each detector in reciprocal space are calculated, and the flux is integrated between intersections with each
MDBox. A brief introduction to the multi-dimensional data normalization can be found :ref:`here <MDNorm>`.
.. Note::
If the MDEvent input workspace is generated from an event workspace, the algorithm gives the correct normalization
- only if the event workspace is cropped and binned to the same energy transfer range. If the workspace is not cropped,
+ only if the event workspace is cropped and binned to the same energy transfer range. If the workspace is not cropped,
one might have events in places where the normalization is calculated to be 0.
.. Note::
@@ -38,7 +38,7 @@ Usage
from mantid.simpleapi import *
config['default.facility']="SNS"
from numpy import *
-
+
DGS_input_data=Load("CNCS_7860")
# Keep events (SofPhiEIsDistribution=False)
# Do not normalize by proton charge in DgsReduction
@@ -65,16 +65,16 @@ Usage
histoShape=histoNorm.getSignalArray().shape
print "The normalization workspace shape is (%d, %d)" % histoShape
print "Out of those elements, "+str(nonzero(histoNorm.getSignalArray())[0].size)+" are nonzero"
-
-.. code-block:: python
+
+.. code-block:: python
The normalization workspace shape is (100, 100)
- Out of those elements, 6712 are nonzero
+ Out of those elements, 6712 are nonzero
The output would look like:
.. figure:: /images/MDNormDirectSC.png
- :alt: MDNormDirectSC.png
+ :alt: MDNormDirectSC.png
.. categories::
diff --git a/docs/source/algorithms/MDNormSCD-v1.rst b/docs/source/algorithms/MDNormSCD-v1.rst
index d711793040127f90f1234f7d636dfd209b5997a2..7310119b4f07b0a6c855d0531860d53084315934 100644
--- a/docs/source/algorithms/MDNormSCD-v1.rst
+++ b/docs/source/algorithms/MDNormSCD-v1.rst
@@ -10,7 +10,7 @@
Description
-----------
-The algorithm calculates a normalization MD workspace for single crystal diffraction experiments.
+The algorithm calculates a normalization MD workspace for single crystal diffraction experiments.
Trajectories of each detector in reciprocal space are calculated, and the flux is integrated between intersections with each
MDBox. A brief introduction to the multi-dimensional data normalization can be found :ref:`here <MDNorm>`.
@@ -40,7 +40,7 @@ Usage
MaskBTP(Workspace=rawVan,Pixel="0-9,246-255")
MaskBTP(Workspace=rawVan,Tube="0-9,246-255")
rawVan=CropWorkspace(InputWorkspace=rawVan,XMin='1.85',XMax='10')
-
+
#Solid angle
sa=Rebin(InputWorkspace=rawVan,Params='1.85,10,10',PreserveEvents='0')
SaveNexus(InputWorkspace=sa, Filename="/home/3y9/Desktop/TOPAZ/solidAngle.nxs")
@@ -56,9 +56,9 @@ Usage
flux=Rebin(InputWorkspace=flux,Params='1.85,10,10')
flux=IntegrateFlux(flux)
SaveNexus(InputWorkspace=flux, Filename="/home/3y9/Desktop/TOPAZ/spectra.nxs")
-
+
#data
- #If you have multiple workspaces, add separately the output workspaces, and separately the
+ #If you have multiple workspaces, add separately the output workspaces, and separately the
#output normalization workspaces, then divide the two sums
runs = range(7985,7995,1)
mdout = None
@@ -79,7 +79,7 @@ Usage
Q3DFrames="HKL",QConversionScales="HKL",
MinValues="-10,-10,-10",Maxvalues="10,10,10")
SaveMD(InputWorkspace=MDdata, Filename="/home/3y9/Desktop/TOPAZ/MDdata_"+str(run)+".nxs")
-
+
#running the algorithm
mdout, mdnorm = MDNormSCD(InputWorkspace='MDdata',
AlignedDim0='[H,0,0],-8,8,100',
@@ -89,15 +89,15 @@ Usage
SolidAngleWorkspace=sa,
TemporaryDataWorkspace=mdout,
TemporaryNormalizationWorkspace=mdnorm)
-
+
normalized=DivideMD('mdout','mdnorm')
except:
pass
-
-.. testoutput:: MDNormSCDExample
-
-
+.. testoutput:: MDNormSCDExample
+
+
+
References
----------
diff --git a/docs/source/algorithms/MSDFit-v1.rst b/docs/source/algorithms/MSDFit-v1.rst
index 035950972653b1ee7f1322b715a7f3ead9133965..7a47535901cca6e3d92a0ffbfad3420db8fb9321 100644
--- a/docs/source/algorithms/MSDFit-v1.rst
+++ b/docs/source/algorithms/MSDFit-v1.rst
@@ -57,7 +57,7 @@ Output (the numbers on your machine my not match exactly):
.. testoutput:: ExGeneratedDataFit
:options: +ELLIPSIS, +NORMALIZE_WHITESPACE
-
+
Using Gauss Model
A0: [ 0.87...]
A1: [ 0.19...]
diff --git a/docs/source/algorithms/MagFormFactorCorrection-v1.rst b/docs/source/algorithms/MagFormFactorCorrection-v1.rst
index 608b9cac232b04222c57e08cc959796e3f1c2005..8ab093c9f0ca1045fca5008eae18e88d907c01bf 100644
--- a/docs/source/algorithms/MagFormFactorCorrection-v1.rst
+++ b/docs/source/algorithms/MagFormFactorCorrection-v1.rst
@@ -30,11 +30,11 @@ Usage
The following code will run a reduction on a MARI (ISIS) dataset and apply
the algorithm to the reduced data. The datafiles (runs 21334, 21337, 21346) and
-map file 'mari_res2013.map' should be in your path. Run number 21337 is a
+map file 'mari_res2013.map' should be in your path. Run number 21337 is a
measurement of a PrAl3 sample from the neutron training course. The single
crystal field excitation around 4.5 meV should have an intensity variation that
follows the magnetic form factor. Thus, the integrating between 4 and 5 meV in
-the corrected workspace should yield a nearly flat line along the :math:`|Q|`
+the corrected workspace should yield a nearly flat line along the :math:`|Q|`
direction.
.. code:: python
@@ -42,7 +42,7 @@ direction.
from Direct import DirectEnergyConversion
from mantid.simpleapi import *
rd = DirectEnergyConversion.DirectEnergyConversion('MARI')
- ws = rd.convert_to_energy(21334, 21337, 15, [-15,0.05,15], 'mari_res2013.map',
+ ws = rd.convert_to_energy(21334, 21337, 15, [-15,0.05,15], 'mari_res2013.map',
monovan_run=21346, sample_mass=10.62, sample_rmm=221.856, monovan_mapfile='mari_res2013.map')
ws_sqw = SofQW3(ws, [0,0.05,6], 'Direct', 15)
ws_corr = MagFormFactorCorrection(ws_sqw, IonName='Pr3', FormFactorWorkspace='Pr3FF')
diff --git a/docs/source/algorithms/MaskBinsFromTable-v1.rst b/docs/source/algorithms/MaskBinsFromTable-v1.rst
index a83f9e89e420931f413553051e660544f62d57df..76159d8a565b12b3b82cf6182fd9c00c1d93b0cd 100644
--- a/docs/source/algorithms/MaskBinsFromTable-v1.rst
+++ b/docs/source/algorithms/MaskBinsFromTable-v1.rst
@@ -12,7 +12,7 @@ Description
Masks bins in a workspace. The user specified masking parameters,
such as spectra, xmin and xmax are given via a TableWorkspace.
-It calls algorithm MaskBins underneath.
+It calls algorithm MaskBins underneath.
If DetectorIDsList column exists it will convert this list to a list of spectra before calling MaskBins.
The table may have several rows, in which case it calls Maskbins for each row.
diff --git a/docs/source/algorithms/MaskDetectors-v1.rst b/docs/source/algorithms/MaskDetectors-v1.rst
index f02248dfe56a4b094957e232e8cf0fb114ab549c..fa81d1b8e13f3162219a9cd3bd34993a14ce406d 100644
--- a/docs/source/algorithms/MaskDetectors-v1.rst
+++ b/docs/source/algorithms/MaskDetectors-v1.rst
@@ -9,14 +9,14 @@
Introduction
------------
-To understand the algorithms options, user should clearly understand the difference between *WorkspaceIndex*
+To understand the algorithms options, user should clearly understand the difference between *WorkspaceIndex*
-- the numbers, specified in *WorkspaceIndexList* and *StartWorkspacIndex*, *EndWorkspaceIndex* properties,
-the *Spectra Number* or according to other terminology *Spectra ID* -- values of the **SpectraList** property and *Detector ID* -- the numbers to provide for
+the *Spectra Number* or according to other terminology *Spectra ID* -- values of the **SpectraList** property and *Detector ID* -- the numbers to provide for
*DetectorList* property.
The *WorkspaceIndex* is the number a spectrum has in a workspace, e.g. ::
- sp = ws.getSpectrum(0)
+ sp = ws.getSpectrum(0)
always returns first spectra present in the workspace.
@@ -24,16 +24,16 @@ The *Spectra Number* or *spectra ID* mean the number, assigned to a spectrum. T
print(sp.getSpectrumNo())
-from the sample above will often print 1 but not always. The simplest case when this
+from the sample above will often print 1 but not always. The simplest case when this
number is different is when you load a second half of a workspace, when the first spectrum number still is **NumTotalSpectraInWorkspace/2+1**,
while *WorkspaceIndex* of this spectra becomes 0, i.e.: ::
sp = ws.getSpectrum(0)
print(sp.getSpectrumNo())
-
-prints number equal to **NumTotalSpectraInWorkspace/2+1**. There are other ways to assign a random number to a spectrum.
-And finally, the *detector ID* is the number assigned to a detector in an instrument definition file. Sometimes,
+prints number equal to **NumTotalSpectraInWorkspace/2+1**. There are other ways to assign a random number to a spectrum.
+
+And finally, the *detector ID* is the number assigned to a detector in an instrument definition file. Sometimes,
a first detector corresponds to the first spectra of a workspace, but it is not in any way certain. For example
the code: ::
@@ -44,23 +44,23 @@ the code: ::
Will print: ::
2 set(1102)
-
+
but any *ISIS MARI* workspace obtained from experiment will produce different sequence, e.g. something like: ::
5 set(4101)
-
+
Description
-----------
-The algorithm zeroes the data in the spectra of the input workspace
+The algorithm zeroes the data in the spectra of the input workspace
defined as masked. The detectors corresponding to the masked spectra are also
flagged as masked (can be verified by the `IDetector::isMasked()` method).
The *Workspace* property specifies the workspace to mask while the other properties
provide various ways to define the spectra and detectors to mask.
-If *Workspace* is PeaksWorkspace, only the detectors listed are masked and
+If *Workspace* is PeaksWorkspace, only the detectors listed are masked and
the mask must be specified by a *DetectorList* or *MaskedWorkspace*.
All but the *Workspace* property are optional and at least one of them must be
@@ -80,35 +80,35 @@ changes its action depending on other masking properties being provided, namely:
Mask Detectors According To Instrument & Masking Workspace
##########################################################
-If *MaskedWorkspace* is provided, both *MaskedWorkspace* and
-*Workspace* mask have the same instrument.
+If *MaskedWorkspace* is provided, both *MaskedWorkspace* and
+*Workspace* mask have the same instrument.
-The algorithm works differently depending on *MaskedWorkspace* property
-being a *Mask Workspace* (SpecialWorkspace2D object) or
-:ref:`Matrix Workspace <MatrixWorkspace>`.
+The algorithm works differently depending on *MaskedWorkspace* property
+being a *Mask Workspace* (SpecialWorkspace2D object) or
+:ref:`Matrix Workspace <MatrixWorkspace>`.
-If source *MaskedWorkspace* is a *Mask Workspace* and the number of spectra in the source
-*MaskedWorkspace* is equal to number of spectra in the target *Workspace*, the
-spectra numbers of the *MaskedWorkspace* are used as source
-of masking information for the target workspace.
+If source *MaskedWorkspace* is a *Mask Workspace* and the number of spectra in the source
+*MaskedWorkspace* is equal to number of spectra in the target *Workspace*, the
+spectra numbers of the *MaskedWorkspace* are used as source
+of masking information for the target workspace.
If the numbers of spectra in *Workspace* and *MaskedWorkspace* are different,
the algorithm extracts list of masked detector IDS from source workspace and
-uses them to mask the corresponding spectra of the target workspace.
+uses them to mask the corresponding spectra of the target workspace.
-Setting property *ForceInstrumentMasking* to true forces algorithm
+Setting property *ForceInstrumentMasking* to true forces algorithm
to always use *MaskedWorkspace* detector IDs as the source of the masking
information. If a detector is masked, then the corresponding detector
will be masked in the input *Workspace*.
-If the input *MaskedWorkspace* is a :ref:`Matrix Workspace <MatrixWorkspace>`
-and the number of spectra in the source *MaskedWorkspace* is equal to the number
+If the input *MaskedWorkspace* is a :ref:`Matrix Workspace <MatrixWorkspace>`
+and the number of spectra in the source *MaskedWorkspace* is equal to the number
of spectra in the target *Workspace*, then workspace indices of the source are
used.
If the numbers of spectra in *Workspace* and *MaskedWorkspace* are different,
-the algorithm extracts list of detector IDS from source workspace and uses them
-to mask the corresponding spectra of the target workspace.
+the algorithm extracts list of detector IDS from source workspace and uses them
+to mask the corresponding spectra of the target workspace.
Definition of Mask
##################
@@ -121,10 +121,10 @@ Definition of Mask
be used. In the masking workspace (i.e.,
`SpecialWorkspace2D <http://www.mantidproject.org/SpecialWorkspace2D>`__), the corresponding value
is 0.
-- If masked workspace with a masked spectrum is applied to a target workspace with grouped detectors,
- and only one detector in the group of target workspace is masked, all target spectra,
+- If masked workspace with a masked spectrum is applied to a target workspace with grouped detectors,
+ and only one detector in the group of target workspace is masked, all target spectra,
containing this detector become masked.
-
+
About Input Parameters
######################
@@ -327,8 +327,8 @@ Output:
# workspace created by CreateSampleWorkspace since their
# names contain a comma ',' which breaks the parsing of the component list.
MaskDetectors(ws, ComponentList='bank1/bank1(x=3), bank2')
-
-
+
+
# Define a helper function.
def checkMasked(detsBegin, detsEnd):
allMasked = True
@@ -341,10 +341,10 @@ Output:
print('Detectors from {0} to {1} are masked.'.format(detsBegin, detsEnd))
else:
print('Some detectors were unmasked.')
-
+
# Check the detector column in bank1
checkMasked(130, 140)
-
+
# Check bank2
checkMasked(200,300)
@@ -410,7 +410,7 @@ Output:
Detector 102 is masked: False
Detector 103 is masked: True
Detector 104 is masked: False
-
+
**Example 6: specifying a masking range**
.. testcode:: ExMaskInRange
@@ -418,7 +418,7 @@ Output:
# Create a data workspace
ws = CreateSampleWorkspace()
# Mask 3 detectors using the masking range
- MaskDetectors(ws, StartWorkspaceIndex=2, EndWorkspaceIndex=4)
+ MaskDetectors(ws, StartWorkspaceIndex=2, EndWorkspaceIndex=4)
# Check masking of first 6 detectors
for ind in range(0,6):
@@ -436,7 +436,7 @@ Output:
Detector 103 is masked: True
Detector 104 is masked: True
Detector 105 is masked: False
-
+
**Example 7: constraining the masking range**
.. testcode:: ExMaskConstrainInRange
@@ -487,7 +487,7 @@ Output:
Detector 104 is masked: True
Detector 105 is masked: True
Detector 106 is masked: False
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/MaskDetectorsIf-v1.rst b/docs/source/algorithms/MaskDetectorsIf-v1.rst
index 2a22e004a51a3869ab56dd44dc8df18ae0ccbd89..e62b60c3eea72e7c69080269a853435c3e20b4d0 100644
--- a/docs/source/algorithms/MaskDetectorsIf-v1.rst
+++ b/docs/source/algorithms/MaskDetectorsIf-v1.rst
@@ -40,7 +40,7 @@ Usage
# Inspect the result
isMasked = ws.spectrumInfo().isMasked(badIndex)
print('Spectrum at index {} is masked? {}'.format(badIndex, isMasked))
-
+
Output:
.. testoutput:: MaskDetectorsIfEx
diff --git a/docs/source/algorithms/MaxEnt-v1.rst b/docs/source/algorithms/MaxEnt-v1.rst
index 5bf997a36340fe8af645ca72c7b31914b9d05ea8..0863f9937361acef796bc3de3fe296f0dbd9d2a3 100644
--- a/docs/source/algorithms/MaxEnt-v1.rst
+++ b/docs/source/algorithms/MaxEnt-v1.rst
@@ -20,7 +20,7 @@ More specifically, the algorithm maximizes the entropy :math:`S\left(x\right)` s
.. math:: \chi^2 = \frac{1}{N'}\sum_m \frac{\left(d_m - d_m^c\right)^2}{\sigma_m^2} \leq \chi^2_{target}
where :math:`d_m` are the experimental data, :math:`\sigma_m` the associated errors, :math:`d_m^c`
-the calculated or reconstructed data, :math:`\chi^2_{target}` is value of the input algorithm
+the calculated or reconstructed data, :math:`\chi^2_{target}` is value of the input algorithm
property ChiTargetOverN and :math:`N'` the number of measured data point. The image is a set of numbers
:math:`\{x_0, x_1, \dots, x_{N-1}\}` related to the measured data via a 1D Fourier transform:
@@ -32,8 +32,8 @@ is controlled by the input algorithm property ResolutionFactor, see examples fur
Note that even for real input data the reconstructed image can be complex, which means that both the real and
imaginary parts will be taken into account for the calculations. This is the default behaviour, which can be
changed by setting the input property *ComplexImage* to *False*. Note that the algorithm will fail to converge
-if the image is complex (i.e. the data does not satisfy Friedel's law) and this option is set to *False*.
-For this reason, it is recommended to use the default when no prior knowledge is available.
+if the image is complex (i.e. the data does not satisfy Friedel's law) and this option is set to *False*.
+For this reason, it is recommended to use the default when no prior knowledge is available.
The entropy is defined on the image :math:`\{x_j\}` as:
@@ -67,7 +67,7 @@ one step closer to the solution:
.. math:: \mathbf{x} = \mathbf{x} + \delta \mathbf{x}
-If *DataLinearAdj* :math:`l_m` and *DataConstAdj* :math:`c_m` are set
+If *DataLinearAdj* :math:`l_m` and *DataConstAdj* :math:`c_m` are set
then the reconstructed data is adjusted to
.. math:: d_m = \frac{l_m}{N} \sum_{j=0}^{N-1} x_j e^{i 2\pi m j / N} + c_m
@@ -199,7 +199,7 @@ Output:
.. figure:: ../images/MaxEntFourierCoefficients.png
:align: center
-
+
**Example - Reconstruct a real muon dataset**
@@ -231,11 +231,11 @@ and :ref:`algm-FFT` (right).
yData.append(originalY[j]**2)
xData.append(originalX[j])
return np.trapz(x=xData,y=np.sqrt(yData))
- # Do not change these numbers - they test if noise has been added to the alg
+ # Do not change these numbers - they test if noise has been added to the alg
print("Negative background {:.6f}".format(getInt(image.readX(0), image.readY(0),-30,-2 )))
print("Positive background {:.6f}".format(getInt(image.readX(0), image.readY(0),2,30 )))
print ("Number of iterations: "+str( len(evolAngle.readX(0))))
-
+
Output:
.. testoutput:: ExMUSR00022725
@@ -374,7 +374,7 @@ image in order to obtain smooth results).
print("Image at {:.3f}: {:.3f} (PositiveImage=False), {:.3f} (PositiveImage=True)".format(image.readX(0)[104], image.readY(0)[104], imageP.readY(0)[102]))
print ("Number of iterations: "+str( len(evolAngle.readX(0))))
print ("Number of iterations: "+str( len(evolAngleP.readX(0))))
-
+
Output:
.. testoutput:: ExRealPosImage
@@ -442,7 +442,7 @@ shows how to combine two workspaces with complex data.
YIm2.append(sin(w2*x)+(random()-0.5)*0.3)
E2.append(0.5)
- # Create two workspaces of one spectrum each
+ # Create two workspaces of one spectrum each
CreateWorkspace(OutputWorkspace='ws1',DataX=X+X,DataY=YRe+YIm,DataE=E+E,NSpec=2)
evolChiP, evolAngleP, imageP, dataP = MaxEnt(InputWorkspace='ws1', ComplexData=True, A=0.001, PositiveImage=True)
@@ -509,7 +509,7 @@ Output:
.. figure:: ../images/MaxEntResolutionFactor.png
:align: center
-
+
In the next example, we increased the density of points by factors of 10, 20 and 40. We show the reconstructed image (left) and
a zoom into the region :math:`0.82 < x < 1.44` and :math:`-0.187 < y < 0.004`.
@@ -541,11 +541,11 @@ Output:
.. figure:: ../images/MaxEntResolutionFactor2.png
:align: center
-
+
Adjusting the Reconstructed Data
--------------------------------
-The reconstructed data can be adjusted by multiplying by the *DataLinearAdj* property and then adding the *DataConstAdj* property.
-Each of these properties is a workspace with complex Y values, just like complex input workspaces. Each Y value is then applied to
+The reconstructed data can be adjusted by multiplying by the *DataLinearAdj* property and then adding the *DataConstAdj* property.
+Each of these properties is a workspace with complex Y values, just like complex input workspaces. Each Y value is then applied to
the corresponding Y values in the reconstructed data at each iteration.
These usage examples merely demonstrate how to use the adjustments and are not realistic use cases.
@@ -568,7 +568,7 @@ These usage examples merely demonstrate how to use the adjustments and are not r
X.append(x)
Y.append(cos(w*x)+(random()-0.5)*0.3)
E.append(0.2)
-
+
CreateWorkspace(OutputWorkspace='inputws',DataX=X,DataY=Y,DataE=E,NSpec=3)
# Construct linear adjustment workspace (real = 1, imaginary linear)
@@ -581,14 +581,14 @@ These usage examples merely demonstrate how to use the adjustments and are not r
for i in range(0,N):
Ylin.append(1.0)
Zeroes.append(0)
-
+
# Imaginary values
for s in range(0,3):
for i in range(0,N):
X.append(X[i])
Ylin.append(s*Magnitude*X[i])
Zeroes.append(0)
-
+
CreateWorkspace(OutputWorkspace='linadj', DataX=X, DataY=Ylin, DataE=Zeroes, NSpec=6)
# Construct constant adjustment workspace (real = 0, imaginary linear)
@@ -599,16 +599,16 @@ These usage examples merely demonstrate how to use the adjustments and are not r
for s in range(0,3):
for i in range(0,N):
Yconst.append(0)
-
+
# Imaginary values
for s in range(0,3):
for i in range(0,N):
Yconst.append(s*Magnitude*X[i])
-
+
CreateWorkspace(OutputWorkspace='constadj',DataX=X, DataY=Yconst, DataE=Zeroes, NSpec=6)
evolChi, evolAngle, image, data = MaxEnt(InputWorkspace='inputws', DataLinearAdj='linadj', DataConstAdj='constadj',A=0.001)
-
+
print("Reconstruction at 05 of first spectrum: {:.3f}".format(data.readY(0)[5]))
print("Reconstruction at 10 of first spectrum: {:.3f}".format(data.readY(0)[10]))
print("Reconstruction at 15 of first spectrum: {:.3f}".format(data.readY(0)[15]))
@@ -622,7 +622,7 @@ These usage examples merely demonstrate how to use the adjustments and are not r
Output:
.. testoutput:: ExAdjustment
-
+
Reconstruction at 05 of first spectrum: 0.657
Reconstruction at 10 of first spectrum: 0.433
Reconstruction at 15 of first spectrum: 0.115
@@ -632,14 +632,14 @@ Output:
Number of iterations of first spectrum: 5
Number of iterations of second spectrum: 37
Number of iterations of third spectrum: 70
-
+
.. figure:: ../images/MaxEntAdjust.png
:align: center
-
+
The first plot shows the reconstructed data and the second plot the corresponding image.
The first three spectra plotted are the real parts of the 3 spectra
and the other three spectra are the imaginary parts.
-
+
This can also be done with the spectra of the data effectively concatenated and converted into a single image.
The reconstructed data is then obtained by converting the image back to data, copying for each spectrum and applying the adjustments.
@@ -664,7 +664,7 @@ This is done by setting the *PerSpectrumImage* property to *false*.
X.append(x)
Y.append(cos(w*x)+(random()-0.5)*0.3)
E.append(0.27)
-
+
for s in range(0,3):
# Imaginary values
for i in range(0,N):
@@ -722,7 +722,7 @@ This is done by setting the *PerSpectrumImage* property to *false*.
print("Reconstruction at 05 of third spectrum: {:.3f}".format(data.readY(2)[5]))
print("Reconstruction at 10 of third spectrum: {:.3f}".format(data.readY(2)[10]))
print("Reconstruction at 15 of third spectrum: {:.3f}".format(data.readY(2)[15]))
-
+
Output:
.. testoutput:: ExAdjustmentTogether
@@ -733,10 +733,10 @@ Output:
Reconstruction at 05 of third spectrum: 0.687
Reconstruction at 10 of third spectrum: 0.481
Reconstruction at 15 of third spectrum: 0.163
-
+
.. figure:: ../images/MaxEntAdjustTogether.png
:align: center
-
+
The first plot shows the reconstructed data and the second plot the corresponding image.
In the data, the first three spectra plotted are the real parts of the 3 spectra
and the other three spectra are the imaginary parts.
diff --git a/docs/source/algorithms/MaxMin-v1.rst b/docs/source/algorithms/MaxMin-v1.rst
index 8e335fd3a1d28ff9a30b0e06d08800df78a1cccf..0b66425f25778a384eef20cb9b405e9ee7a691c4 100644
--- a/docs/source/algorithms/MaxMin-v1.rst
+++ b/docs/source/algorithms/MaxMin-v1.rst
@@ -78,7 +78,7 @@ Output:
[ 0.3]
[ 0.3]
[ 0.3]
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/MayersSampleCorrection-v1.rst b/docs/source/algorithms/MayersSampleCorrection-v1.rst
index 593ac2f35ac1629220c6871a40fb76c0bac5a014..1d559f3f75f24639264dd8344c10a8502f860025 100644
--- a/docs/source/algorithms/MayersSampleCorrection-v1.rst
+++ b/docs/source/algorithms/MayersSampleCorrection-v1.rst
@@ -9,8 +9,8 @@
Description
-----------
-Calculates and applies corrections due to the effects of absorption (plus optionally multiple scattering)
-on the signal and error values for a given workspace. The full background to the algorithm
+Calculates and applies corrections due to the effects of absorption (plus optionally multiple scattering)
+on the signal and error values for a given workspace. The full background to the algorithm
is described by Lindley et al. [1]_ and is briefly described here.
The following assumptions are made:
@@ -20,30 +20,30 @@ The following assumptions are made:
* the scattering is assumed to be elastic and isotropic
* the ratio of successive orders of scattering are all equal to :math:`\beta(\theta, \phi, E)`
-The aim is to correct the number of neutrons at a given detector (:math:`N_d`) to compute the number
-of neutrons (:math:`N_c`) that would reach the detector if there was no absorption (or multiple scattering). Ignoring
+The aim is to correct the number of neutrons at a given detector (:math:`N_d`) to compute the number
+of neutrons (:math:`N_c`) that would reach the detector if there was no absorption (or multiple scattering). Ignoring
detector efficiency we can write:
.. math::
N_d = \frac{N_c}{A_s} \cdot \frac{1}{1-\beta}
-where :math:`A_s(\theta, \phi, E)` is the absorption and self-shielding factor and is computed by
+where :math:`A_s(\theta, \phi, E)` is the absorption and self-shielding factor and is computed by
numerical integration over the sample cylinder.
-The multiple scattering factor (if requested) is computed by simulating over a fixed number of
-second order scattering events and computing the ratio of second order and first order scattering.
-Since we have assumed the ratio is the same between successive orders, the :math:`\frac{1}{1-\beta}`
+The multiple scattering factor (if requested) is computed by simulating over a fixed number of
+second order scattering events and computing the ratio of second order and first order scattering.
+Since we have assumed the ratio is the same between successive orders, the :math:`\frac{1}{1-\beta}`
factor simply comes from taking the sum of a geometric series.
-The cylinder radius :math:`r` combined with the inverse attenuation length :math:`\mu = \mu(E)`
-(derived from the total scattering cross-section) gives a range of :math:`\mu r` against input
+The cylinder radius :math:`r` combined with the inverse attenuation length :math:`\mu = \mu(E)`
+(derived from the total scattering cross-section) gives a range of :math:`\mu r` against input
time-of-flight ("energy") for the cylinder.
The :math:`\mu r` range is divided into a discrete number of points for each point.
-A weighted least-squares fit is applied to both the set of attenuation and multiple scattering factors
-to allow interpolation of the correction factor from any time-of-flight value in the input range.
-For each time-of-flight value the factor is computed from the fit coefficients and the correction
+A weighted least-squares fit is applied to both the set of attenuation and multiple scattering factors
+to allow interpolation of the correction factor from any time-of-flight value in the input range.
+For each time-of-flight value the factor is computed from the fit coefficients and the correction
applied multiplicatively:
.. math::
diff --git a/docs/source/algorithms/Mean-v1.rst b/docs/source/algorithms/Mean-v1.rst
index d3452b87f5a38c5a2d766c8612812e9fcb8c3d13..5ee31ca385c08cf7d1e4e1076c16b1c3c557a6c2 100644
--- a/docs/source/algorithms/Mean-v1.rst
+++ b/docs/source/algorithms/Mean-v1.rst
@@ -9,7 +9,7 @@
Description
-----------
-Calculates the arithmetic mean of the *y* values of the workspaces provided. If each input workspace is labelled :math:`w_i` and there
+Calculates the arithmetic mean of the *y* values of the workspaces provided. If each input workspace is labelled :math:`w_i` and there
are *N* workspaces then the mean is computed as:
.. math::
diff --git a/docs/source/algorithms/MedianBinWidth-v1.rst b/docs/source/algorithms/MedianBinWidth-v1.rst
index 6d51bb1690a65f3bcc11ea29c4e1eeba95fca33a..8fd69431357ef32512ce260967cb99fcc8614b47 100644
--- a/docs/source/algorithms/MedianBinWidth-v1.rst
+++ b/docs/source/algorithms/MedianBinWidth-v1.rst
@@ -5,10 +5,10 @@
.. relatedalgorithms::
.. properties::
-
+
Description
-----------
-
+
This algorithm calculates the median bin width of each histogram in *InputWorkspace*. The (optionally rounded) mean value of the medians is then placed in the *BinWidth* output property.
Rounding
@@ -23,13 +23,13 @@ The *InputWorkspace* has to contain histogram data. For point data, :ref:`algm-C
Usage
-----
-
+
**Example: rebinning a workspace.**
.. testcode:: Example
import numpy
-
+
# For normal python lists: 3 * [0.1] = [0.1, 0.1, 0.1]
binWidths = 3 * [0.1] + 4 * [1.7] + [10.0]
# Convert to numpy array.
@@ -40,12 +40,12 @@ Usage
# There is one less bin than the number of boundaries.
ys = numpy.zeros(len(xs) - 1)
ws = CreateWorkspace(DataX=xs, DataY=ys)
-
+
newWidth = MedianBinWidth(InputWorkspace=ws)
print('New bin width: {0}'.format(newWidth))
-
+
rebinned = Rebin(InputWorkspace=ws, Params=[newWidth], FullBinsOnly=True)
-
+
widths = ws.readX(0)[1:] - ws.readX(0)[:-1]
print('Bin widths before rebinning: {0}'.format(widths))
widths = rebinned.readX(0)[1:] - rebinned.readX(0)[:-1]
diff --git a/docs/source/algorithms/MergeCalFiles-v1.rst b/docs/source/algorithms/MergeCalFiles-v1.rst
index 410472900e81c105747a32b66d31ef1301326b83..85f09905e3765f49202f81128dcdd90f8740048e 100644
--- a/docs/source/algorithms/MergeCalFiles-v1.rst
+++ b/docs/source/algorithms/MergeCalFiles-v1.rst
@@ -18,7 +18,7 @@ file.
Usage
-----
-**Example - Merging and appending files**
+**Example - Merging and appending files**
.. testcode:: merge
@@ -39,10 +39,10 @@ Usage
(line_no,
line_no + 100,
(line_no / 1000.0) if inc_offset else 0.0,
- (line_no % 2) if inc_selected else 0,
+ (line_no % 2) if inc_selected else 0,
(line_no % 3) if inc_group else 1) )
- return file_path
-
+ return file_path
+
calFile_master = writeCalFile("masterCal",6)
calFile_updates = writeCalFile("updateCal",3,
inc_group=False, inc_offset=False, inc_selected=False)
@@ -80,7 +80,7 @@ Output:
5 105 0.0050000 1 2
-**Example - Appending files**
+**Example - Appending files**
.. testcode:: append
@@ -101,10 +101,10 @@ Output:
(line_no,
line_no + 100,
(line_no / 1000.0) if inc_offset else 0.0,
- (line_no % 2) if inc_selected else 0,
+ (line_no % 2) if inc_selected else 0,
(line_no % 3) if inc_group else 1) )
- return file_path
-
+ return file_path
+
calFile_master = writeCalFile("masterCal",6)
calFile_updates = writeCalFile("updateCal",8,
inc_group=False, inc_offset=False, inc_selected=False)
diff --git a/docs/source/algorithms/MergeLogs-v1.rst b/docs/source/algorithms/MergeLogs-v1.rst
index f10702f4eacd077be486ce3fb61b4f10afa0159c..142626fa99bca6b2ef1ba9f57b0940eb6dedfae8 100644
--- a/docs/source/algorithms/MergeLogs-v1.rst
+++ b/docs/source/algorithms/MergeLogs-v1.rst
@@ -31,7 +31,7 @@ Usage
newprop = ws.run().getProperty("PhaseM12")
prop1 = ws.run().getProperty("Phase1")
prop2 = ws.run().getProperty("Phase2")
-
+
print("Phase 1's size = {}, Phase 2's size = {}, Merged size = {}.".format(prop1.size(), prop2.size(), newprop.size()))
for i in range(5):
print("Phase1 Time[{}] = {}.".format(i, prop1.nthTime(i)))
diff --git a/docs/source/algorithms/MergeRuns-v1.rst b/docs/source/algorithms/MergeRuns-v1.rst
index 65c8c7ab87f958dd766a594ec1911872631ce79b..62d628c9b4e977b70ae841505a57022e9beaa94f 100644
--- a/docs/source/algorithms/MergeRuns-v1.rst
+++ b/docs/source/algorithms/MergeRuns-v1.rst
@@ -178,7 +178,7 @@ Output:
print("group_1 = [{},".format(group_1[0].readY(0)))
print(" {}]".format(group_1[1].readY(0)))
-
+
print("group_2 = [{},".format(group_2[0].readY(0)))
print(" {}]".format(group_2[1].readY(0)))
diff --git a/docs/source/algorithms/Min-v1.rst b/docs/source/algorithms/Min-v1.rst
index d36da60edf2659484acc62bd0e0104ab65852bf3..a428cbce04889cd03102312f509a71e4fa606b22 100644
--- a/docs/source/algorithms/Min-v1.rst
+++ b/docs/source/algorithms/Min-v1.rst
@@ -11,26 +11,26 @@ Usage
-----
.. testcode:: Min
-
+
#Create a workspace
CreateWorkspace(OutputWorkspace='w2',
DataX='1,2,3,4,5,1,2,3,4,5',
- DataY='1,0,5,3,3,2,3,1',
+ DataY='1,0,5,3,3,2,3,1',
DataE='1,2,2,1,1,1,1,1',NSpec='2')
-
+
#Find minima
minim=Min(InputWorkspace='w2')
print("Minima for spectrum 0 is Y = {} and it occurs at X between {} and {}".
format(minim.dataY(0)[0], minim.dataX(0)[0], minim.dataX(0)[1]))
print("Minima for spectrum 1 is Y = {} and it occurs at X between {} and {}".
format(minim.dataY(1)[0], minim.dataX(1)[0], minim.dataX(1)[1]))
-
+
#Find minima with extra parameters
minim=Min(InputWorkspace='w2',RangeLower=0,RangeUpper=3,StartWorkspaceIndex =1,EndWorkspaceIndex=1)
print("The new output workspace has {} histogram, with the minimum Y = {} " \
"and it occurs at X between {} and {}".
format(minim.getNumberHistograms(), minim.dataY(0)[0], minim.dataX(0)[0], minim.dataX(0)[1]))
-
+
.. testcleanup:: Min
DeleteWorkspace("w2")
@@ -40,7 +40,7 @@ Usage
Output:
.. testoutput:: Min
-
+
Minima for spectrum 0 is Y = 0.0 and it occurs at X between 2.0 and 3.0
Minima for spectrum 1 is Y = 1.0 and it occurs at X between 4.0 and 5.0
The new output workspace has 1 histogram, with the minimum Y = 2.0 and it occurs at X between 2.0 and 3.0
diff --git a/docs/source/algorithms/Minus-v1.rst b/docs/source/algorithms/Minus-v1.rst
index 77c371c156a2b3f3f7f02a5d82cceec0891695ee..b55c5e943a0b2522333baac6d00b53c1d386bfe8 100644
--- a/docs/source/algorithms/Minus-v1.rst
+++ b/docs/source/algorithms/Minus-v1.rst
@@ -83,7 +83,7 @@ Output:
The Y values are: [-2. -1. 0. 1. 2. 3. 4. 5. 6.]
The updated Error values are: [ 3. 3.16227766 3.60555128 4.24264069 5. 5.83095189
6.70820393 7.61577311 8.54400375]
-
+
**Example - Subtract using in-place operator**
.. testcode:: ExMinusInPlace
diff --git a/docs/source/algorithms/ModeratorTzeroLinear-v1.rst b/docs/source/algorithms/ModeratorTzeroLinear-v1.rst
index 5ded4ebe937ce0bd497bfeda5e19b60d3d0fe469..033f5f40814dcfdb837b4b3e5530c04193558efa 100644
--- a/docs/source/algorithms/ModeratorTzeroLinear-v1.rst
+++ b/docs/source/algorithms/ModeratorTzeroLinear-v1.rst
@@ -18,7 +18,7 @@ empirical formula for the correction, stored in the instrument
definition file, is taken as linear on the initial neutron wavelength
:math:`\lambda_i`: :math:`t_0 = a * \lambda_i + b`. Gradient :math:`a` is
in units of microsec/Angstrom and Intercept :math:`b` is in units
-of microsec. Below is the example XML code included in BASIS beamline
+of microsec. Below is the example XML code included in BASIS beamline
parameters file.
.. code-block:: xml
diff --git a/docs/source/algorithms/ModifyDetectorDotDatFile-v1.rst b/docs/source/algorithms/ModifyDetectorDotDatFile-v1.rst
index c6623032b6f97f6519210bc78e2f4a1d3adbe76f..7518ef47d98ad2c0c9fec5d3d874e79a4a1aee8c 100644
--- a/docs/source/algorithms/ModifyDetectorDotDatFile-v1.rst
+++ b/docs/source/algorithms/ModifyDetectorDotDatFile-v1.rst
@@ -22,7 +22,7 @@ A typical ISIS dot data file has a format like this::
det no.  offset    l2     code     theta        phi         w_x         w_y         w_z         f_x       ...
    11   0.000  -3.25800     1   180.00000     0.00000     0.00000     0.00000     0.00000     0.00000    ...Â
     21   0.000  -1.50400     1   180.00000     0.00000     0.00000     0.00000     0.00000     0.00000    ...
-
+
1110001Â Â Â 5.300Â Â Â 2.88936Â Â Â Â Â 3Â Â Â Â 52.28653Â Â -140.67224Â Â Â Â Â 0.02540Â Â Â Â Â 0.02540Â Â Â Â Â 0.00283Â Â Â Â Â 0.02750Â Â ...Â
1110002Â Â Â 5.300Â Â Â 2.88794Â Â Â Â Â 3Â Â Â Â 52.26477Â Â -140.72720Â Â Â Â Â 0.02540Â Â Â Â Â 0.02540Â Â Â Â Â 0.00283Â Â Â Â Â 0.02750Â Â Â ...
   ....
@@ -63,13 +63,13 @@ Usage
# print the line truncating before system dependent line break can take effect
# also stripping off any trailing spaces
print(line[0:89].rstrip())
-
+
Output:
.. testoutput:: ExModifyDotDatFileSimple
File Exists: True
- DETECTOR.DAT generated by CREATE_DETECTOR_FILE and edited by hand and modified by MANTID
+ DETECTOR.DAT generated by CREATE_DETECTOR_FILE and edited by hand and modified by MANTID
286729 14
det no. offset l2 code theta phi w_x w_y w_z
1 5.300 0.20156 3 43.99491 -129.37500 0.02540 0.02540 0.0
diff --git a/docs/source/algorithms/MonitorEfficiencyCorUser-v1.rst b/docs/source/algorithms/MonitorEfficiencyCorUser-v1.rst
index bbf858a58c912bf2b36ce5d8fe2904945958199d..c52ee0e8c65c8cc3a9976cbbffbe92287e2eb070 100644
--- a/docs/source/algorithms/MonitorEfficiencyCorUser-v1.rst
+++ b/docs/source/algorithms/MonitorEfficiencyCorUser-v1.rst
@@ -48,8 +48,8 @@ Usage
monitor_counts = float(mtd['wsSample'].getRun().getLogData('monitor_counts').value)
Ei = float(mtd['wsSample'].getRun().getLogData('Ei').value)
print("Coefficient from theoretical formula = monitor_counts * sqrt(Ei/25.3): {:.3f}".format(monitor_counts*np.sqrt(Ei/25.3)))
-
-
+
+
Output:
.. testoutput:: ExMonitorEfficiencyCorUser
@@ -59,7 +59,7 @@ Output:
Number of time channels of the input an output workspaces:
1024 1024
Coefficient of proportionality between Input and Output of MonitorEfficiencyCorUser algorithm: 41038.432
- Coefficient from theoretical formula = monitor_counts * sqrt(Ei/25.3): 41038.432
+ Coefficient from theoretical formula = monitor_counts * sqrt(Ei/25.3): 41038.432
.. categories::
diff --git a/docs/source/algorithms/MonteCarloAbsorption-v1.rst b/docs/source/algorithms/MonteCarloAbsorption-v1.rst
index 79c18d8c9d5913a19cd8a96ac3b548594930cfa8..ee1fb4da84ebbbf53b8492352168c2511d1a207f 100644
--- a/docs/source/algorithms/MonteCarloAbsorption-v1.rst
+++ b/docs/source/algorithms/MonteCarloAbsorption-v1.rst
@@ -41,8 +41,8 @@ The algorithm proceeds as follows. For each spectrum:
#. for each event in `NEvents`
- * loop over the bins.
-
+ * loop over the bins.
+
- If `ResimulateTracksForDifferentWavelengths` = True then generate tracks using the following procedure for each wavelength step,
where the size of each wavelength step is defined by `NumberOfWavelengthPoints`. If `ResimulateTracksForDifferentWavelengths` = false
generate one set of tracks and define a step size of 1 ie all bins are visited. At the moment there are no wavelength dependent effects in the simulation that affect the simulation of the track geometry so the default value for `ResimulateTracksForDifferentWavelengths` is false.
@@ -106,7 +106,7 @@ The simulation may take long to complete on instruments with a large number of d
The sparse instrument consists of a grid of detectors covering the full instrument entirely. The figure below shows an example of a such an instrument approximating the IN5 spectrometer at ILL.
.. figure:: ../images/MonteCarloAbsorption_Sparse_Instrument.png
- :alt: IN5 spectrometer and its sparse approximation.
+ :alt: IN5 spectrometer and its sparse approximation.
:scale: 60%
Absorption corrections for IN5 spectrometer interpolated from the sparse instrument shown on the right. The sparse instrument has 6 detector rows and 22 columns, a total of 132 detectors. IN5, on the other hand, has approximately 100000 detectors.
@@ -129,7 +129,7 @@ If :math:`D` coincides with any :math:`D_{ij}`, the :math:`y` values of the hist
.. math::
y_1 = \frac{(\lambda_2 - \lambda) * y_{11} + (\lambda - \lambda_1) * y_{21}}{\lambda_2 - \lambda_1}
-
+
y_2 = \frac{(\lambda_2 - \lambda) * y_{12} + (\lambda - \lambda_1) * y_{22}}{\lambda_2 - \lambda_1},
and then finally in the latitude direction:
@@ -137,7 +137,7 @@ and then finally in the latitude direction:
.. math::
y = \frac{(\phi_2 - \phi) * y_1 + (\phi - \phi_1) * y_2}{\phi_2 - \phi_1}
-
+
The errors present in the 4 simulated histograms are assumed to be independent and they are propagated through the bilinear formulae given above to give one contribution to the error on the interpolated histogram. The second contribution is the interpolation error (how well the bilinear interpolation matches the actual attenuation factor variation). This is calculated based on the second derivative of the attenuation factor in the :math:`\phi` and :math:`\lambda` directions ([#SEV]_)
Wavelength interpolation for sparse instruments
diff --git a/docs/source/algorithms/MuonGroupingAsymmetry-v1.rst b/docs/source/algorithms/MuonGroupingAsymmetry-v1.rst
index 9823cac17f19ad3bc5ece67b5572c293f623766c..422ee38507a7bdaaa580868673552a0d3db67f53 100644
--- a/docs/source/algorithms/MuonGroupingAsymmetry-v1.rst
+++ b/docs/source/algorithms/MuonGroupingAsymmetry-v1.rst
@@ -11,7 +11,7 @@ Description
When interacting with the :ref:`Muon_Analysis-ref` interface, operations such as detector grouping, group and pair asymmetry are performed on data. This algorithm performs a "grouping asymmetry" operation, in other words it provides a numerical estimation (without fitting) of the asymmetry. More details can be found at :ref:`algm-EstimateMuonAsymmetryFromCounts`.
-This algorithm is part of a set of four; with :ref:`algm-MuonPreProcess` being run first; and the output being fed into this one. This allows the replication of the workflow used by the muon analysis interface to produce group data.
+This algorithm is part of a set of four; with :ref:`algm-MuonPreProcess` being run first; and the output being fed into this one. This allows the replication of the workflow used by the muon analysis interface to produce group data.
Analysis
########
@@ -20,7 +20,7 @@ A workspace has one or more *spectra* contained within it; each spectra has a un
The **InputWorkspace** must be a :ref:`WorkspaceGroup <WorkspaceGroup>`, where each workspace within the group represents a single period. Thus, single period data is just a *WorkspaceGroup* with a single workspace within it.
-The group must be given a name via **GroupName** which can consist of letters, numbers and underscores.
+The group must be given a name via **GroupName** which can consist of letters, numbers and underscores.
#. Valid names : "fwd", "fwd2", "fwd_2", "1234"
#. Invalid names : "", "fwd!", "fwd "
@@ -31,11 +31,11 @@ After the grouping is performed, the analysis described in :ref:`algm-EstimateMu
**Note** : The workspaces supplied to the algorithm must have a number of good frames set in their sample logs. The sample log is called "goodfrm" and can be set using;
-.. code::
+.. code::
AddSampleLog(workspace=workspace, LogName="goodfram", LogText ="10")
-Multi period data
+Multi period data
#################
Both single and multi period data are supported by the algorithm.
@@ -43,7 +43,7 @@ Both single and multi period data are supported by the algorithm.
The **SummedPeriods** and **SubtractedPeriods** inputs are used to control the way that periods are combined. so for example;
#. SummedPeriods = 1,2
-#. SubtractedPeriods = 3,4
+#. SubtractedPeriods = 3,4
would combine periods in the combination :math:`(1+2)-(3+4)`.
@@ -119,7 +119,7 @@ Output:
# We have asked for periods 1+2, with each period summing detectors 1,2
print("X values are : {}".format([round(float(i), 3) for i in output_workspace.readX(0)]))
print("Y values are : {}".format([round(float(i), 3) for i in output_workspace.readY(0)]))
-
+
Output:
diff --git a/docs/source/algorithms/MuonGroupingCounts-v1.rst b/docs/source/algorithms/MuonGroupingCounts-v1.rst
index 7e1f8eaffecd5d861b34f8fa1f59c480944be85f..e060dd5a4b458cba0f011933d402fd38d31cbc48 100644
--- a/docs/source/algorithms/MuonGroupingCounts-v1.rst
+++ b/docs/source/algorithms/MuonGroupingCounts-v1.rst
@@ -11,7 +11,7 @@ Description
When interacting with the :ref:`Muon_Analysis-ref` interface, operations such as detector grouping, group asymmetry and pair asymmetry are performed on data. This algorithm performs a "grouping counts" operation, in other words it sums the counts associated to a given sequence of detector IDs.
-This algorithm is part of a set of four; with :ref:`algm-MuonPreProcess` being run first; and the output being fed into this one. This allows the replication of the workflow used by the muon analysis interface to produce group data.
+This algorithm is part of a set of four; with :ref:`algm-MuonPreProcess` being run first; and the output being fed into this one. This allows the replication of the workflow used by the muon analysis interface to produce group data.
Analysis
########
@@ -20,14 +20,14 @@ A workspace has one or more *spectra* contained within it; for muon data each sp
The **InputWorkspace** must be a *WorkspaceGroup*, where each workspace within the workspace-group represents a single period. Thus, single period data is just a *workspaceGroup* with a single workspace within it.
-The detector-group must be given a name via **GroupName** which can consist of letters, numbers and underscores.
+The detector-group must be given a name via **GroupName** which can consist of letters, numbers and underscores.
#. Valid names : "fwd", "fwd2", "fwd_2", "1234"
#. Invalid names : "", "fwd!", "fwd "
The detector-group name does not affect the data; however the name is used in the muon interface when automatically generating workspace names from detector-group data.
-Multi period data
+Multi period data
#################
Both single and multi period data are supported by the algorithm.
@@ -35,7 +35,7 @@ Both single and multi period data are supported by the algorithm.
The **SummedPeriods** and **SubtractedPeriods** inputs are used to control the way that periods are combined. so for example;
#. SummedPeriods = 1,2
-#. SubtractedPeriods = 3,4
+#. SubtractedPeriods = 3,4
would combine periods in the combination $(1+2)-(3+4)$.
diff --git a/docs/source/algorithms/MuonMaxent-v1.rst b/docs/source/algorithms/MuonMaxent-v1.rst
index 8ebe2cb209e7805ef115e7ae91a01579ed6a65fc..15de82b7c60ffa046e1c4f21a99bfa6db3c2937f 100644
--- a/docs/source/algorithms/MuonMaxent-v1.rst
+++ b/docs/source/algorithms/MuonMaxent-v1.rst
@@ -9,30 +9,30 @@
Description
-----------
-This algorithm calculates a single frequency spectrum from the time domain spectra recorded by multiple groups/detectors.
+This algorithm calculates a single frequency spectrum from the time domain spectra recorded by multiple groups/detectors.
-If a group contains zero counts (i.e. the detectors are dead) then they are excluded from the frequency calculation. In the outputs these groups record the phase and asymmetry as zero and :math:`999` respectively.
+If a group contains zero counts (i.e. the detectors are dead) then they are excluded from the frequency calculation. In the outputs these groups record the phase and asymmetry as zero and :math:`999` respectively.
The time domain data :math:`D_k(t)`, where :math:`t` is time and :math:`k` is the spectrum number, has associated errors :math:`E_k(t)`. If the number of points chosen is greater than the number of time domain data points then extra points are
-added with infinite errors. The time domain data prior to :code:`FirstGoodTime` also have their errors set to infinity. The algorithm will produce the frequency spectra :math:`f(\omega)` and this is assumed to be real and positive.
-The upper limit of the frequency spectra is determined by :code:`MaxField`. The maximum frequency, :math:`\omega_\mathrm{max}` can be less than the Nyquist limit :math:`\frac{\pi}{\delta T}` if the instrumental frequency response function for
-:math:`\omega>\omega_\mathrm{max}` is approximatley zero. The initial estimate of the frequency spectrum is flat.
+added with infinite errors. The time domain data prior to :code:`FirstGoodTime` also have their errors set to infinity. The algorithm will produce the frequency spectra :math:`f(\omega)` and this is assumed to be real and positive.
+The upper limit of the frequency spectra is determined by :code:`MaxField`. The maximum frequency, :math:`\omega_\mathrm{max}` can be less than the Nyquist limit :math:`\frac{\pi}{\delta T}` if the instrumental frequency response function for
+:math:`\omega>\omega_\mathrm{max}` is approximatley zero. The initial estimate of the frequency spectrum is flat.
The algorithm calculates an estimate of each time domain spectra, :math:`g_k(t)` by the equation
.. math:: g_k(t)=(1+A_k \Re(\mathrm{IFFT}(f(\omega) R(\omega))\exp(-j\phi_k) ) ),
where :math:`\Re(z)` is the real part of :math:`z`, :math:`\mathrm{IFFT}` is the inverse fast Fourier transform (as defined by `numpy
-<https://docs.scipy.org/doc/numpy-1.12.0/reference/routines.fft.html#module-numpy.fft>`_), :math:`\phi_k` is the phase and :math:`A_k` is the asymmetry of the of the :math:`k^\mathrm{th}` spectrum.
-The asymmetry is normalised such that :math:`\sum_k A_k = 1`.
-The instrumental frequency response function, :math:`R(\omega)`, is is in general complex (due to a
-non-symmetric pulse shape) and is the same for all spectra. The values of the phases and asymmetries are fitted in the outer loop of the algorithm.
+<https://docs.scipy.org/doc/numpy-1.12.0/reference/routines.fft.html#module-numpy.fft>`_), :math:`\phi_k` is the phase and :math:`A_k` is the asymmetry of the of the :math:`k^\mathrm{th}` spectrum.
+The asymmetry is normalised such that :math:`\sum_k A_k = 1`.
+The instrumental frequency response function, :math:`R(\omega)`, is is in general complex (due to a
+non-symmetric pulse shape) and is the same for all spectra. The values of the phases and asymmetries are fitted in the outer loop of the algorithm.
The :math:`\chi^2` value is calculated via the equation
.. math:: \chi^2 = F\frac{\sum_{k,t} (D_k(t)-g_k(t))^2 }{E_k(t)^2},
-where :math:`F` is the :code:`Factor` and is of order 1.0 (but can be adjusted by the user at the start of the algorithm for a better fit).
+where :math:`F` is the :code:`Factor` and is of order 1.0 (but can be adjusted by the user at the start of the algorithm for a better fit).
The entropy is given by
.. math:: S = - \sum_\omega f(\omega) \log\left(\frac{f(\omega)}{A}\right),
diff --git a/docs/source/algorithms/MuonPairingAsymmetry-v1.rst b/docs/source/algorithms/MuonPairingAsymmetry-v1.rst
index c0b832b34a0326744f2dfe43ac1942c7a19badcb..d6df8d01878a932bb588d414e2e9e654fc8df107 100644
--- a/docs/source/algorithms/MuonPairingAsymmetry-v1.rst
+++ b/docs/source/algorithms/MuonPairingAsymmetry-v1.rst
@@ -11,7 +11,7 @@ Description
When interacting with the :ref:`Muon_Analysis-ref` interface, operations such as detector grouping, group and pair asymmetry are performed on data. This algorithm performs a "pair asymmetry" operation, in other words it takes two groups (from :ref:`algm-MuonGroupingCounts` for example) and calculates the asymmetry between them using the common formula from :ref:`algm-AsymmetryCalc`.
-This algorithm is part of a set of four; with :ref:`algm-MuonPreProcess` being run first; and the output being fed into this one. Alternatively, the groups may be calculated by using :ref:`algm-MuonPreProcess` followed by :ref:`algm-MuonGroupingCounts` and fed into this algorithm by switching off **SpecifyGroupsManually**. This allows the replication of the workflow used by the muon analysis interface to produce group data.
+This algorithm is part of a set of four; with :ref:`algm-MuonPreProcess` being run first; and the output being fed into this one. Alternatively, the groups may be calculated by using :ref:`algm-MuonPreProcess` followed by :ref:`algm-MuonGroupingCounts` and fed into this algorithm by switching off **SpecifyGroupsManually**. This allows the replication of the workflow used by the muon analysis interface to produce group data.
Analysis
########
@@ -24,7 +24,7 @@ With a pair, one may define an asymmetry operation as in :ref:`algm-AsymmetryCal
where :math:`F` and :math:`B` are the forward and backwards groups and alpha is the balance parameter.
-The pair must be given a name via **PairName** which can consist of letters, numbers and underscores.
+The pair must be given a name via **PairName** which can consist of letters, numbers and underscores.
#. Valid names : "pair", "pair2", "pair_2", "1234"
#. Invalid names : "", "pair!", "pair "
@@ -40,7 +40,7 @@ There are two options for supplying the group data :
#. If **SpecifyGroupsManually** is not checked, then two workspaces must be supplied which represent the two groups via **InputWorkspace1** and **InputWorkspace2**. These may be *MatrixWorkspace*s (in the case of single period data); or *WorkspaceGroup*s (in the case of multi period data, the two groups must contain the same number of workspaces). Any *MatrixWorkspace* must only contain one spectra (the group counts).
-Multi period data
+Multi period data
#################
Both single and multi period data are supported by the algorithm.
@@ -48,7 +48,7 @@ Both single and multi period data are supported by the algorithm.
The **SummedPeriods** and **SubtractedPeriods** inputs are used to control the way that periods are combined. so for example;
#. SummedPeriods = 1,2
-#. SubtractedPeriods = 3,4
+#. SubtractedPeriods = 3,4
would combine periods in the combination :math:`(1+2)-(3+4)`.
diff --git a/docs/source/algorithms/MuonPreProcess-v1.rst b/docs/source/algorithms/MuonPreProcess-v1.rst
index 29deea06c62ad0e5ce7ca2521734c52d1d3f3bfb..129e169898924768f14eca230968c84f59f5826f 100644
--- a/docs/source/algorithms/MuonPreProcess-v1.rst
+++ b/docs/source/algorithms/MuonPreProcess-v1.rst
@@ -169,7 +169,7 @@ Output:
X values are : [ 0. 1. 2. 3. 4. 5.]
Y values are : [ 100.3 201.2 302.8 201.2 100.3]
-
+
**Example - Applying only a time zero correction**
.. testcode:: ExampleTimeZero
@@ -177,15 +177,15 @@ Output:
dataX = [0, 1, 2, 3, 4, 5] * 4
dataY = [100, 200, 300, 200, 100] * 4
input_workspace = CreateWorkspace(dataX, dataY, NSpec=4)
-
+
# Create a time zero table
time_zero_table = CreateEmptyTableWorkspace()
time_zero_table.addColumn("double", "time zero")
[time_zero_table.addRow([i+2]) for i in range(4)]
-
- output_workspace = MuonPreProcess(InputWorkspace=input_workspace,
+
+ output_workspace = MuonPreProcess(InputWorkspace=input_workspace,
TimeZeroTable=time_zero_table)
-
+
print("X values are : [{:.0f}, {:.0f}, {:.0f}, {:.0f}, {:.0f}, {:.0f}]".format(
output_workspace[0].readX(0)[0],output_workspace[0].readX(0)[1],
output_workspace[0].readX(0)[2],output_workspace[0].readX(0)[3],
@@ -194,14 +194,14 @@ Output:
output_workspace[0].readY(0)[0],output_workspace[0].readY(0)[1],
output_workspace[0].readY(0)[2],output_workspace[0].readY(0)[3],
output_workspace[0].readY(0)[4]))
-
+
Output:
.. testoutput:: ExampleTimeZero
X values are : [-2, -1, 0, 1, 2, 3]
Y values are : [100, 200, 300, 200, 100]
-
+
.. categories::
.. sourcelink::
\ No newline at end of file
diff --git a/docs/source/algorithms/MuonProcess-v1.rst b/docs/source/algorithms/MuonProcess-v1.rst
index 51121bb57d753e938d85a1d92ebdb639b1a29eb8..f5059741b1749aaf12fffed2e6e2b6f1547b13f0 100644
--- a/docs/source/algorithms/MuonProcess-v1.rst
+++ b/docs/source/algorithms/MuonProcess-v1.rst
@@ -131,7 +131,7 @@ Output:
PairFirstIndex = 1,
PairSecondIndex = 0,
Alpha = 0.5)
-
+
print('Output: {}'.format(output.readY(0)))
Output:
diff --git a/docs/source/algorithms/MuscatData-v1.rst b/docs/source/algorithms/MuscatData-v1.rst
index e6a500e1efe644120b3b2d3dd25970bfca6595b4..7c70bf52dae746ce276e5850c14694345ce4dcfc 100644
--- a/docs/source/algorithms/MuscatData-v1.rst
+++ b/docs/source/algorithms/MuscatData-v1.rst
@@ -34,7 +34,7 @@ Usage
ws = CropWorkspace(ws, StartWorkspaceIndex=0, EndWorkspaceIndex=9)
ws = ScaleX(ws, -5, "Add")
ws = ScaleX(ws, 0.1, "Multiply")
-
+
#load instrument and instrument parameters
LoadInstrument(ws, InstrumentName='IRIS')
path = os.path.join(config['instrumentDefinition.directory'], 'IRIS_graphite_002_Parameters.xml')
@@ -48,7 +48,7 @@ Usage
SaveNexus(ws, "irs26173_graphite002_red.nxs")
SaveNexus(sqw, "irs26173_graphite002_sqw.nxs")
- MuscatData(SamNumber='26173', SqwInput='26173', Thick='0.5', Width='0.5', Instrument='irs')
+ MuscatData(SamNumber='26173', SqwInput='26173', Thick='0.5', Width='0.5', Instrument='irs')
.. categories::
diff --git a/docs/source/algorithms/MuscatFunc-v1.rst b/docs/source/algorithms/MuscatFunc-v1.rst
index 921e759ba69a9b953532f403a1b1fc2776813ad7..2ac0f4294c4f0fc99f9c4568c101b24a63a02225 100644
--- a/docs/source/algorithms/MuscatFunc-v1.rst
+++ b/docs/source/algorithms/MuscatFunc-v1.rst
@@ -27,7 +27,7 @@ Usage
**Example - a basic example using MuscatFunc.**
.. code-block:: python
-
+
def createSampleWorkspace(name, random=False):
""" Creates a sample workspace with a single lorentzian that looks like IRIS data"""
import os
@@ -36,7 +36,7 @@ Usage
ws = CropWorkspace(ws, StartWorkspaceIndex=0, EndWorkspaceIndex=9)
ws = ScaleX(ws, -5, "Add")
ws = ScaleX(ws, 0.1, "Multiply")
-
+
#load instrument and instrument parameters
LoadInstrument(ws, InstrumentName='IRIS', RewriteSpectraMap=True)
path = os.path.join(config['instrumentDefinition.directory'], 'IRIS_graphite_002_Parameters.xml')
@@ -48,7 +48,7 @@ Usage
ws = createSampleWorkspace("irs26173_graphite002_red", random=True)
SaveNexus(ws, "irs26173_graphite002_red.nxs")
- MuscatFunc(SamNumber='26173', Thick='0.5', Width='0.5', Instrument='irs')
+ MuscatFunc(SamNumber='26173', Thick='0.5', Width='0.5', Instrument='irs')
.. categories::
diff --git a/docs/source/algorithms/NormaliseByCurrent-v1.rst b/docs/source/algorithms/NormaliseByCurrent-v1.rst
index f465a62d3b02ffe31a073308d701cd65219e21ac..556646c15828c38057c929b8aeeb1938af56d8f1 100644
--- a/docs/source/algorithms/NormaliseByCurrent-v1.rst
+++ b/docs/source/algorithms/NormaliseByCurrent-v1.rst
@@ -14,7 +14,7 @@ from the Input Workspace log data, which is stored in the workspace's
:py:obj:`run object <mantid.api.Run>`. Every data point
(and its error) is divided by that number.
The good proton charge value is added to the normalized workspace
-as the value of *NormalizationFactor* log.
+as the value of *NormalizationFactor* log.
ISIS Calculation Details
@@ -47,7 +47,7 @@ Usage
# Create two workspaces
ws = CreateWorkspace(DataX=range(0,3), DataY=(17,12))
- # Add Good Proton Charge Log
+ # Add Good Proton Charge Log
AddSampleLog(Workspace=ws, LogName='gd_prtn_chrg', LogText='10.0', LogType='Number')
# Fetch the generated logs
@@ -74,7 +74,7 @@ Output:
Good Proton Charge = 10.0
Before normalisation [ 17. 12.]
After normalisation [ 1.7 1.2]
- Normalisation factor 10.0
+ Normalisation factor 10.0
.. categories::
diff --git a/docs/source/algorithms/NormaliseByDetector-v1.rst b/docs/source/algorithms/NormaliseByDetector-v1.rst
index c44986dc2b686ea2f133768e850b76d4dba4d1f7..afec9fff5156f825e901f754e047dc7c71068a4b 100644
--- a/docs/source/algorithms/NormaliseByDetector-v1.rst
+++ b/docs/source/algorithms/NormaliseByDetector-v1.rst
@@ -159,7 +159,7 @@ definitions on different components in the tree.
Usage
-----
-**Example - A simple linear correction**
+**Example - A simple linear correction**
.. testcode:: ExLinear
@@ -212,7 +212,7 @@ Usage
Output:
.. testoutput:: ExLinear
-
+
The correction will divide the data by an increasing linear function.
f(x) = 2x + 1
The correct value in bin 0 is 0.28 compared to 0.30
diff --git a/docs/source/algorithms/NormaliseByThickness-v1.rst b/docs/source/algorithms/NormaliseByThickness-v1.rst
index 362f9dff526d75f221b59c6df21894d06dde68be..8090bbfde166009b55e269fba36195064067b290 100644
--- a/docs/source/algorithms/NormaliseByThickness-v1.rst
+++ b/docs/source/algorithms/NormaliseByThickness-v1.rst
@@ -19,7 +19,7 @@ Usage
#create a workspace
raw=CreateSampleWorkspace()
-
+
#apply algorithm
norm=NormaliseByThickness(raw,SampleThickness=10)
@@ -29,8 +29,8 @@ Usage
print("Min(norm)= {}".format(norm[0].dataY(0).min()))
print("Max(raw)= {}".format(raw.dataY(0).max()))
print("Max(norm)= {}".format(norm[0].dataY(0).max()))
-
-
+
+
.. testcleanup:: NormaliseByThicness
DeleteWorkspace('raw')
diff --git a/docs/source/algorithms/NormaliseSpectra-v1.rst b/docs/source/algorithms/NormaliseSpectra-v1.rst
index ef9b534a1f3044040f1761190726d10c1b7afcc9..5431001c60160b2d91deac4ca424ec8f8f3225be 100644
--- a/docs/source/algorithms/NormaliseSpectra-v1.rst
+++ b/docs/source/algorithms/NormaliseSpectra-v1.rst
@@ -27,18 +27,18 @@ Usage
# Create Workspace
data = '0,1,2,3,4,5'
ws = CreateWorkspace(DataX=data, DataY=data, DataE=data, Nspec=1)
-
+
# Execute algorithm
out_ws = NormaliseSpectra(InputWorkspace=ws)
-
+
# Print resulting y values
print(out_ws.readY(0))
-Output:
-
+Output:
+
.. testoutput:: NormaliseSpectraExample
:options: +NORMALIZE_WHITESPACE
-
+
[ 0. 0.2 0.4 0.6 0.8 1. ]
.. categories::
diff --git a/docs/source/algorithms/NormaliseToMonitor-v1.rst b/docs/source/algorithms/NormaliseToMonitor-v1.rst
index 79df1957337b68e9a6f6889356150a413b795155..fa8685028ca05fb413d594d45dfb3d78e2975bcd 100644
--- a/docs/source/algorithms/NormaliseToMonitor-v1.rst
+++ b/docs/source/algorithms/NormaliseToMonitor-v1.rst
@@ -62,9 +62,9 @@ account the error on the monitor counts.
Detector Scan Workspaces
########################
-Workspaces that have scanning detectors are supported by this algorithm, both for bin-by-bin mode and normlisation by integrated
-count. The only option for specifying the monitor is by 'MonitorID', attempting to use 'MonitorSpectrum' or MonitorWorkspaceIndex'
-will throw an error. In this case the 'NormFactorWS' output will contain a monitor spectrum for each time index.
+Workspaces that have scanning detectors are supported by this algorithm, both for bin-by-bin mode and normlisation by integrated
+count. The only option for specifying the monitor is by 'MonitorID', attempting to use 'MonitorSpectrum' or MonitorWorkspaceIndex'
+will throw an error. In this case the 'NormFactorWS' output will contain a monitor spectrum for each time index.
Child Algorithms used
#####################
@@ -100,10 +100,10 @@ Output:
.. testoutput:: exNormaliseToMonitorSimple
Without normalisation
- Monitor ID=1 626034.000, 626681.000
+ Monitor ID=1 626034.000, 626681.000
Selected data 2.000000, 1.000000
With Normalisation
- Monitor ID=1 464872.441, 464872.441
+ Monitor ID=1 464872.441, 464872.441
Selected data 1.485135, 0.741801
.. categories::
diff --git a/docs/source/algorithms/NormaliseVanadium-v1.rst b/docs/source/algorithms/NormaliseVanadium-v1.rst
index ce62421c7194611b61ab92a2ce015126f8d1fee4..99e56b0770ca5c4ecbcde0a9515f1a192f91e777 100644
--- a/docs/source/algorithms/NormaliseVanadium-v1.rst
+++ b/docs/source/algorithms/NormaliseVanadium-v1.rst
@@ -19,12 +19,12 @@ Usage
.. testcode:: NormaliseVanadium
-
+
vanadium = CreateWorkspace(DataX='0,0.5,1,1.5,2,2.5,3,3.5,4,4.5,5', DataY='10.574151,10.873,11.07348,11.22903,11.42286,11.47365,11.37375,11.112,10.512181,10.653397', UnitX='wavelength')
LoadInstrument(Workspace=vanadium, Filename='unit_testing/MINITOPAZ_Definition.xml', RewriteSpectraMap=True)
norm_van = NormaliseVanadium(InputWorkspace=vanadium)
print("Wavelength = {} Y = {:.11f}".format(norm_van.readX(0)[2], norm_van.readY(0)[2]))
-
+
Output:
.. testoutput:: NormaliseVanadium
diff --git a/docs/source/algorithms/OSIRISDiffractionReduction-v1.rst b/docs/source/algorithms/OSIRISDiffractionReduction-v1.rst
index a14f8306dfda4a2e37baac92c2efaac9ea380967..9a0a909e3fa6ae29d2735b2bcb2b91cc872180bd 100644
--- a/docs/source/algorithms/OSIRISDiffractionReduction-v1.rst
+++ b/docs/source/algorithms/OSIRISDiffractionReduction-v1.rst
@@ -30,7 +30,7 @@ Usage
.. testcode:: ExOSIRISDiffractionReductionSimple
import os
-
+
def createDummyOSIRISWorkspace(name, func, xmin, xmax, bin_width):
"""Creates a workspace that looks something like an OSIRIS diffraction run"""
#create workspace according to function
diff --git a/docs/source/algorithms/PDConvertReciprocalSpace-v1.rst b/docs/source/algorithms/PDConvertReciprocalSpace-v1.rst
index 04de4579c1d1559a9cb4427b1ec788f710ff9e6c..bfba25d172240f43a8ab714a69597724b6a473f3 100644
--- a/docs/source/algorithms/PDConvertReciprocalSpace-v1.rst
+++ b/docs/source/algorithms/PDConvertReciprocalSpace-v1.rst
@@ -14,28 +14,28 @@ The neutron diffraction is measuring the differential scattering cross section (
.. math::
:label: CrossSection
-
+
\frac{d\sigma}{d\Omega} = \frac{N}{\phi d\Omega}
-Here the :math:`N` is the number of scattered neutrons in unit time in a solid angle :math:`d\Omega`, and
+Here the :math:`N` is the number of scattered neutrons in unit time in a solid angle :math:`d\Omega`, and
:math:`\phi` is the incident neutron flux. The algorithm supports the following conversions:
.. math::
:label: SofQ
-
+
S(Q) = \frac{1}{N_{s} \langle b_{coh} \rangle^2}\frac{d\sigma}{d\Omega}(Q) - \frac{\langle b_{tot}^2 \rangle - \langle b_{coh} \rangle^2}{\langle b_{coh} \rangle^2}
.. math::
:label: FofQ
-
+
F(Q) = Q [S(Q) - 1]
.. math::
:label: FKofQ
-
+
F_K(Q) = \langle b_{coh} \rangle^2 [S(Q) - 1] = \frac{\langle b_{coh} \rangle^2}{Q} F(Q)
-where :math:`N_s` is the number of scatters in the sample and both :math:`\langle b_{tot}^2 \rangle` and :math:`\langle b_{coh} \rangle^2` are defined in the :ref:`Materials concept page <Materials>`.
+where :math:`N_s` is the number of scatters in the sample and both :math:`\langle b_{tot}^2 \rangle` and :math:`\langle b_{coh} \rangle^2` are defined in the :ref:`Materials concept page <Materials>`.
NOTE: This algorithm requires that :ref:`algm-SetSampleMaterial` is called prior in order to determine the :math:`\langle b_{tot}^2 \rangle` and :math:`\langle b_{coh} \rangle^2` terms.
@@ -79,7 +79,7 @@ Usage
filename = wget.download(url)
q, sq, fq_, fk_, dcs_ = np.loadtxt(filename, skiprows=2, unpack=True)
- # Convert S(Q) to Mantid wksp
+ # Convert S(Q) to Mantid wksp
s_of_q = CreateWorkspace(DataX=q, DataY=sq,
UnitX="MomentumTransfer",
Distribution=True)
@@ -87,11 +87,11 @@ Usage
f_of_q=PDConvertReciprocalSpace(InputWorkspace=s_of_q, From='S(Q)', To='F(Q)')
fk_of_q=PDConvertReciprocalSpace(InputWorkspace=s_of_q, From='S(Q)', To='FK(Q)')
dcs_of_q=PDConvertReciprocalSpace(InputWorkspace=s_of_q, From='S(Q)', To='DCS(Q)')
-
+
fig, ax = plt.subplots(subplot_kw={'projection':'mantid'})
- ax.plot(s_of_q,'k-', label='$S(Q)$')
- ax.plot(f_of_q,'r-', label='$F(Q)$')
- ax.plot(fk_of_q,'b-', label='$F_K(Q)$')
+ ax.plot(s_of_q,'k-', label='$S(Q)$')
+ ax.plot(f_of_q,'r-', label='$F(Q)$')
+ ax.plot(fk_of_q,'b-', label='$F_K(Q)$')
ax.plot(dcs_of_q,'g-', label='$d\sigma / d\Omega(Q)$')
ax.legend() # show the legend
fig.show()
diff --git a/docs/source/algorithms/PDFFourierTransform-v1.rst b/docs/source/algorithms/PDFFourierTransform-v1.rst
index 366c8f9051c57dacff6ef8407a9dd53226d3d2d1..7f6132897dc3c7b603ef9ed19e79bbdb5ff006d6 100644
--- a/docs/source/algorithms/PDFFourierTransform-v1.rst
+++ b/docs/source/algorithms/PDFFourierTransform-v1.rst
@@ -9,9 +9,9 @@
Description
-----------
-The algorithm transforms a single spectrum workspace containing
-spectral density :math:`S(Q)`, :math:`S(Q)-1`, or :math:`Q[S(Q)-1]`
-(as a function of **MomentumTransfer** or **dSpacing** :ref:`units <Unit Factory>`) to a PDF
+The algorithm transforms a single spectrum workspace containing
+spectral density :math:`S(Q)`, :math:`S(Q)-1`, or :math:`Q[S(Q)-1]`
+(as a function of **MomentumTransfer** or **dSpacing** :ref:`units <Unit Factory>`) to a PDF
(pair distribution function) as described below. The available output types are the reduced pair
distribution function :math:`G(r)`, the pair distribution function :math:`g(r)`, and the radial distribution
function :math:`RDF(r)`.
@@ -136,8 +136,8 @@ transforms to
.. raw:: html
</center>
-
-**Note:** All output forms except :math:`G(r)` are calculated by transforming :math:`G(r)`.
+
+**Note:** All output forms except :math:`G(r)` are calculated by transforming :math:`G(r)`.
Usage
-----
@@ -155,14 +155,14 @@ Usage
# Look at sample results:
print('part of S(Q) and its correlation function')
- for i in range(10):
+ for i in range(10):
print('! {0:4.2f} ! {1:5f} ! {2:f} ! {3:5f} !'.format(xx[i], yy[i], Rt.readX(0)[i], Rt.readY(0)[i]))
.. testcleanup:: ExPDFFourierTransform
DeleteWorkspace(ws)
- DeleteWorkspace(Rt)
+ DeleteWorkspace(Rt)
**Output:**
@@ -180,7 +180,7 @@ Usage
! 0.80 ! 0.077305 ! 2.855993 ! 0.940616 !
! 0.90 ! 0.039164 ! 3.173326 ! 1.050882 !
-
+
.. categories::
diff --git a/docs/source/algorithms/PDFFourierTransform-v2.rst b/docs/source/algorithms/PDFFourierTransform-v2.rst
index 4779926057b2fa02694583340aa60b3d288d46cb..3a6094b020fd0073344c51434ad798c46919ec3d 100644
--- a/docs/source/algorithms/PDFFourierTransform-v2.rst
+++ b/docs/source/algorithms/PDFFourierTransform-v2.rst
@@ -9,9 +9,9 @@
Description
-----------
-The algorithm transforms a single spectrum workspace containing
-spectral density :math:`S(Q)`, :math:`S(Q)-1`, or :math:`Q[S(Q)-1]`
-(as a function of **MomentumTransfer** or **dSpacing** :ref:`units <Unit Factory>`) to a PDF
+The algorithm transforms a single spectrum workspace containing
+spectral density :math:`S(Q)`, :math:`S(Q)-1`, or :math:`Q[S(Q)-1]`
+(as a function of **MomentumTransfer** or **dSpacing** :ref:`units <Unit Factory>`) to a PDF
(pair distribution function) as described below and also the reverse. The available PDF types are the
reduced pair distribution function :math:`G(r)`, the pair distribution function :math:`g(r)`, and the
radial distribution function :math:`RDF(r)`.
@@ -130,14 +130,14 @@ Usage
# Look at sample results:
print('part of S(Q) and its correlation function')
- for i in range(10):
+ for i in range(10):
print('! {0:4.2f} ! {1:5f} ! {2:f} ! {3:5f} !'.format(xx[i], yy[i], Rt.readX(0)[i], Rt.readY(0)[i]))
.. testcleanup:: ExPDFFourierTransform
DeleteWorkspace(ws)
- DeleteWorkspace(Rt)
+ DeleteWorkspace(Rt)
**Output:**
@@ -154,7 +154,7 @@ Usage
! 0.70 ! 0.140858 ! 2.538661 ! 1.080090 !
! 0.80 ! 0.077305 ! 2.855993 ! 0.940530 !
! 0.90 ! 0.039164 ! 3.173326 ! 1.051576 !
-
+
.. categories::
diff --git a/docs/source/algorithms/PSIBackgroundSubtraction-v1.rst b/docs/source/algorithms/PSIBackgroundSubtraction-v1.rst
index b7755c69d1328a55acb6903b33ed37bd3d1a8415..22968aad6d7ee1e9842e329b8a55f5c13965fb79 100644
--- a/docs/source/algorithms/PSIBackgroundSubtraction-v1.rst
+++ b/docs/source/algorithms/PSIBackgroundSubtraction-v1.rst
@@ -22,7 +22,7 @@ To obtain the flat background, :math:`B`, the second-half of the good raw-data i
.. math:: f(t) = \mbox{A}e^{-\lambda t} + B
-where the first term represents a ExpDecay function, see :ref:`func-ExpDecayMuon`.
+where the first term represents a ExpDecay function, see :ref:`func-ExpDecayMuon`.
The good raw-data is defined as being from the bin containing the `first good data` to the bin containing the `last good data`.
The algorithm takes in an input workspace and performs the correction inplace on the workspace. The number of iterations
diff --git a/docs/source/algorithms/PaddingAndApodization-v1.rst b/docs/source/algorithms/PaddingAndApodization-v1.rst
index 283213a093d3eaae67946fc674a3ab776a5e6d4d..4c24a7331e6299a689582761ba333cee4a52e506 100644
--- a/docs/source/algorithms/PaddingAndApodization-v1.rst
+++ b/docs/source/algorithms/PaddingAndApodization-v1.rst
@@ -9,21 +9,21 @@
Description
-----------
-This algorithm can prepare data for
- :ref:`FFT <algm-FFT>` by applying padding and/or applying an apodization function.
+This algorithm can prepare data for
+ :ref:`FFT <algm-FFT>` by applying padding and/or applying an apodization function.
Padding is when the input data is extended by adding extra measurments of zero at regular intervals. For real data this is only done after the end of the input data. However, for complex data the padding should be shared between the start and end of the input data.
`Apodization functions <http://mathworld.wolfram.com/ApodizationFunction.html>`_ can be used to remove data with large errors. These are usually
-found at large time scales. These take a decay constant
-(:math:`\tau` ) that determines the rate at which the data goes to zero.
+found at large time scales. These take a decay constant
+(:math:`\tau` ) that determines the rate at which the data goes to zero.
The time the function is evaluated at is denoted by :math:`t`.
The current implementation includes the following functions:
- None.
- Lorentz :math:`\exp\left(-\frac{t}{\tau}\right)`.
- Gaussian :math:`\exp\left(-\frac{t^2}{2\tau^2}\right)`.
-
+
Usage
-----
@@ -38,7 +38,7 @@ Usage
input = CreateWorkspace(x,y)
output=PaddingAndApodization(InputWorkspace=input,ApodizationFunction="Gaussian",DecayConstant=2.44,Padding=0,)
print("output: {}".format(['{0:.2f}'.format(value) for value in output.readY(0)]))
-
+
Output:
.. testoutput:: ExSimple
@@ -56,7 +56,7 @@ Output:
input = CreateWorkspace(x,y)
output=PaddingAndApodization(InputWorkspace=input,Padding=2,)
print("output: {}".format(['{0:.2f}'.format(value) for value in output.readY(0)]))
-
+
Output:
.. testoutput:: ExPadding
@@ -74,13 +74,13 @@ Output:
input = CreateWorkspace(x,y)
output=PaddingAndApodization(InputWorkspace=input,ApodizationFunction="Gaussian",DecayConstant=2.44,Padding=2,)
print("output: {}".format(['{0:.2f}'.format(value) for value in output.readY(0)]))
-
+
Output:
.. testoutput:: ExBoth
output: ['91.94', '107.20', '23.48', '2.61', '0.61', '0.00', '0.00', '0.00', '0.00', '0.00', '0.00', '0.00', '0.00', '0.00', '0.00']
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/Pause-v1.rst b/docs/source/algorithms/Pause-v1.rst
index 88e8f4affb5098acb4a48e317a10513a711402a1..e67dab4be6c229274c259a2ca6ac9336d9d35796 100644
--- a/docs/source/algorithms/Pause-v1.rst
+++ b/docs/source/algorithms/Pause-v1.rst
@@ -19,22 +19,22 @@ execution of a fast script.
Usage
-----
-**Example - Pausing for a time:**
+**Example - Pausing for a time:**
.. testcode:: ExPauseString
import time
-
+
start_time = time.time()
Pause(0.05)
end_time = time.time()
print("The algorithm paused for {:.2f} seconds.".format(end_time-start_time))
-
+
Output:
.. testoutput:: ExPauseString
:options: +ELLIPSIS
-
+
The algorithm paused for ... seconds.
.. categories::
diff --git a/docs/source/algorithms/PeakIntensityVsRadius-v1.rst b/docs/source/algorithms/PeakIntensityVsRadius-v1.rst
index 20d90b1737e688e3dc2b50640490070b6e1594af..e4075729a51a06da72cb9c71e10e6ec1e2a43b59 100644
--- a/docs/source/algorithms/PeakIntensityVsRadius-v1.rst
+++ b/docs/source/algorithms/PeakIntensityVsRadius-v1.rst
@@ -48,7 +48,7 @@ Usage
**Example - PeakIntensityVsRadius:**
-The code itself works but disabled from doc tests as takes too long to complete. User should provide its own
+The code itself works but disabled from doc tests as takes too long to complete. User should provide its own
event nexus file instead of **TOPAZ_3132_event.nxs** used within this example. The original **TOPAZ_3132_event.nxs**
file is available in `Mantid system tests repository <https://github.com/mantidproject/systemtests/tree/master/Data/TOPAZ_3132_event.nxs>`_.
diff --git a/docs/source/algorithms/PeaksInRegion-v1.rst b/docs/source/algorithms/PeaksInRegion-v1.rst
index 416e628b74479109c896766a328d7936dc50e628..f4b699775f1a8fa4e62bf51cbb8e79249b2deedf 100644
--- a/docs/source/algorithms/PeaksInRegion-v1.rst
+++ b/docs/source/algorithms/PeaksInRegion-v1.rst
@@ -23,19 +23,19 @@ Usage
mdew = Load("TOPAZ_3680_5_sec_MDEW.nxs")
# Find some peaks. These are all unindexed so will have HKL = [0,0,0]
peaks = FindPeaksMD(InputWorkspace=mdew, MaxPeaks=1)
-
+
# Find peaks in region when the Peak sits in the centre of a box
in_box_table = PeaksInRegion(peaks, CoordinateFrame='HKL', PeakRadius=0.1, Extents=[-1.0,1.0,-1.0,1.0,-1.0,1.0], CheckPeakExtents=True)
print("{{'Distance': {Distance}, 'PeakIndex': {PeakIndex}, 'Intersecting': {Intersecting}}}".format(**in_box_table.row(0)))
-
+
# Find peaks in region when the peak is just outside the box (by radius)
just_outside_box_table = PeaksInRegion(peaks, CoordinateFrame='HKL', PeakRadius=0.999, Extents=[1.0,2.0,-1.0,1.0,-1.0,1.0], CheckPeakExtents=True)
print("{{'Distance': {Distance}, 'PeakIndex': {PeakIndex}, 'Intersecting': {Intersecting}}}".format(**just_outside_box_table.row(0)))
-
+
# Find peaks in region when the peak is just inside the box (by radius)
just_intersecting_box_table = PeaksInRegion(peaks, CoordinateFrame='HKL', PeakRadius=1.00, Extents=[1.0,2.0,-1.0,1.0,-1.0,1.0], CheckPeakExtents=True)
print("{{'Distance': {Distance}, 'PeakIndex': {PeakIndex}, 'Intersecting': {Intersecting}}}".format(**just_intersecting_box_table.row(0)))
-
+
Output:
.. testoutput:: PeaksInRegionExample
diff --git a/docs/source/algorithms/PeaksOnSurface-v1.rst b/docs/source/algorithms/PeaksOnSurface-v1.rst
index 9863d8155b84dd38bd66f84c057621039f1ba83b..a1d2b85b02fb85af714f0fd8b745548e94682025 100644
--- a/docs/source/algorithms/PeaksOnSurface-v1.rst
+++ b/docs/source/algorithms/PeaksOnSurface-v1.rst
@@ -25,27 +25,27 @@ Usage
mdew = Load("TOPAZ_3680_5_sec_MDEW.nxs")
# Find some peaks. These are all unindexed so will have HKL = [0,0,0]
peaks = FindPeaksMD(InputWorkspace=mdew, MaxPeaks=1)
-
+
# Peak is on the plane
out_of_plane_offset = 0
tbl = PeaksOnSurface(InputWorkspace=peaks, PeakRadius=1.0, CoordinateFrame='HKL',
Vertex1=[1.0, -1.0, out_of_plane_offset], Vertex2=[-1.0,-1.0,out_of_plane_offset],
Vertex3=[-1.0, 1.0,out_of_plane_offset], Vertex4=[1.0, 1.0,out_of_plane_offset])
print("{{'Distance': {Distance}, 'PeakIndex': {PeakIndex}, 'Intersecting': {Intersecting}}}".format(**tbl.row(0)))
-
+
# Peak is off the plane, and does not intesect it
out_of_plane_offset = 1.000
tbl = PeaksOnSurface(InputWorkspace=peaks, PeakRadius=0.999, CoordinateFrame='HKL',
Vertex1=[1.0, -1.0, out_of_plane_offset], Vertex2=[-1.0,-1.0,out_of_plane_offset],
Vertex3=[-1.0, 1.0,out_of_plane_offset], Vertex4=[1.0, 1.0,out_of_plane_offset])
print("{{'Distance': {Distance}, 'PeakIndex': {PeakIndex}, 'Intersecting': {Intersecting}}}".format(**tbl.row(0)))
-
+
# Peak is off the plane, but does intesect it when radius is made larger
tbl = PeaksOnSurface(InputWorkspace=peaks, PeakRadius=1.000, CoordinateFrame='HKL',
Vertex1=[1.0, -1.0, out_of_plane_offset], Vertex2=[-1.0,-1.0,out_of_plane_offset],
Vertex3=[-1.0, 1.0,out_of_plane_offset], Vertex4=[1.0, 1.0,out_of_plane_offset])
print("{{'Distance': {Distance}, 'PeakIndex': {PeakIndex}, 'Intersecting': {Intersecting}}}".format(**tbl.row(0)))
-
+
Output:
.. testoutput:: PeaksOnSurfaceExample
diff --git a/docs/source/algorithms/PerformIndexOperations-v1.rst b/docs/source/algorithms/PerformIndexOperations-v1.rst
index cc43e6c55990a5df181c39f2d91a33eb4d0bb9b7..6bc347c1535ac508dcda42b153d9465fc7e1f46a 100644
--- a/docs/source/algorithms/PerformIndexOperations-v1.rst
+++ b/docs/source/algorithms/PerformIndexOperations-v1.rst
@@ -18,7 +18,7 @@ Instructions
The processing instructions consist of a list of numbers that refer to spectra 0 to n-1 and various operators ',',':','+' and '-'.
To remove spectra, list those you want to keep. The ':' symbol indicates a continuous range of spectra, sparing you the need to list every spectrum.
-For example if you have 100 spectra (0 to 99) and want to remove the first and last 10 spectra along with spectrum 12,
+For example if you have 100 spectra (0 to 99) and want to remove the first and last 10 spectra along with spectrum 12,
you would use processing instructions '10,13:89'. This says keep spectrum 10 along with spectra 13 to 89 inclusive.
To add spectra, use '+' to add two spectra or '-' to add a range. For example you may with to add spectrum 10 to 12 and ignore the rest, you would use '10+12'.
@@ -43,7 +43,7 @@ Usage
print(ws2.readY(0))
print(ws2.readY(1))
print(ws2.readY(2))
-
+
Output:
.. testoutput:: ExPerformIndexOperationsSimple
diff --git a/docs/source/algorithms/PhaseQuad-v1.rst b/docs/source/algorithms/PhaseQuad-v1.rst
index cfebdc56ba5cfa6c36ed7e8d2b4ac01cd1661ef8..fb7120e7c62de536d3c2593da85e1d239137f453 100644
--- a/docs/source/algorithms/PhaseQuad-v1.rst
+++ b/docs/source/algorithms/PhaseQuad-v1.rst
@@ -25,7 +25,7 @@ Description
Assuming that the *InputWorkspace* contains measured counts as a function of time,
and *PhaseTable* contains the detector phases and asymmetries, the algorithm returns a workspace
-containing two spectra (squashograms) as a function of the same time binning. If there are zero
+containing two spectra (squashograms) as a function of the same time binning. If there are zero
measured counts for a detector it is ignored in the calculation.
*PhaseTable* is expected to have three columns, corresponding to the detector id, its asymmetry
and its phase.
diff --git a/docs/source/algorithms/PlotAsymmetryByLogValue-v1.rst b/docs/source/algorithms/PlotAsymmetryByLogValue-v1.rst
index 65e32054871bd1ed3083e2e6f161392a5d00a596..f537a0593310b454fde6abb179c88ba71844fb5c 100644
--- a/docs/source/algorithms/PlotAsymmetryByLogValue-v1.rst
+++ b/docs/source/algorithms/PlotAsymmetryByLogValue-v1.rst
@@ -65,7 +65,7 @@ Output:
Y values (asymmetry): [ 0.14500665 0.136374 0.11987909]
X values (sample magn. field): [ 1350. 1360. 1370.]
-
+
**Example - Calculating asymmetry for a series of MUSR runs using a range:**
.. testcode:: ExSimpleRange
@@ -81,12 +81,12 @@ Output:
ws.readY(0)[0],ws.readY(0)[1],ws.readY(0)[2]))
print("X values (sample magn. field): [ {:.1f} {:.1f} {:.1f} ]".format(
ws.readX(0)[0],ws.readX(0)[1],ws.readX(0)[2]))
-
+
Output:
.. testoutput:: ExSimpleRange
:options: +NORMALIZE_WHITESPACE
-
+
Y values (asymmetry): [ 0.1450066 0.0929052 0.0652143 ]
X values (sample magn. field): [ 1350.0 1380.0 1410.0 ]
@@ -124,7 +124,7 @@ Output:
# Skip spectra 35
fwd_spectra = [x for x in range(33, 65) if x != 35]
-
+
# Skip spectra 1 and 2
bwd_spectra = range(3, 33)
diff --git a/docs/source/algorithms/PlotPeakByLogValue-v1.rst b/docs/source/algorithms/PlotPeakByLogValue-v1.rst
index 249bbcee557579c0145d7919af29b0213e2b5e02..7dd7f8e4aedbd163ac8ab5479f157d5fd3919359 100644
--- a/docs/source/algorithms/PlotPeakByLogValue-v1.rst
+++ b/docs/source/algorithms/PlotPeakByLogValue-v1.rst
@@ -40,9 +40,9 @@ FitType defines the way of setting initial values. If it is set to
previous fit. If set to "Individual" each fit starts with the same
initial values defined in the Function property.
-The Function property can be a single domain function in which case this
+The Function property can be a single domain function in which case this
function is used to fit each of the inputs, or it can be a multi-domain function.
-In the latter case the number of domains must equal the number of inputs and
+In the latter case the number of domains must equal the number of inputs and
each input is fitted to the equivalent function from the multi-domain function.
LogValue property specifies a log value to be included into the output.
diff --git a/docs/source/algorithms/Plus-v1.rst b/docs/source/algorithms/Plus-v1.rst
index 0e5ccdcf98eb0c71e97cbbd3815f6b47dfc02c3d..b50d51c897ced0f76ac2a3e539a721888bfccf42 100644
--- a/docs/source/algorithms/Plus-v1.rst
+++ b/docs/source/algorithms/Plus-v1.rst
@@ -8,7 +8,7 @@
Description
-----------
-
+
.. |sym| replace:: \+
.. |verb| replace:: added
diff --git a/docs/source/algorithms/PolDiffILLReduction-v1.rst b/docs/source/algorithms/PolDiffILLReduction-v1.rst
index 79f160c66bb9cd3a434efa01ec47e525dc66ce08..e1fbec77854b609fc6514cf0a44a2f121de1999b 100644
--- a/docs/source/algorithms/PolDiffILLReduction-v1.rst
+++ b/docs/source/algorithms/PolDiffILLReduction-v1.rst
@@ -149,7 +149,7 @@ Quartz
.. diagram:: PolDiffILLReduction-v1_quartz_wkflw.dot
-
+
Reference
#########
@@ -236,7 +236,7 @@ This example below performs a complete reduction for D7 data.
OutputWorkspace='absorber_ws',
ProcessAs='Absorber'
)
-
+
# Polarisation correction
PolDiffILLReduction(
Run='396939',
@@ -257,7 +257,7 @@ This example below performs a complete reduction for D7 data.
ProcessAs='Transmission'
)
print('Vanadium transmission is {0:.3f}'.format(mtd['vanadium_transmission_1'].readY(0)[0]))
-
+
# Vanadium reduction
PolDiffILLReduction(
Run='396993',
diff --git a/docs/source/algorithms/PolarizationCorrectionFredrikze-v1.rst b/docs/source/algorithms/PolarizationCorrectionFredrikze-v1.rst
index 8ed2fae2876cf497903f56d09707bb6312fbcddf..e4ff4022fce257fcaebcce8e752cd97cc0582bd7 100644
--- a/docs/source/algorithms/PolarizationCorrectionFredrikze-v1.rst
+++ b/docs/source/algorithms/PolarizationCorrectionFredrikze-v1.rst
@@ -27,7 +27,7 @@ Since this ratio is wavelength dependent, rho is a polynomial, which is expresse
Since this ratio is wavelength dependent, alpha is a polynomial, which is expressed as a function of wavelength. For example:
:math:`\alpha(\lambda) =\sum\limits_{i=0}^{i=2} K_{i}\centerdot\lambda^i`, can be provided as :math:`K_{0}, K_{1}, K_{2}`
-Output from Full Polarization Analysis
+Output from Full Polarization Analysis
--------------------------------------
The output of this algorithm, as we can see in the table of properties, is a :ref:`WorkspaceGroup <WorkspaceGroup>`. If the algorithm has been executed with "PA" as the Polarization mode
then the resulting :ref:`WorkspaceGroup <WorkspaceGroup>` will have 4 entries and should be in the format:
@@ -38,7 +38,7 @@ Entry in group Measurement
1 :math:`I_{pp}`
2 :math:`I_{pa}`
3 :math:`I_{ap}`
-4 :math:`I_{aa}`
+4 :math:`I_{aa}`
============== ================
diff --git a/docs/source/algorithms/PoldiAnalyseResiduals-v1.rst b/docs/source/algorithms/PoldiAnalyseResiduals-v1.rst
index 4e7d1efd056eb3ed5e872bb9771b909e339ff5b7..1124c6a9df3983b10e9dbdce1ed6920884a9d8aa 100644
--- a/docs/source/algorithms/PoldiAnalyseResiduals-v1.rst
+++ b/docs/source/algorithms/PoldiAnalyseResiduals-v1.rst
@@ -54,7 +54,7 @@ The following example shows how to calculate the residuals following a fit perfo
print("Residuals are in the range: [ {:.2f} , {:.2f} ]".format(round(min(residual_data), 2), round(max(residual_data), 2)))
The output contains the range in which residuals are found:
-
+
.. testoutput:: ExSiliconMerged
Residuals are in the range: [ -2361.45 , 2651.65 ]
diff --git a/docs/source/algorithms/PoldiAutoCorrelation-v5.rst b/docs/source/algorithms/PoldiAutoCorrelation-v5.rst
index fab4797afc75a89d9c25694c8b96f9e53bfc02c6..9b7736c06138dec3d26506db805170ef8c8f55c4 100644
--- a/docs/source/algorithms/PoldiAutoCorrelation-v5.rst
+++ b/docs/source/algorithms/PoldiAutoCorrelation-v5.rst
@@ -13,7 +13,7 @@ Description
:figwidth: 10 cm
:align: right
:alt: Raw POLDI data for Silicon powder standard (simulated).
-
+
Raw POLDI data for Silicon powder standard. The spectrum is simulated.
PoldiAutoCorrelation is a core part of the POLDI data analysis process. It takes a 2D-spectrum from POLDI as input, with arrival time :math:`t` as x-axis and scattering angle :math:`2\theta` as y-axis. In Mantid, the data is represented by a MatrixWorkspace, which contains one spectrum for each :math:`2\theta`-value of the detector, each containing usually 500 time-bins.
@@ -24,7 +24,7 @@ Without any *a-priori* information about the sample, a correlation spectrum is c
:figwidth: 10 cm
:align: right
:alt: Correlation spectrum of Silicon powder standard.
-
+
Correlation spectrum of Silicon powder standard.
A full description of the procedure goes beyond the scope of this documentation. Detailed information about this procedure is available on the `POLDI website`_ and more specifically in the paper describing the pulse overlap concept (U. Stuhr, Nuclear Instruments and Methods in Physics Research A 545, S. 319, 2005).
@@ -42,22 +42,22 @@ PoldiAutoCorrelation operates on a MatrixWorkspace with a valid POLDI instrument
# Load data file with Si spectrum, this loads the HDF-data into a MatrixWorkspace named raw_6904
raw_6904 = LoadSINQFile(Filename = "poldi2013n006904.hdf", Instrument = "POLDI")
-
+
# Print the number of spectra in the workspace. It should be 400, one for each detector wire
print("The workspace contains {} spectra.".format(raw_6904.getNumberHistograms()))
-
+
# For most calculations, an instrument definition is needed, so it's loaded as well
LoadInstrument(raw_6904, InstrumentName = "POLDI", RewriteSpectraMap=True)
-
+
# Call the actual algorithm.
correlated_6904 = PoldiAutoCorrelation(raw_6904)
-
+
# The first spectrum contains the correlation data. In this case there should be 5531 bins.
# On other data or different wavelength limits, this number will be different.
print("The correlation spectrum has {} data points.".format(len(correlated_6904.readY(0))))
-Output:
-
+Output:
+
.. testoutput:: ExSilicon
The workspace contains 400 spectra.
diff --git a/docs/source/algorithms/PoldiFitPeaks1D-v1.rst b/docs/source/algorithms/PoldiFitPeaks1D-v1.rst
index 3043e2daef16bedcaa82e21008407af089d670fc..0ad4ce0c425e31bf5add36a92fa18c875076eb7b 100644
--- a/docs/source/algorithms/PoldiFitPeaks1D-v1.rst
+++ b/docs/source/algorithms/PoldiFitPeaks1D-v1.rst
@@ -37,24 +37,24 @@ The following small usage example performs a peak fit on the sample data already
raw_6904 = LoadSINQFile(Filename = "poldi2013n006904.hdf", Instrument = "POLDI")
LoadInstrument(raw_6904, InstrumentName = "POLDI", RewriteSpectraMap=True)
correlated_6904 = PoldiAutoCorrelation(raw_6904)
-
+
# Run peak search algorithm, store peaks in TableWorkspace
peaks_6904 = PoldiPeakSearch(correlated_6904)
-
+
PoldiFitPeaks1D(InputWorkspace = correlated_6904, FwhmMultiples = 4.0,
PeakFunction = "Gaussian", PoldiPeakTable = peaks_6904,
OutputWorkspace = "peaks_refined_6904",
FitPlotsWorkspace = "fit_plots_6904",
Version=1)
-
+
print("There are {} plots available for inspection.".format(mtd['fit_plots_6904'].getNumberOfEntries()))
-
+
Output:
.. testoutput:: ExSiliconPeakFit
There are 14 plots available for inspection.
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/PoldiFitPeaks1D-v2.rst b/docs/source/algorithms/PoldiFitPeaks1D-v2.rst
index dabc74f453f0b9c9a7168ae3fdab679f0e8e9e98..f97593cfee0b5c2593f0456cbd39d7f324ee15b9 100644
--- a/docs/source/algorithms/PoldiFitPeaks1D-v2.rst
+++ b/docs/source/algorithms/PoldiFitPeaks1D-v2.rst
@@ -26,26 +26,26 @@ The following usage example loads an example correlation spectrum that was calcu
# Load correlation spectrum
Load(Filename='poldi_2_phases_theoretical_reference.nxs', OutputWorkspace='correlation_spectrum')
-
+
# Perform peak search
PoldiPeakSearch(InputWorkspace='correlation_spectrum', MinimumPeakSeparation=8, MaximumPeakNumber=12, MinimumPeakHeight=180, OutputWorkspace='peaks')
-
+
# Fit peaks with proper overlap handling
PoldiFitPeaks1D(InputWorkspace='correlation_spectrum', FwhmMultiples=2, AllowedOverlap=0.1, PoldiPeakTable='peaks')
-
+
Variation of the `AllowedOverlap`-parameter influences the quality of the fit at some point if it's too close to 1. Setting it to 1 makes the algorithm's behavior similar to that of version 1.
.. testcode:: ExSiliconPeakFit2
# Load correlation spectrum
Load(Filename='poldi_2_phases_theoretical_reference.nxs', OutputWorkspace='correlation_spectrum')
-
+
# Perform peak search
PoldiPeakSearch(InputWorkspace='correlation_spectrum', MinimumPeakSeparation=8, MaximumPeakNumber=9, MinimumPeakHeight=180, OutputWorkspace='peaks')
-
+
# Too large allowed overlap, fits will have bad quality.
PoldiFitPeaks1D(InputWorkspace='correlation_spectrum', FwhmMultiples=2, AllowedOverlap=0.9, PoldiPeakTable='peaks')
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/PoldiFitPeaks2D-v1.rst b/docs/source/algorithms/PoldiFitPeaks2D-v1.rst
index ebff26e15814f83851b7416b6034ac969d5791b1..5e7849b7aef0453356ea0af6361bf190470c8848 100644
--- a/docs/source/algorithms/PoldiFitPeaks2D-v1.rst
+++ b/docs/source/algorithms/PoldiFitPeaks2D-v1.rst
@@ -36,7 +36,7 @@ PoldiFitPeaks2D operates on a MatrixWorkspace with a valid POLDI instrument defi
# Load data file with Si spectrum and instrument definition
truncated = PoldiLoadRuns(2013, 6904)
-
+
# Perform correlation, peak search and fit
correlated_6904 = PoldiAutoCorrelation("truncated_data_6904")
peaks_6904 = PoldiPeakSearch(correlated_6904)
@@ -45,21 +45,21 @@ PoldiFitPeaks2D operates on a MatrixWorkspace with a valid POLDI instrument defi
PeakFunction = "Gaussian", PoldiPeakTable = peaks_6904,
OutputWorkspace = "peaks_refined_6904",
FitPlotsWorkspace = "fit_plots_6904")
-
+
# Calculate a 2D spectrum using the refined peaks
PoldiFitPeaks2D(InputWorkspace="truncated_data_6904",
PoldiPeakWorkspace="peaks_refined_6904",
RefinedPoldiPeakWorkspace="peaks_fit_2d_6904",
Calculated1DSpectrum="simulated_1d_6904",
OutputWorkspace="simulated_6904")
-
+
After this step, there is a new workspace containing the simulated spectrum. It should look similar to the one in the following figure:
.. figure:: /images/PoldiAutoCorrelation_Si_2D.png
:figwidth: 15 cm
:align: center
:alt: Raw POLDI data for Silicon powder standard (simulated).
-
+
Simulated 2D-spectrum of silicon powder.
In general, there is a background in POLDI data that depends on :math:`2\theta`. The following script, which is almost identical to the above one introduces this parameter.
@@ -92,7 +92,7 @@ Now the spectrum looks different, like in the example below.
:figwidth: 15 cm
:align: center
:alt: Raw POLDI data for Silicon powder standard with background (simulated).
-
+
Simulated 2D-spectrum of silicon powder with background.
Furthermore, a 1D diffractogram is also calculated, which shows all peaks that were used to calculate the 2D spectrum as well.
@@ -114,7 +114,7 @@ The following example shows an example for refinement of lattice parameters usin
# Load and merge 2 data files for better statistics.
truncated = PoldiLoadRuns(2013, 6903, 6904, 2)
-
+
# Perform correlation, peak search and fit
correlated_6904 = PoldiAutoCorrelation("truncated_data_6904")
peaks_6904 = PoldiPeakSearch(correlated_6904)
diff --git a/docs/source/algorithms/PoldiLoadRuns-v1.rst b/docs/source/algorithms/PoldiLoadRuns-v1.rst
index c2a82a3ce75a4529586238b284ac734e4bdc64b7..d36d0b7753023144b1c3d5c13a2a11be73f77ee3 100644
--- a/docs/source/algorithms/PoldiLoadRuns-v1.rst
+++ b/docs/source/algorithms/PoldiLoadRuns-v1.rst
@@ -22,22 +22,22 @@ Usage
.. include:: ../usagedata-note.txt
-To load only one POLDI data file (in this case a run from a calibration measurement with silicon standard), it's enough to specify the year and the run number. Nevertheless it will be placed in a WorkspaceGroup.
+To load only one POLDI data file (in this case a run from a calibration measurement with silicon standard), it's enough to specify the year and the run number. Nevertheless it will be placed in a WorkspaceGroup.
.. testcode:: ExLoadSingleFile
calibration = PoldiLoadRuns(2013, 6903)
-
+
# calibration is a WorkspaceGroup, so we can use getNames() to query what's inside.
workspaceNames = calibration.getNames()
-
+
print("Number of data files loaded: {}".format(len(workspaceNames)))
print("Name of data workspace: {}".format(workspaceNames[0]))
Since only one run number was supplied, only one workspace is loaded. The name corresponds to the scheme described above:
.. testoutput:: ExLoadSingleFile
-
+
Number of data files loaded: 1
Name of data workspace: calibration_data_6903
@@ -47,38 +47,38 @@ Actually, the silicon calibration measurement consists of more than one run, so
# Load two calibration data files (6903 and 6904)
calibration = PoldiLoadRuns(2013, 6903, 6904)
-
+
workspaceNames = calibration.getNames()
-
+
print("Number of data files loaded: {}".format(len(workspaceNames)))
print("Names of data workspaces: {}".format(workspaceNames))
-
+
Now all files from the specified range are in the `calibration` WorkspaceGroup:
-
+
.. testoutput:: ExLoadMultipleFiles
Number of data files loaded: 2
Names of data workspaces: ['calibration_data_6903','calibration_data_6904']
-
+
But in fact, these data files should not be processed separately, they belong to the same measurement and should be merged together. Instead of using :ref:`algm-PoldiMerge` directly to merge the data files, it's possible to tell the algorithm to merge the files directly after loading, by specifying how many of the files should be merged together. Setting the parameter to the value `2` means that the whole range will be iterated and files will be merged together in pairs:
.. testcode:: ExLoadMultipleFilesMerge
# Load two calibration data files (6903 and 6904) and merge them
calibration = PoldiLoadRuns(2013, 6903, 6904, 2)
-
+
workspaceNames = calibration.getNames()
-
+
print("Number of data files loaded: {}".format(len(workspaceNames)))
print("Names of data workspaces: {}".format(workspaceNames))
-
+
The merged files will receive the name of the last file in the merged range:
-
+
.. testoutput:: ExLoadMultipleFilesMerge
Number of data files loaded: 1
Names of data workspaces: ['calibration_data_6904']
-
+
When the merge parameter and the number of runs in the specified range are not compatible (for example specifying `3` in the above code), the algorithm will merge files in the range as long as it can and leave out the rest. In the above example that would result in no data files being loaded at all.
A situation that occurs often is that one sample consists of multiple ranges of runs, which can not be expressed as one range. It's nevertheless possible to collect them all in one WorkspaceGroup. In fact, that is the default behavior of the algorithm if the supplied `OutputWorkspace` already exists:
@@ -87,22 +87,22 @@ A situation that occurs often is that one sample consists of multiple ranges of
# Load calibration data
calibration = PoldiLoadRuns(2013, 6903)
-
+
# Add another file to the calibration WorkspaceGroup
calibration = PoldiLoadRuns(2013, 6904)
-
+
workspaceNames = calibration.getNames()
-
+
print("Number of data files loaded: {}".format(len(workspaceNames)))
print("Names of data workspaces: {}".format(workspaceNames))
-
+
The result is the same as in the example above, two files are in the WorkspaceGroup:
-
+
.. testoutput:: ExLoadMultipleRanges
Number of data files loaded: 2
Names of data workspaces: ['calibration_data_6903','calibration_data_6904']
-
+
On the other hand it is also possible to overwrite an existing WorkspaceGroup, for example if there was a mistake with the previous data loading. The parameter needs to be specified explicitly.
.. testcode:: ExLoadMultipleRangesOverwrite
@@ -110,16 +110,16 @@ On the other hand it is also possible to overwrite an existing WorkspaceGroup, f
# Load calibration data, forget merging
calibration = PoldiLoadRuns(2013, 6903, 6904)
- # Load data again, this time with correct merging
+ # Load data again, this time with correct merging
calibration = PoldiLoadRuns(2013, 6903, 6904, 2, OverwriteExistingWorkspace=True)
-
+
workspaceNames = calibration.getNames()
-
+
print("Number of data files loaded: {}".format(len(workspaceNames)))
print("Names of data workspaces: {}".format(workspaceNames))
-
+
The data loaded in the first call to the algorithm have been overwritten with the merged data set:
-
+
.. testoutput:: ExLoadMultipleRangesOverwrite
Number of data files loaded: 1
diff --git a/docs/source/algorithms/PoldiMerge-v1.rst b/docs/source/algorithms/PoldiMerge-v1.rst
index f1bb1e512c8c9930409a90d2c8bc31ed75f01d10..89dca367f66c0842b9abd3a5b5c3ab7d66f9b526 100644
--- a/docs/source/algorithms/PoldiMerge-v1.rst
+++ b/docs/source/algorithms/PoldiMerge-v1.rst
@@ -33,7 +33,7 @@ Usage
This small usage example merges two compatible POLDI-files which have been loaded before.
.. testcode:: ExMergeSilicon
-
+
# Load the first data file and the correct instrument
raw_6903 = LoadSINQFile(Filename = "poldi2013n006903.hdf", Instrument = "POLDI")
LoadInstrument(raw_6903, RewriteSpectraMap=True, InstrumentName = "POLDI")
@@ -43,18 +43,18 @@ This small usage example merges two compatible POLDI-files which have been loade
histo_6903 = ConvertToHistogram(raw_6903)
spectra_6903 = Integration(histo_6903)
total_6903 = SumSpectra(spectra_6903)
-
+
# The result has one spectrum with one bin, which contains the total counts.
counts_6903 = int(total_6903.dataY(0)[0])
print("6903 contains a total of {} counts.".format(counts_6903))
-
+
# The same with the second data file
raw_6904 = LoadSINQFile(Filename = "poldi2013n006904.hdf", Instrument = "POLDI")
LoadInstrument(raw_6904, RewriteSpectraMap=True, InstrumentName = "POLDI")
histo_6904 = ConvertToHistogram(raw_6904)
spectra_6904 = Integration(histo_6904)
total_6904 = SumSpectra(spectra_6904)
-
+
counts_6904 = int(total_6904.dataY(0)[0])
print("6904 contains a total of {} counts.".format(counts_6904))
diff --git a/docs/source/algorithms/PoldiPeakSearch-v1.rst b/docs/source/algorithms/PoldiPeakSearch-v1.rst
index 23cf305329edc04247023cf1397db723a7f18543..f3314dd954ec253c8d13c222e19c28d998aae890 100644
--- a/docs/source/algorithms/PoldiPeakSearch-v1.rst
+++ b/docs/source/algorithms/PoldiPeakSearch-v1.rst
@@ -18,12 +18,12 @@ The algorithm
last to the sum of its value and its neighbor's values:
:math:`y'_i = y_{i-1} + y_{i} + y_{i+1}`
-
+
The new spectrum :math:`y'` contains :math:`n-2` points when :math:`y` contains :math:`n`.
#. Identify peak positions in :math:`y'`, which is done with a recursive
algorithm, consisting of these steps:
-
+
a. Find the position of the maximum, :math:`i_{max}` in the list,
store in peak-list.
#. Split the list in two parts,
@@ -60,18 +60,18 @@ Usage
A typical peak search procedure would be performed on correlation data, so this analysis is performed first, followed by a peak search with default parameters.
.. testcode:: ExSiliconPeakSearch
-
+
# Load data file and instrument, perform correlation analysis
raw_6904 = LoadSINQFile(Filename = "poldi2013n006904.hdf", Instrument = "POLDI")
LoadInstrument(raw_6904, RewriteSpectraMap=True, InstrumentName = "POLDI")
correlated_6904 = PoldiAutoCorrelation(raw_6904)
-
+
# Run peak search algorithm, store peaks in TableWorkspace
peaks_6904 = PoldiPeakSearch(correlated_6904)
-
+
# The tableworkspace should contain 14 peaks.
print("The correlation spectrum of sample 6904 contains {} peaks.".format(peaks_6904.rowCount()))
-
+
Output:
.. testoutput:: ExSiliconPeakSearch
diff --git a/docs/source/algorithms/PoldiPeakSummary-v1.rst b/docs/source/algorithms/PoldiPeakSummary-v1.rst
index dda2634eabd862fb9c53094d702229055aa08f7e..134475e7dd5cdafc740538e329d503b867428e48 100644
--- a/docs/source/algorithms/PoldiPeakSummary-v1.rst
+++ b/docs/source/algorithms/PoldiPeakSummary-v1.rst
@@ -21,22 +21,22 @@ Usage
**Example - PoldiPeakSummary**
.. testcode:: PoldiPeakSummaryExample
-
+
# Load data file and instrument, perform correlation analysis
raw_6904 = LoadSINQFile(Filename = "poldi2013n006904.hdf", Instrument = "POLDI")
LoadInstrument(raw_6904, RewriteSpectraMap=True, InstrumentName = "POLDI")
correlated_6904 = PoldiAutoCorrelation(raw_6904)
-
+
# Run peak search algorithm, store peaks in TableWorkspace
peaks_6904 = PoldiPeakSearch(correlated_6904)
-
+
PoldiFitPeaks1D(InputWorkspace = correlated_6904, FwhmMultiples = 4.0,
PeakFunction = "Gaussian", PoldiPeakTable = peaks_6904,
OutputWorkspace = "peaks_refined_6904",
FitPlotsWorkspace = "fit_plots_6904")
-
+
summary_6904 = PoldiPeakSummary(mtd["peaks_refined_6904"])
-
+
print("Number of refined peaks: {}".format(summary_6904.rowCount()))
print("Number of columns that describe a peak: {}".format(summary_6904.columnCount()))
diff --git a/docs/source/algorithms/PoldiTruncateData-v1.rst b/docs/source/algorithms/PoldiTruncateData-v1.rst
index 3b29df5d33dc699d8794f970eee454f3bb82ac68..1e76d5aba451b625e8f22c805299a7b097bc0f03 100644
--- a/docs/source/algorithms/PoldiTruncateData-v1.rst
+++ b/docs/source/algorithms/PoldiTruncateData-v1.rst
@@ -28,16 +28,16 @@ Usage
In the first example, POLDI data is cropped to the correct workspace size:
.. testcode:: PoldiTruncateDataCrop
-
+
# Load data and instrument - this is important, as the chopper configuration must be known.
raw_6903 = LoadSINQFile(Filename = "poldi2013n006903.hdf", Instrument = "POLDI")
LoadInstrument(raw_6903, InstrumentName = "POLDI", RewriteSpectraMap=True)
print("The raw data workspace contains {} time bins.".format(len(raw_6903.readX(0))))
-
+
# Truncate the data
truncated_6903 = PoldiTruncateData(raw_6903)
-
+
print("The truncated data workspace contains {} time bins.".format(len(truncated_6903.readX(0))))
Output:
@@ -46,7 +46,7 @@ Output:
The raw data workspace contains 510 time bins.
The truncated data workspace contains 500 time bins.
-
+
The second example also examines the extra time bins:
.. testcode:: PoldiTruncateDataExtra
@@ -54,24 +54,24 @@ The second example also examines the extra time bins:
# Load data and instrument again.
raw_6903 = LoadSINQFile(Filename = "poldi2013n006903.hdf", Instrument = "POLDI")
LoadInstrument(raw_6903, InstrumentName = "POLDI", RewriteSpectraMap=True)
-
+
# Truncate and store the extra bins in a workspace called "extra_6903"
truncated_6903 = PoldiTruncateData(raw_6903, ExtraCountsWorkspaceName = "extra_6903")
-
+
# Get the workspace from central workspace manager
extra_6903 = mtd['extra_6903']
-
+
# Examine the workspace a bit
print("The extra data workspace contains {} spectrum.".format(extra_6903.getNumberHistograms()))
print("The bins contain the following data: {}".format([int(x) for x in extra_6903.readY(0)]))
-
+
Output:
.. testoutput:: PoldiTruncateDataExtra
The extra data workspace contains 1 spectrum.
The bins contain the following data: [13, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/PowerLawCorrection-v1.rst b/docs/source/algorithms/PowerLawCorrection-v1.rst
index 2c6b4295d7825d2e7ba0529ee65072152a5d7119..80fa22e64e9458f6caa80b94491520be1450f446 100644
--- a/docs/source/algorithms/PowerLawCorrection-v1.rst
+++ b/docs/source/algorithms/PowerLawCorrection-v1.rst
@@ -18,13 +18,13 @@ values are multiplied by the value of this function.
Usage
-----
-**Example - A sample correction**
+**Example - A sample correction**
.. testcode:: Ex1
# a sample workspace with a sample instrument
ws = CreateSampleWorkspace(Function="Flat background")
-
+
#Now we are ready to run the correction
wsCorrected = PowerLawCorrection(ws,C0=3,C1=2)
diff --git a/docs/source/algorithms/PreprocessDetectorsToMD-v1.rst b/docs/source/algorithms/PreprocessDetectorsToMD-v1.rst
index f993ec959f36c7359c013ba8e12492c2e35fc4bc..7d000a25ae2ea632ba043e2b318db2b5f50fb701 100644
--- a/docs/source/algorithms/PreprocessDetectorsToMD-v1.rst
+++ b/docs/source/algorithms/PreprocessDetectorsToMD-v1.rst
@@ -9,9 +9,9 @@
Description
-----------
-The algorithm calculates expensive part of the transformation from real to reciprocal space, calculating namely,
-detector positions, sample-detector distances, angular detectors positions, etc. These values can be slow to calculate
-for composite detectors and other algorithms can substantially benefit from using preprocessed values.
+The algorithm calculates expensive part of the transformation from real to reciprocal space, calculating namely,
+detector positions, sample-detector distances, angular detectors positions, etc. These values can be slow to calculate
+for composite detectors and other algorithms can substantially benefit from using preprocessed values.
The algorithm places processed values into a table workspace with the following columns:
@@ -21,17 +21,17 @@ The algorithm places processed values into a table workspace with the following
| DetDirections | V3D | unit 3D vector directed from sample to detector |
+---------------+--------+------------------------------------------------------+
| L2 | double | sample-detector distance |
-+---------------+--------+------------------------------------------------------+
++---------------+--------+------------------------------------------------------+
| TwoTheta | double | Composite detectors Polar angle |
-+---------------+--------+------------------------------------------------------+
++---------------+--------+------------------------------------------------------+
| Azimuthal | double | Composite detectors Azimutal angle |
-+---------------+--------+------------------------------------------------------+
++---------------+--------+------------------------------------------------------+
| DetectorID | int | Unique detector number |
-+---------------+--------+------------------------------------------------------+
++---------------+--------+------------------------------------------------------+
| detIDMap | size_t | index of the detector in the detector's array |
-+---------------+--------+------------------------------------------------------+
++---------------+--------+------------------------------------------------------+
| detMask [#f1]_| int | 1 if masked and 0 if not |
-+---------------+--------+------------------------------------------------------+
++---------------+--------+------------------------------------------------------+
| efixed [#f2]_ | double | energy of the detector (intirect only) |
+---------------+--------+------------------------------------------------------+
@@ -41,10 +41,10 @@ In addition to the preprocessed detectors intofmation, the following log entries
- **L1** -- Source-sample distance.
- **ActualDetectorsNum** -- total number of existing preprocessed detectors (number of rows in the table above).
- **InstrumentName** -- the name of the source instrument.
-- **FakeDetectors** -- if detectors posisions were not actually preprocessed but fake detectros were used instead
+- **FakeDetectors** -- if detectors posisions were not actually preprocessed but fake detectros were used instead
(InstrumentName==*FakeInstrument* in this case).
-
+
.. rubric:: Notes
.. [#f1] Present if property **GetMaskState** is set to True.
@@ -61,21 +61,21 @@ Usage
# Simulates Load of a workspace with all necessary parameters #################
detWS = CreateSimulationWorkspace(Instrument='MAR',BinParams=[-50,5,50],UnitX='DeltaE')
AddSampleLog(detWS,LogName='Ei',LogText='52.',LogType='Number');
- #
+ #
preprDetWS = PreprocessDetectorsToMD(InputWorkspace=detWS,GetMaskState=1,GetEFixed=1)
- # Look at sample results:
+ # Look at sample results:
print("The resulting table has the following columns:")
print(preprDetWS.keys())
print("The number of rows in the workspace is : {}".format(len(preprDetWS.column('L2'))))
polar = preprDetWS.column('TwoTheta')
print("The polar angle for detector N {0} is {1:5f} rad".format(10,polar[10]))
print("The table workspace logs (properties) are currently not available from python")
-
-
+
+
.. testcleanup:: ExPreprocessDetectoresToMD
DeleteWorkspace(detWS)
- DeleteWorkspace(preprDetWS)
+ DeleteWorkspace(preprDetWS)
**Output:**
diff --git a/docs/source/algorithms/ProcessBackground-v1.rst b/docs/source/algorithms/ProcessBackground-v1.rst
index 3a9dfe1486cdb747446a2a001d23744357841de5..4ee0527ed21572174f82b9198a4d09ce69158c2e 100644
--- a/docs/source/algorithms/ProcessBackground-v1.rst
+++ b/docs/source/algorithms/ProcessBackground-v1.rst
@@ -28,24 +28,24 @@ the middle of two adjacent peaks. Algorithm will fit these few points
(*BackgroundPoints*) to a background function of specified type.
The purpose of this option is to select as many background data points as possible
-for future background function fitting.
+for future background function fitting.
-Prior information can be given by two modes. Property 'SelectionMode' determines which modes to use.
-One (1)is from a list of X-values specified by users via property "BackgroundPoints".
-The other (2) is through a (background) function, whose type is specified by property "BackgroundType" and
-values are given via input table workspace "BackgroundTableWorkspace".
+Prior information can be given by two modes. Property 'SelectionMode' determines which modes to use.
+One (1)is from a list of X-values specified by users via property "BackgroundPoints".
+The other (2) is through a (background) function, whose type is specified by property "BackgroundType" and
+values are given via input table workspace "BackgroundTableWorkspace".
Select background points from given X-values
============================================
-Here is how it works. Assume that the :math:`X^{(u)}` is the list of x values specified by users.
+Here is how it works. Assume that the :math:`X^{(u)}` is the list of x values specified by users.
* Create a data set (X, Y, E) from input workspace, where :math:`X_i` is the nearest value
to :math:`X^{(u)}_i`;
* Fit the background function against the data set (X, Y, E);
* Select the data points, which are within a certain range above and below the fitted background function;
-* The last step is to fit background function against the selected background points
+* The last step is to fit background function against the selected background points
Select background points from given function
============================================
@@ -53,22 +53,22 @@ Select background points from given function
In this approach, the difference from the other apporach is to use the user given background function
to select data points within a range other than fitting the background function from given data points in the
-other approach.
-Thus, it is just the last step of previous approach.
+other approach.
+Thus, it is just the last step of previous approach.
Output workspaces
=================
-- OutputWorkspace: It contains 3 spectra.
+- OutputWorkspace: It contains 3 spectra.
- spectrum 0: the selected background data points;
- spectrum 1: the fitted background function against the selected data points;
- spectrum 2: the difference of sepctrum 0 and 1
-- OutputBackgroundParameterWorkspace: A table workspace containing the fitted parameter values including :math:`\chi^2`.
+- OutputBackgroundParameterWorkspace: A table workspace containing the fitted parameter values including :math:`\chi^2`.
+
+- UserBackgroundWorkspace: a MatrixWorkspace to visualize by user.
-- UserBackgroundWorkspace: a MatrixWorkspace to visualize by user.
-
- spectrum 0: background function (either given by user or fit from given data points) that is used to select background points;
- spectrum 1: diffraction data with background (spectrum 0) removed;
- spectrum 2: upper boundary on data points to be selected for spectrum 1;
@@ -78,7 +78,7 @@ Output workspaces
Algorithm properties
====================
-Besides the common algorithm properties, below is the list of properties specific to this function option.
+Besides the common algorithm properties, below is the list of properties specific to this function option.
- Inputs:
@@ -93,11 +93,11 @@ Besides the common algorithm properties, below is the list of properties specifi
- OutputBackgroundOrder
- Outputs:
-
+
- OutputBackgroundParameterWorkspace
- UserBackgroundWorkspace
-A suggested workflow
+A suggested workflow
####################
Here is a good example to select background points from a powder
@@ -123,18 +123,18 @@ Simple Remove Peaks
###################
This algorithm is to remove peaks and output the backgrounds,
-which can be used to fit an artibrary background function after calling this algorithm.
+which can be used to fit an artibrary background function after calling this algorithm.
-It is assumed that the all peaks have been fitted reasonably well.
+It is assumed that the all peaks have been fitted reasonably well.
Then by removing the peaks within range :math:`X_i^{(0)} \pm FWHM`,
-and save the rest data points, which are very likely backgrounds, to an output workspace.
+and save the rest data points, which are very likely backgrounds, to an output workspace.
Required and optional algorithm properties
==========================================
-Besides the common algorithm properties, below is the list of properties specific to this function option.
+Besides the common algorithm properties, below is the list of properties specific to this function option.
-- Inputs:
+- Inputs:
- BraggPeakTableWorkspace
- NumberOfFWHM
@@ -148,7 +148,7 @@ Add Region
##########
Replace a region, which is defined by 'LowerBoundary' and 'UpperBoundary', in a workspace
-from another reference workspace.
+from another reference workspace.
Required and optional algorithm properties
@@ -164,7 +164,7 @@ Required and optional algorithm properties
Delete Region
#############
-Removed a specified region, which is defined by 'LowerBoundary' and 'UpperBoundary', from the input workspace.
+Removed a specified region, which is defined by 'LowerBoundary' and 'UpperBoundary', from the input workspace.
Required and optional algorithm properties
==========================================
diff --git a/docs/source/algorithms/ProcessIndirectFitParameters-v1.rst b/docs/source/algorithms/ProcessIndirectFitParameters-v1.rst
index 3b6dae49d1a00170f593bc9495f43764286fd652..5fb0de1b57f5954481b089f5e21fa61db019fe72 100644
--- a/docs/source/algorithms/ProcessIndirectFitParameters-v1.rst
+++ b/docs/source/algorithms/ProcessIndirectFitParameters-v1.rst
@@ -10,8 +10,8 @@
Description
-----------
-An Algorithm designed to allow for the TableWorkspace output of the
-PlotPeakByLogValue algorithm to be transformed into a Matrix workspace
+An Algorithm designed to allow for the TableWorkspace output of the
+PlotPeakByLogValue algorithm to be transformed into a Matrix workspace
based on the desired parameters.
Workflow
@@ -37,7 +37,7 @@ Usage
tws.addRow([5,6,7,8])
tws.addRow([9,0,1,2])
tws.addRow([0,0,0,1])
-
+
# Add to Mantid Workspace list
mtd.addOrReplace("TableWs",tws)
wsName = "outputWorkspace"
@@ -50,15 +50,15 @@ Usage
# Print the result
print("{} is a {} and the Y values are:".format(wsOut, wsOut.id()))
print(wsOut.readY(0))
-
+
Output:
.. testoutput:: ProcessIndirectFitParametersExample
:options: +NORMALIZE_WHITESPACE
-
+
outputWorkspace is a Workspace2D and the Y values are:
[ 2. 6. 0. 0.]
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/ProjectMD-v1.rst b/docs/source/algorithms/ProjectMD-v1.rst
index 926a93f09d8e0da81f42222ab8b02c53beeb5a35..e60a802143ad0822d2a9842b1e99cf4e28556459 100644
--- a/docs/source/algorithms/ProjectMD-v1.rst
+++ b/docs/source/algorithms/ProjectMD-v1.rst
@@ -45,7 +45,7 @@ Usage
dim.name, dim.getNBins(), dim.getMinimum(), dim.getMaximum()))
#create a test MD event workspace
- mdew = CreateMDWorkspace(Dimensions=3, Extents=[-1,1,-5,5,-9,10],
+ mdew = CreateMDWorkspace(Dimensions=3, Extents=[-1,1,-5,5,-9,10],
Names='A, B, C', Units='U, U, U')
FakeMDEventData(mdew, PeakParams=[100000, 0, 0, 0, 1])
diff --git a/docs/source/algorithms/Q1D-v2.rst b/docs/source/algorithms/Q1D-v2.rst
index 06cdc600d767db4476253e9351619d627d9fe928..b557888c969150d1b1d7e41284415717a35a77cd 100644
--- a/docs/source/algorithms/Q1D-v2.rst
+++ b/docs/source/algorithms/Q1D-v2.rst
@@ -13,8 +13,8 @@ Output unit
###########
The unit of the output workspace is 1/cm. Assuming this algorithm is called with
-the appropriate input correction workspaces, include accounting for absolute
-scaling, the output is meant to represent a macroscopic cross section, hence the
+the appropriate input correction workspaces, include accounting for absolute
+scaling, the output is meant to represent a macroscopic cross section, hence the
reason the output unit is 1/cm.
Q Unit Conversion
@@ -105,7 +105,7 @@ takes any :ref:`bin masking <algm-MaskBins>` into account.
Some corrections will be both pixel and wavelength dependent, for example an
angle transmission correction. Such corrections can be taken into account by
-specifying WavePixelAdj.
+specifying WavePixelAdj.
Resolution and Cutoffs
######################
@@ -151,7 +151,7 @@ by altering :math:`Q{min}` and the binning scheme.
Examples
######################
-For an example of how Q1D is used see
+For an example of how Q1D is used see
`ISIS SANS data reduction <http://www.mantidproject.org/SANS_ISIS_Data_Reduction>`_.
**References**
diff --git a/docs/source/algorithms/QueryMDWorkspace-v1.rst b/docs/source/algorithms/QueryMDWorkspace-v1.rst
index 5f44c2e97ae5778fa7b2d9f4acb2f776702b083a..70a41e3cc66cc5d9565ec5d606e7805ab3f004f6 100644
--- a/docs/source/algorithms/QueryMDWorkspace-v1.rst
+++ b/docs/source/algorithms/QueryMDWorkspace-v1.rst
@@ -28,7 +28,7 @@ Usage
.. testcode:: ExQueryMDWorkspace
- # create sample inelastic workspace for MARI instrument containing 1 at all spectra
+ # create sample inelastic workspace for MARI instrument containing 1 at all spectra
ws1 = CreateSimulationWorkspace(Instrument='MAR', BinParams='-10,1,10', UnitX='DeltaE')
AddSampleLog(ws1, 'Ei', '12.', 'Number')
ws2 = ws1 * 2;
@@ -37,7 +37,7 @@ Usage
# get the query
table = QueryMDWorkspace(InputWorkspace=mdWs1)
-
+
# look at the output:
col_names = table.keys();
name0 = col_names[0];
@@ -46,18 +46,18 @@ Usage
print("first 11 of them are:")
print("--------------------------------------------------------------------------------------------------------------")
print(' '.join('| {0:19}'.format(name) for name in col_names) + ' |')
-
+
print("--------------------------------------------------------------------------------------------------------------")
for i in range(0,11):
print(' '.join('| {0:>19.4f}'.format(table.column(name)[i]) for name in col_names) + ' |')
-
-
+
+
**Output:**
.. testoutput:: ExQueryMDWorkspace
Table contains 100 rows
- first 11 of them are:
+ first 11 of them are:
--------------------------------------------------------------------------------------------------------------
| Signal/none | Error/none | Number of Events | |Q|/MomentumTransfer | DeltaE/DeltaE |
--------------------------------------------------------------------------------------------------------------
diff --git a/docs/source/algorithms/RRFMuon-v1.rst b/docs/source/algorithms/RRFMuon-v1.rst
index 1ad5d6074e5cffeb9d7b617664538d40d8813dfc..c7bb552551923248369b973d9b18d89ab68fcec4 100644
--- a/docs/source/algorithms/RRFMuon-v1.rst
+++ b/docs/source/algorithms/RRFMuon-v1.rst
@@ -5,12 +5,12 @@
Overview
--------
-This algorithm provides a method for making a rotating reference frame transformation, which provides a useful method of visualising high frequency signals.
-Since the transformation leaves a comparatively low frequency signal, the data can readily be rebinned to improve counting statistics - this is particularly
-useful during an experiment to provide an early check on the form of the measured signal. Data analysis (for example least squares fitting) to study the
+This algorithm provides a method for making a rotating reference frame transformation, which provides a useful method of visualising high frequency signals.
+Since the transformation leaves a comparatively low frequency signal, the data can readily be rebinned to improve counting statistics - this is particularly
+useful during an experiment to provide an early check on the form of the measured signal. Data analysis (for example least squares fitting) to study the
form of the signal relaxation can be completed in either the laboratory or rotating reference frame according to preference.
-This algorithm is frequently run after making a phase quadrature transformation using the algorithm :ref:`algm-PhaseQuad`. Both algorithms are fully described in the
+This algorithm is frequently run after making a phase quadrature transformation using the algorithm :ref:`algm-PhaseQuad`. Both algorithms are fully described in the
article by T.M. Riseman and J.H. Brewer [Hyp. Int., 65, (1990), 1107].
@@ -21,14 +21,14 @@ article by T.M. Riseman and J.H. Brewer [Hyp. Int., 65, (1990), 1107].
Description
-----------
-Assuming *InputWorkspace* contains the real and imaginary parts of the asymmetry in the lab-fram, the algorithm
-returns the muon polarization in the Rotating Reference Frame (RRF), given the frequency of the oscillations and the phase of the
+Assuming *InputWorkspace* contains the real and imaginary parts of the asymmetry in the lab-fram, the algorithm
+returns the muon polarization in the Rotating Reference Frame (RRF), given the frequency of the oscillations and the phase of the
detectors, as given by the formula:
.. math:: P_R^{RRF} (\nu_0, \phi, t)= + P_R\left(0,t\right) \cos\left(2\pi\nu_0 t + \phi\right) + P_I\left(0,t\right) \sin\left(2\pi\nu_0 t + \phi\right)
.. math:: P_I^{RRF} (\nu_0, \phi, t)= - P_R\left(0,t\right) \sin\left(2\pi\nu_0 t + \phi\right) + P_I\left(0,t\right) \cos\left(2\pi\nu_0 t + \phi\right)
-where :math:`P_R\left(0,t\right)` and :math:`P_I\left(0,t\right)` are the real and imaginary part of the asymmetry in the lab-frame,
+where :math:`P_R\left(0,t\right)` and :math:`P_I\left(0,t\right)` are the real and imaginary part of the asymmetry in the lab-frame,
:math:`\nu_0` is the input frequency, and :math:`\phi` the input phase.
Usage
diff --git a/docs/source/algorithms/RadiusSum-v1.rst b/docs/source/algorithms/RadiusSum-v1.rst
index 9242f12d3d3c5584daec19316f9eb0278878e51b..aee617240b7ea918fa532759f039f7f41706428e 100644
--- a/docs/source/algorithms/RadiusSum-v1.rst
+++ b/docs/source/algorithms/RadiusSum-v1.rst
@@ -12,17 +12,17 @@ Description
RadiusSum sums the counts in rings against radius.
Below, there is an example of the execution of the RadiusSum to a
-:ref:`Workspace2D <Workspace2D>`
-where the position of the pixels are not associated to detector
+:ref:`Workspace2D <Workspace2D>`
+where the position of the pixels are not associated to detector
positions, but it is derived from the Axes.
-.. figure:: /images/ExecuteRadiusSum.png
+.. figure:: /images/ExecuteRadiusSum.png
:width: 800px
The image below shows a visual interpretation for the inputs of the
algorithm
-.. figure:: /images/RadiusSumInputs.png
+.. figure:: /images/RadiusSumInputs.png
:width: 300px
The Algorithm create **NumBins** rings around the **Centre** point each
@@ -30,22 +30,22 @@ one with :math:`width = BinSize` for
:math:`BinSize=\frac{MaxRadius-MinRadius}{NumBins}`.
The algorithm applies a rudimentary calculation to define the bin for
-each that each pixel or detector in the
+each that each pixel or detector in the
:ref:`Workspace2D <Workspace2D>`,
but taking its center point. If the center point belongs to one bin, it
is considered that the whole pixel belongs to the bin. The picture
below, shows what does this means. An ideal solution for RadiusSum is
the left image, while the right image is what is current implemented.
-.. figure:: /images/RadiusSumSolutions.png
+.. figure:: /images/RadiusSumSolutions.png
:width: 300px
Although the images were applied to an image
-:ref:`Workspace2D <Workspace2D>`, the
-image below shows that it is possible to apply this algorithm to
+:ref:`Workspace2D <Workspace2D>`, the
+image below shows that it is possible to apply this algorithm to
Workspaces attached to instruments.
-.. figure:: /images/RadiusSumInstrument.png
+.. figure:: /images/RadiusSumInstrument.png
:width: 800 px
.. categories::
diff --git a/docs/source/algorithms/RawFileInfo-v1.rst b/docs/source/algorithms/RawFileInfo-v1.rst
index cf2e276a514b120f78fac9cd72542fa7b7f3c183..cfe462335d8eb303b78b8127de1c607ca8c22148 100644
--- a/docs/source/algorithms/RawFileInfo-v1.rst
+++ b/docs/source/algorithms/RawFileInfo-v1.rst
@@ -11,10 +11,10 @@ Description
Extracts run parameters from the :ref:`RAW <Raw File>` file given as an
input property. If the ``GetRunParameters`` argument is ``True`` then a
-:ref:`TableWorkspace <Table Workspaces>` is created that contains a
+:ref:`TableWorkspace <Table Workspaces>` is created that contains a
column for each value of the ``RPB_STRUCT``, i.e. column names such as ``r_dur``, ``r_goodfrm``
-etc. If the ``GetSampleParameters`` argument is ``True`` then a
-:ref:`TableWorkspace <Table Workspaces>` is created that contains a
+etc. If the ``GetSampleParameters`` argument is ``True`` then a
+:ref:`TableWorkspace <Table Workspaces>` is created that contains a
column for each value of the ``SPB_STRUCT``, i.e. column names such as ``e_geom``, ``e_width``, etc.
This is Mantid's version of the ``Get`` routine in `Open Genie <http://www.opengenie.org/>`__.
diff --git a/docs/source/algorithms/RayTracerTester-v1.rst b/docs/source/algorithms/RayTracerTester-v1.rst
index 9e3bbdcdb92b3133e795447a8384e7df8e606d1d..fd15015f64b69aa4833ee31cd4467f88dc4de0bd 100644
--- a/docs/source/algorithms/RayTracerTester-v1.rst
+++ b/docs/source/algorithms/RayTracerTester-v1.rst
@@ -15,14 +15,14 @@ for debugging / testing.
Usage
-----
-**Example - MARI**
+**Example - MARI**
.. testcode:: Ex1
import os
inst_dir = config["instrumentDefinition.directory"]
inst_file_path = os.path.join(inst_dir,"MARI_Definition.xml")
-
+
ws=RayTracerTester(inst_file_path)
diff --git a/docs/source/algorithms/ReactorSANSResolution-v1.rst b/docs/source/algorithms/ReactorSANSResolution-v1.rst
index 905752dda9f867080ef0ea58efdeaf3c59d8824d..d26054b3bcd8e93dcc2715ba98ff96a558e1744f 100644
--- a/docs/source/algorithms/ReactorSANSResolution-v1.rst
+++ b/docs/source/algorithms/ReactorSANSResolution-v1.rst
@@ -13,7 +13,7 @@ Compute the resolution in Q according to Mildner-Carpenter. The algorithm uses t
wavelength information, the apertures and the source, sample and detector positions
to compute the Q resolution and add it to the workspace.
-This algorithm is generally not called directly. It's called by
+This algorithm is generally not called directly. It's called by
:ref:`SANSAzimuthalAverage1D <algm-SANSAzimuthalAverage1D>`
after the calculation of I(Q). It can only be applied to an I(Q) workspace.
diff --git a/docs/source/algorithms/Rebin-v1.rst b/docs/source/algorithms/Rebin-v1.rst
index 01f28712d3973f530aeb801cc42642c752745e5e..7f9f40d13d1f9aa47546962ed40bddaeb872c424 100644
--- a/docs/source/algorithms/Rebin-v1.rst
+++ b/docs/source/algorithms/Rebin-v1.rst
@@ -14,11 +14,11 @@ defines new boundaries in intervals :math:`x_i-x_{i+1}\,`. Positive
:math:`\Delta x_i\,` make constant width bins, whilst negative ones
create logarithmic binning using the formula
:math:`x(j+1)=x(j)(1+|\Delta x_i|)\,`
-
+
This algorithms is useful both in data reduction, but also in remapping
:ref:`ragged workspace <Ragged_Workspace>` to a regular set of bin
boundaries.
-
+
Unless the FullBinsOnly option is enabled, the bin immediately before
the specified boundaries :math:`x_2`, :math:`x_3`, ... :math:`x_i` is
likely to have a different width from its neighbours because there can
@@ -26,8 +26,8 @@ be no gaps between bins. Rebin ensures that any of these space filling
bins cannot be less than 25% or more than 125% of the width that was
specified.
-In both cases, where a new bin only partially overlaps one or more input
-bins, the new counts are calculated as the sum of the old bins weighted
+In both cases, where a new bin only partially overlaps one or more input
+bins, the new counts are calculated as the sum of the old bins weighted
by the fractional overlapping widths of the new bin over the old bin:
.. math:: Y^{\mathrm{new}} = \sum_i Y^{\mathrm{old}}_i F_i
@@ -136,7 +136,7 @@ Output:
The 2nd and 3rd rebinned X values are: [ 1.5 2.25]
**Example - custom two regions rebinning:**
-
+
.. testcode:: ExHistCustom
# create histogram workspace
@@ -200,7 +200,7 @@ Output:
What type is the workspace after 1st rebin: EventWorkspace
What type is the workspace after 2nd rebin: Workspace2D
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/RebinByPulseTimes-v1.rst b/docs/source/algorithms/RebinByPulseTimes-v1.rst
index 7ace4e765283fcbcf6b6fc0a181f69027ddb481a..d3bca8e89d94fac711a5ef6100fa6a480f75e368 100644
--- a/docs/source/algorithms/RebinByPulseTimes-v1.rst
+++ b/docs/source/algorithms/RebinByPulseTimes-v1.rst
@@ -43,7 +43,7 @@ as a colour map.
:alt: RebinByPulseTime.png
Instrument view of WISH with data projected after rebinning by pulse times
-
+
Usage
-----
@@ -57,10 +57,10 @@ Input workspace has raw events
event_ws = Load('CNCS_7860_event.nxs')
# Start time
start_time_in_seconds = 0
- # End time
+ # End time
end_time_in_seconds = 1e2
# Step size
- time_step_in_seconds = 1
+ time_step_in_seconds = 1
# Perform the rebin
pulse_t_ws = RebinByPulseTimes(InputWorkspace=event_ws, Params=[start_time_in_seconds, time_step_in_seconds, end_time_in_seconds])
@@ -69,7 +69,7 @@ Input workspace has raw events
print("X-axis relative end time in seconds: {}".format(pulse_t_ws.readX(0)[-1] ))
Output:
-
+
.. testoutput:: RebinByPulseTimesExample
Events are rebinned into: 100 bins per histogram
diff --git a/docs/source/algorithms/RebinByTimeAtSample-v1.rst b/docs/source/algorithms/RebinByTimeAtSample-v1.rst
index e01c41d77981870eaba1d318542bed58e0fc9ae1..3aec47e6f12441a9bd3121ad37cfa3d6c225b453 100644
--- a/docs/source/algorithms/RebinByTimeAtSample-v1.rst
+++ b/docs/source/algorithms/RebinByTimeAtSample-v1.rst
@@ -9,22 +9,22 @@
Description
-----------
-This algorithm is used to determine the relative time (since the start of the run) that events interacted with the sample. Histogramming via rebinning allows statistics to be increased and
+This algorithm is used to determine the relative time (since the start of the run) that events interacted with the sample. Histogramming via rebinning allows statistics to be increased and
output data sizes to be made manageable.
This is useful for overlaying fast log data and filtered events workspaces. The filtering calculations are the same as used in
:ref:`algm-GenerateEventsFilter` for the elastic case. **Note that the current implementation of this algorithm assumes elastic scattering only.**
-.. math::
+.. math::
TofFactor = \frac{L1}{L1 + L2}
Where *TOfFactor* is used to account for flight paths.
-This algorithm rebins an EventWorkspace according to both the pulse times of each event,
-the time of flight, and the L1 and L2 distances. This algorithm is an extension
+This algorithm rebins an EventWorkspace according to both the pulse times of each event,
+the time of flight, and the L1 and L2 distances. This algorithm is an extension
of :ref:`algm-Rebin` and :ref:`algm-RebinByPulseTimes`, which rebin by TOF an PulseTime
-respectfully.
+respectfully.
The Params inputs may
be expressed in an identical manner to the :ref:`algm-Rebin` algorithm. Param arguments are
@@ -41,10 +41,10 @@ data collection. Typically, detectors should see a uniform distribution
of the events generated between the start and end of the run. This
algorithm allows anomalies to be detected.
-
+
Usage
-----
-This algorithm takes the same inputs as :ref:`algm-RebinByPulseTimes`. See that algorithm for a usage guide.
+This algorithm takes the same inputs as :ref:`algm-RebinByPulseTimes`. See that algorithm for a usage guide.
.. categories::
diff --git a/docs/source/algorithms/RebinToWorkspace-v1.rst b/docs/source/algorithms/RebinToWorkspace-v1.rst
index fd20ffff3a8728e8cf12bb58960b6f72979d46b1..115d4c9c5416c4cfcd34bbd2eb1c585b35ece42c 100644
--- a/docs/source/algorithms/RebinToWorkspace-v1.rst
+++ b/docs/source/algorithms/RebinToWorkspace-v1.rst
@@ -13,7 +13,7 @@ Takes an input workspace and alters the binning so that all it's spectra
match that of the **first spectrum** of the second workspace. This
algorithm simply builds a parameter list that is passed to the
:ref:`algm-Rebin` algorithm, which actually does the work.
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/RecordPythonScript-v1.rst b/docs/source/algorithms/RecordPythonScript-v1.rst
index 35dc6f7305e55d0cde6c768c001c621c20912dbc..5ef879b23cf84c6db343a2a83a70b1240a5cdf37 100644
--- a/docs/source/algorithms/RecordPythonScript-v1.rst
+++ b/docs/source/algorithms/RecordPythonScript-v1.rst
@@ -20,7 +20,7 @@ Usage
.. testcode:: RecordPythonScript
-
+
from threading import Thread
import os, time
@@ -47,7 +47,7 @@ Usage
wsOut=RebinToWorkspace(wsOut,ws,PreserveEvents=True)
# This will cancel the rocording algorithm
- # you can do the same in the GUI
+ # you can do the same in the GUI
# by clicking on the details button on the bottom right
AlgorithmManager.cancelAll()
thread.join()
diff --git a/docs/source/algorithms/RefinePowderDiffProfileSeq-v1.rst b/docs/source/algorithms/RefinePowderDiffProfileSeq-v1.rst
index d609bcb0a1541ed03364683878f6b10924931e76..49e9b4940d961777b00020073e189a6dfdaeb222 100644
--- a/docs/source/algorithms/RefinePowderDiffProfileSeq-v1.rst
+++ b/docs/source/algorithms/RefinePowderDiffProfileSeq-v1.rst
@@ -40,15 +40,15 @@ Input and output workspaces
- SeqControlInfoWorkspace : table workspace used to track refinement. Below is the introduction on the fields\/columns of this workspace.
- *Step* : refinement step. User can start a refinement from the result of any previous step;
-
+
- *OutProfile* : name of the table workspace containing refined profile parameters;
 Â
- *OutReflection* : name of the table workspace containing Bragg peaks' peak parameters calculated from refined parameters value;
 Â
- *OutBackgroud* : name of the table workspace containing the value of the output background parameter;
-
+
- *OutBckgroundParam* : name of the output background parameters;
-
+
- *Refine* : profile parameters that are refined in this step;
- *RwpOut* : output Rwp from refinement;
diff --git a/docs/source/algorithms/RefinePowderInstrumentParameters-v3.rst b/docs/source/algorithms/RefinePowderInstrumentParameters-v3.rst
index db10e6fa19aed7c023e26adeb9bd0f5b3420ea23..20f4c26fcd2defc001fa375c9e6dc4f15dcf5ba7 100644
--- a/docs/source/algorithms/RefinePowderInstrumentParameters-v3.rst
+++ b/docs/source/algorithms/RefinePowderInstrumentParameters-v3.rst
@@ -21,18 +21,18 @@ FitPowderDiffPeaks().
Introduction
############
-In order to do Rietveld refinement to experimental data, the diffractometer’s profile should be calibrated by the standards, such as LaB6 or Ni,
-with known crystal structure and lattice parameters.
+In order to do Rietveld refinement to experimental data, the diffractometer’s profile should be calibrated by the standards, such as LaB6 or Ni,
+with known crystal structure and lattice parameters.
-For POWGEN and NOMAD, the type of the instrument profile is back-to-back exponential function convoluted with
+For POWGEN and NOMAD, the type of the instrument profile is back-to-back exponential function convoluted with
pseudo voigt of thermal neutron and epithermal neutron.
-It means that each diffraction peak is a back-to-back exponential,
+It means that each diffraction peak is a back-to-back exponential,
.. math:: I\frac{AB}{2(A+B)}\left[ \exp \left( \frac{A[AS^2+2(x-X0)]}{2}\right) \mbox{erfc}\left( \frac{AS^2+(x-X0)}{S\sqrt{2}} \right) + \exp \left( \frac{B[BS^2-2(x-X0)]}{2} \right) \mbox{erfc} \left( \frac{[BS^2-(x-X0)]}{S\sqrt{2}} \right) \right].
with peak parameter :math:`A`, :math:`B`, :math:`X_0` and :math:`S`
-And their corresponding peak parameters are functions described as
+And their corresponding peak parameters are functions described as
.. math::
n_{cross} = \frac{1}{2} erfc(Width(xcross\cdot d^{-1}))
@@ -106,10 +106,10 @@ where
Break down the problem
######################
-If we can do the single peak fitting on each single diffraction peak in a certain range,
+If we can do the single peak fitting on each single diffraction peak in a certain range,
then we can divide the optimization problem into 4 sub problems for :math:`X_0`, :math:`A`,
-:math:`B` and :math:`S`, with the constraint on :math:`n`, the ratio between thermal
-and epi thermal neutrons.
+:math:`B` and :math:`S`, with the constraint on :math:`n`, the ratio between thermal
+and epi thermal neutrons.
The function to fit is
@@ -138,8 +138,8 @@ The coefficients in this function are strongly correlated to each other.
Current Implementation
######################
-Only the parameters of the function for :math:`X_0` are fitted in
-present implementation.
+Only the parameters of the function for :math:`X_0` are fitted in
+present implementation.
Refinement Algorithm
####################
diff --git a/docs/source/algorithms/ReflectometryBackgroundSubtraction-v1.rst b/docs/source/algorithms/ReflectometryBackgroundSubtraction-v1.rst
index e224821c3faa3a0421864614c2338f51e3e8f6ed..f37a9f07bc7c679e65d33cb09006c3fe5f4ad33e 100644
--- a/docs/source/algorithms/ReflectometryBackgroundSubtraction-v1.rst
+++ b/docs/source/algorithms/ReflectometryBackgroundSubtraction-v1.rst
@@ -11,15 +11,15 @@ Description
This algorithm calculates and subtracts the background from a given workspace using the spectrum ranges in :literal:`ProcessingInstructions`. If no spectrum ranges are given the whole input workspace is used.
-The background can be calculated using three methods. **PerDetectorAverage** which groups the background spectrum together and divides it by the total number of spectra.
-This is done using :ref:`algm-GroupDetectors`. This is then subtracted from the input workspace. **Polynomial** uses :ref:`algm-Transpose` so the spectrum numbers
-are in the X (horizontal) axis and TOF channels are the vertical axis. Then the background is calculated by fitting a polynomial of the given degree to each TOF using the background spectra given
-in :literal:`InputWorkspaceIndexSet`. This is done using :ref:`algm-CalculatePolynomialBackground`. The minimizer used is ‘Levenberg-Marquardt’ and the value of CostFunction is passed to :ref:`algm-CalculatePolynomialBackground` as-is.
-The default option for the CostFunction is ‘Least squares’ which uses the histogram errors as weights. This might not be desirable, e.g. when there are bins with zero counts and zero errors.
-An ‘Unweighted least squares’ option is available to deal with such cases. Once this has been done the workspace is then transposed again and subtracted from the input workspace.
-**AveragePixelFit** uses :ref:`algm-RefRoi` to sum the background region on either side of the peak and finding average of these regions. Then the average is subtracted from
+The background can be calculated using three methods. **PerDetectorAverage** which groups the background spectrum together and divides it by the total number of spectra.
+This is done using :ref:`algm-GroupDetectors`. This is then subtracted from the input workspace. **Polynomial** uses :ref:`algm-Transpose` so the spectrum numbers
+are in the X (horizontal) axis and TOF channels are the vertical axis. Then the background is calculated by fitting a polynomial of the given degree to each TOF using the background spectra given
+in :literal:`InputWorkspaceIndexSet`. This is done using :ref:`algm-CalculatePolynomialBackground`. The minimizer used is ‘Levenberg-Marquardt’ and the value of CostFunction is passed to :ref:`algm-CalculatePolynomialBackground` as-is.
+The default option for the CostFunction is ‘Least squares’ which uses the histogram errors as weights. This might not be desirable, e.g. when there are bins with zero counts and zero errors.
+An ‘Unweighted least squares’ option is available to deal with such cases. Once this has been done the workspace is then transposed again and subtracted from the input workspace.
+**AveragePixelFit** uses :ref:`algm-RefRoi` to sum the background region on either side of the peak and finding average of these regions. Then the average is subtracted from
the sum of the whole region of interest of the detector. It takes the background range from the :literal:`ProcessingInstructions` and the :literal:`PeakRange` which is the range of pixels containing the peak.
-Note when using the average pixel fit method the background must only be one region either side of the peak. If any more regions are given the background will be taken as all the spectra between the highest and lowest spectra entered excluding the peak.
+Note when using the average pixel fit method the background must only be one region either side of the peak. If any more regions are given the background will be taken as all the spectra between the highest and lowest spectra entered excluding the peak.
This is done using :ref:`algm-LRSubtractAverageBackground`.
Usage
@@ -34,7 +34,7 @@ Usage
dataX = [1, 2, 3, 4, 5]
background = [2, 2, 2, 2, 2, 2, 2, 2, 2, 2]
peak = [5, 5, 5, 5, 5]
- dataY = background + peak + background
+ dataY = background + peak + background
#workspace has a background of 2 and a peak of 5 in the 2nd index
ws = CreateWorkspace(dataX, dataY, NSpec = 5)
@@ -50,7 +50,7 @@ Output:
.. testoutput:: ExPerDetAve
Peak height with background: 5.0
- Background subtracted peak height: 3.0
+ Background subtracted peak height: 3.0
**Example - Subtracting background using Polynomial:**
diff --git a/docs/source/algorithms/ReflectometryBeamStatistics-v1.rst b/docs/source/algorithms/ReflectometryBeamStatistics-v1.rst
index b388e7995ccfdfd6bec5da88a8764fe3f0055ce0..49217825c0832bb268ca2d1d38f2fe4e7ad92c29 100644
--- a/docs/source/algorithms/ReflectometryBeamStatistics-v1.rst
+++ b/docs/source/algorithms/ReflectometryBeamStatistics-v1.rst
@@ -45,7 +45,7 @@ Usage
dir = Load('ILL/D17/317369.nxs')
ref = Load('ILL/D17/317370.nxs')
-
+
ReflectometryBeamStatistics(
ReflectedBeamWorkspace=ref,
ReflectedForeground=[199, 202, 205],
diff --git a/docs/source/algorithms/ReflectometryReductionOne-v2.rst b/docs/source/algorithms/ReflectometryReductionOne-v2.rst
index fe28a08455929028f850cbd9f5ba0f3457b8a084..ad59a8c73db30b4a716ac60a7602d4ba70f79fd4 100644
--- a/docs/source/algorithms/ReflectometryReductionOne-v2.rst
+++ b/docs/source/algorithms/ReflectometryReductionOne-v2.rst
@@ -114,7 +114,7 @@ When normalizing by transmission runs, i.e. when one or two transmission runs
are given, the spectrum numbers in the
transmission workspaces must be the same as those in the input run
workspace. You can pass individual processing instructions to the transmission
-runs.
+runs.
When normalizing by transmission run, this algorithm will run
:ref:`algm-CreateTransmissionWorkspace` as a child algorithm, with properties :literal:`WavelengthMin`,
diff --git a/docs/source/algorithms/ReflectometryReductionOneAuto-v2.rst b/docs/source/algorithms/ReflectometryReductionOneAuto-v2.rst
index 6f1ff3494b4fc3960ac762f498bd4ae4baf5aa20..d0f0c5e45c5a05d6310a7d4e2847682affa01138 100644
--- a/docs/source/algorithms/ReflectometryReductionOneAuto-v2.rst
+++ b/docs/source/algorithms/ReflectometryReductionOneAuto-v2.rst
@@ -101,7 +101,7 @@ Polarization Analysis Off
~~~~~~~~~~~~~~~~~~~~~~~~~
If :literal:`PolarizationAnalysis = None` the reduction stops. Note that if
-transmission runs are given in the form of a workspace group, then the first
+transmission runs are given in the form of a workspace group, then the first
element in the group will be used on every input workspace. If transmission runs
are provided as matrix workspaces the specified runs will be used for all members
of the input workspace group.
@@ -128,11 +128,11 @@ The result will be a new workspace in wavelength, which will override the
previous one, that will be used as input to
:ref:`algm-ReflectometryReductionOne` to calculate the new output workspaces in
Q, which in turn will override the existing workspaces in Q. Note that if
-transmission runs are provided in the form of workspace groups, then the
-first workspace in the group workspaces will be summed to produce a matrix
-workspace that will be used as the transmission run for all items in the input
-workspace group, as illustrated in the diagram below (note that, for the sake of
-clarity, the rebinned output workspace in Q, :literal:`OutputWorkspaceBinned`, is
+transmission runs are provided in the form of workspace groups, then the
+first workspace in the group workspaces will be summed to produce a matrix
+workspace that will be used as the transmission run for all items in the input
+workspace group, as illustrated in the diagram below (note that, for the sake of
+clarity, the rebinned output workspace in Q, :literal:`OutputWorkspaceBinned`, is
not represented but it is handled analogously to :literal:`OutputWorkspace`).
Previous Versions
diff --git a/docs/source/algorithms/ReflectometryReductionOneAuto-v3.rst b/docs/source/algorithms/ReflectometryReductionOneAuto-v3.rst
index 242bb3a21380aac6a9aa0bc85fe21d7c51dc35e9..d6051a428ba05cd8d27a7155348b3a2648e64726 100644
--- a/docs/source/algorithms/ReflectometryReductionOneAuto-v3.rst
+++ b/docs/source/algorithms/ReflectometryReductionOneAuto-v3.rst
@@ -100,7 +100,7 @@ the first element in the group will be used on every input workspace. If
transmission runs are provided as matrix workspaces the specified runs will be
used for all members of the input workspace group.
-Polarization Analysis
+Polarization Analysis
~~~~~~~~~~~~~~~~~~~~~
If :literal:`PolarizationAnalysis` is set to false the reduction stops. If it
diff --git a/docs/source/algorithms/ReflectometrySumInQ-v1.rst b/docs/source/algorithms/ReflectometrySumInQ-v1.rst
index 783796d2069c317c7c94a12d62f45147cd7a6243..9fd6cf9f6d5c5dde133b41f28882066e2f9a456b 100644
--- a/docs/source/algorithms/ReflectometrySumInQ-v1.rst
+++ b/docs/source/algorithms/ReflectometrySumInQ-v1.rst
@@ -10,12 +10,12 @@
Description
-----------
-This algorithm sums the Y values of histograms given by
-*InputWorkspaceIndexSet* into a single single histogram. The summation is done
-using the method proposed by Cubitt et al. [#CUBITT]_ This involves a
-projection to an arbitrary reference angle, :math:`2\theta_R`, with a
-"virtual" wavelength, :math:`\lambda_v`. This is the wavelength the neutron
-would have had if it had arrived at :math:`2\theta_R` with the same momentum
+This algorithm sums the Y values of histograms given by
+*InputWorkspaceIndexSet* into a single single histogram. The summation is done
+using the method proposed by Cubitt et al. [#CUBITT]_ This involves a
+projection to an arbitrary reference angle, :math:`2\theta_R`, with a
+"virtual" wavelength, :math:`\lambda_v`. This is the wavelength the neutron
+would have had if it had arrived at :math:`2\theta_R` with the same momentum
transfer (:math:`Q`).
Counts are considered to be spread evenly over the input pixel, and the
@@ -27,8 +27,8 @@ bins.
The input workspace should have wavelength as the X units as well as an instrument.
-To produce a reflectivity, the input workspace has to be the reflected beam
-workspace where each histogram is individually divided by the summed (in
+To produce a reflectivity, the input workspace has to be the reflected beam
+workspace where each histogram is individually divided by the summed (in
lambda) direct beam data.
Usage
diff --git a/docs/source/algorithms/RemoveBackground-v1.rst b/docs/source/algorithms/RemoveBackground-v1.rst
index 64ff0574753bf55d1ac7c5d6a3e17db6ce59b0a1..0ef04ad8814fd50f9d37061531c79b9cf8be4267 100644
--- a/docs/source/algorithms/RemoveBackground-v1.rst
+++ b/docs/source/algorithms/RemoveBackground-v1.rst
@@ -8,21 +8,21 @@
Description
-----------
-Algorithm removes flat background, defined by the a single bin
-histogram workspace with X-axis in the units of TOF from a histogram workspace in any
+Algorithm removes flat background, defined by the a single bin
+histogram workspace with X-axis in the units of TOF from a histogram workspace in any
units with known conversion to TOF.
-These options are especially useful during reduction
-of event workspaces in multirep mode, where different event regions are associated with
+These options are especially useful during reduction
+of event workspaces in multirep mode, where different event regions are associated with
different incident energies and rebinned into appropriate energy range.
-The algorithm used during background removal is equivalent to the proof-of concept one,
+The algorithm used during background removal is equivalent to the proof-of concept one,
presented below, except intermediate workspaces are not created.
-Errors of the background workspace are currently ignored and their value
+Errors of the background workspace are currently ignored and their value
is calculated as the square root of correspondent background signal.
-**NOTE:** If background is a single value workspace with zero signal and error, and property
+**NOTE:** If background is a single value workspace with zero signal and error, and property
*NullifyNegativeValues* is set to True, the algorithm can be used to remove negative signal values
and estimate errors during removal.
@@ -33,14 +33,14 @@ Proof of concept background removal algorithm::
import numpy as np
import sys
import os
-
-
+
+
maps_dir = '/home/user/InstrumentFileFinder/let/'
- data_dir ='/home/user/results'
- ref_data_dir = '/home/user/SystemTests/AnalysisTests/ReferenceResults'
+ data_dir ='/home/user/results'
+ ref_data_dir = '/home/user/SystemTests/AnalysisTests/ReferenceResults'
config.setDataSearchDirs('{0};{1};{2}'.format(data_dir,maps_dir,ref_data_dir))
config['defaultsave.directory'] = data_dir # folder to save resulting spe/nxspe files. Defaults are in
-
+
# the name of a workspace containing background
filename = 'LET0007438'
groupedFilename = filename+'rings';
@@ -58,7 +58,7 @@ Proof of concept background removal algorithm::
GroupDetectors(InputWorkspace=filename, OutputWorkspace=groupedFilename , MapFile='LET_one2one_123.map', Behaviour='Average')
wsParent = mtd[groupedFilename];
-
+
nHist = wsParent.getNumberHistograms();
print("Parent workspace contains {0:10} histograms".format(nHist))
# Get the energy binning correspondent to the binning produced by rebin function (not to re-implement the same function)
@@ -72,11 +72,11 @@ Proof of concept background removal algorithm::
y=[0 for xx in xrange(0,len(x)-1)]*nHist
x = x*nHist
DeleteWorkspace(ws1s);
-
+
eGrid = CreateWorkspace(DataX=x,DataY=y,UnitX='DeltaE',NSpec=nHist,VerticalAxisUnit='SpectraNumber',ParentWorkspace=wsParent)
-
+
Tgrid=ConvertUnits(eGrid,'TOF',Emode='Direct',EFixed=Ei)
-
+
else:
Tgrid = mtd['Tgrid'];
eGrid = mtd['eGrid'];
@@ -88,15 +88,15 @@ Proof of concept background removal algorithm::
#Bg=CalculateFlatBackground(InputWorkspace=groupedFilename, StartX=bgRange[0], EndX=bgRange[1], Mode='Mean', OutputMode='Return Background', SkipMonitors=True)
else:
Bg = mtd['Bg']
-
+
# Assign constant background to the Time grid workspace, minding different time bin width
for nspec in xrange(0,nHist):
bg = Bg.dataY(nspec)
if bg[0]>0:
- bgT = Bg.dataX(nspec)
+ bgT = Bg.dataX(nspec)
TimeScale = Tgrid.dataX(nspec);
# Jacobian for the unit conversion
- Jac = (TimeScale[1:nBins]-TimeScale[0:nBins-1])*(bg[0]/(bgT[1]-bgT[0]));
+ Jac = (TimeScale[1:nBins]-TimeScale[0:nBins-1])*(bg[0]/(bgT[1]-bgT[0]));
error = np.sqrt(Jac);
eGrid.setY(nspec, Jac)
eGrid.setE(nspec, error)
@@ -104,7 +104,7 @@ Proof of concept background removal algorithm::
pass
#print(" bg at spectra {0} equal to : {1}".format(nspec,bg[0]))
-
+
background = eGrid;
resultEt = ConvertUnits(groupedFilename,'DeltaE',Emode='Direct',EFixed=Ei)
result = Rebin(InputWorkspace=resultEt, Params=[e_min,dE,e_max],PreserveEvents=False)
@@ -119,8 +119,8 @@ presented on the following picture:
.. image:: /images/BgRemoval.png
-Blue line on this image represents the results, obtained using Rebin and Background removal after that. The results produced using
-the script below and shifted by one to show that there is another result plotted on the image, as both results
+Blue line on this image represents the results, obtained using Rebin and Background removal after that. The results produced using
+the script below and shifted by one to show that there is another result plotted on the image, as both results
are identical::
from mantid.simpleapi import *
@@ -128,14 +128,14 @@ are identical::
import numpy as np
import sys
import os
-
-
+
+
maps_dir = '/home/user/InstrumentFileFinder/let/'
- data_dir ='/home/user/results'
- ref_data_dir = '/home/user/SystemTests/AnalysisTests/ReferenceResults'
+ data_dir ='/home/user/results'
+ ref_data_dir = '/home/user/SystemTests/AnalysisTests/ReferenceResults'
config.setDataSearchDirs('{0};{1};{2}'.format(data_dir,maps_dir,ref_data_dir))
config['defaultsave.directory'] = data_dir # folder to save resulting spe/nxspe files. Defaults are in
-
+
# the name of a workspace containing background
filename = 'LET0007438'
groupedFilename = filename+'rings';
@@ -150,22 +150,22 @@ are identical::
if not(groupedFilename in mtd):
Load(Filename=filename+'.nxs', OutputWorkspace=filename, LoadMonitors=True)
GroupDetectors(InputWorkspace=filename, OutputWorkspace=groupedFilename , MapFile='LET_one2one_123.map', Behaviour='Average')
-
-
+
+
if not('Bg' in mtd):
Bg=Rebin(InputWorkspace=groupedFilename, Params=[bgRange[0],bgRange[1]-bgRange[0],bgRange[1]],PreserveEvents=False)
else:
Bg = mtd['Bg']
-
+
if 'resultEtransf' in mtd:
resultEtransf = mtd['resultEtransf']
else:
resultEtransf = ConvertUnits(groupedFilename,'DeltaE',Emode='Direct',EFixed=Ei)
-
+
noBgWorkspace = Rebin(InputWorkspace=resultEtransf, Params=[e_min,dE,e_max],PreserveEvents=False)
noBgWorkspace= Rebin(InputWorkspace=noBgWorkspace,BkgWorkspace='Bg',EMode='Direct')
nHist = Bg.getNumberHistograms()
- removedBkgSum = SumSpectra(noBgWorkspace ,0,nHist-1);
+ removedBkgSum = SumSpectra(noBgWorkspace ,0,nHist-1);
Usage
@@ -183,33 +183,33 @@ Usage
# Calculate background
Bg = Rebin(Test,Params='15000,5000,20000',PreserveEvents=False);
-
-
+
+
# Convert event's units
Test_BgDE=ConvertUnits(Test,Target='DeltaE',EMode='Direct');
-
+
# Calculate histograms for event workspace in energy binning
Sample = Rebin(Test_BgDE,Params='-20,2,20',PreserveEvents=False);
- # Calculate histograms for event workspace in energy binning
+ # Calculate histograms for event workspace in energy binning
Result = Rebin(Test_BgDE,Params='-20,2,20',PreserveEvents=False);
# Remove flat background in-place
Result = RemoveBackground(Result,BkgWorkspace='Bg',EMode='Direct');
-
+
# Get access to the results
XS = Sample.dataX(0);
XR = Result .dataX(0);
-
+
YS = Sample.dataY(0);
YR = Result .dataY(0);
-
+
ES = Sample.dataE(0);
ER = Result .dataE(0);
-
+
# print first spectra, Note invalid error calculations
print("| x sampl | x result | S sample | S no bg | Err samp | Err no_bg|")
for i in range(0,20):
print("|{0:10}|{1:10}|{2:10.4f}|{3:10.3f}|{4:10.3f}|{5:10.3f}|".format(XS[i],XR[i],YS[i],YR[i],ES[i],ER[i]))
-
+
.. testoutput:: ExFlatBkgRemoval
| x sampl | x result | S sample | S no bg | Err samp | Err no_bg|
diff --git a/docs/source/algorithms/RemoveBins-v1.rst b/docs/source/algorithms/RemoveBins-v1.rst
index 4953808f4a3ad6f89b56bf31fa27032b363360c2..37acdac357b0e40c953827366deab8c8c30c072d 100644
--- a/docs/source/algorithms/RemoveBins-v1.rst
+++ b/docs/source/algorithms/RemoveBins-v1.rst
@@ -65,20 +65,20 @@ Usage
# Create a workspace with 1 spectrum with five bins of width 10
ws = CreateSampleWorkspace("Histogram", NumBanks=1, BankPixelWidth=1, BinWidth=10, Xmax=50)
- # Run algorithm removing 2nd, 3rd bins and half of 4th bin.
+ # Run algorithm removing 2nd, 3rd bins and half of 4th bin.
OutputWorkspace = RemoveBins( ws, 20, 35)
# Show workspaces
print("Before RemoveBins {}".format(ws.readY(0)))
print("After RemoveBins {}".format(OutputWorkspace.readY(0)))
-
+
Output:
.. testoutput:: ExRemoveBinsSimple
Before RemoveBins [ 10.3 0.3 0.3 0.3 0.3]
After RemoveBins [ 10.3 0. 0. 0.15 0.3 ]
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/RemoveExpDecay-v1.rst b/docs/source/algorithms/RemoveExpDecay-v1.rst
index 68ebebc0205f28457a9a31f063c5ff107f7e72b7..17a714ec510d27925a26e9a4187051541af4b08a 100644
--- a/docs/source/algorithms/RemoveExpDecay-v1.rst
+++ b/docs/source/algorithms/RemoveExpDecay-v1.rst
@@ -11,7 +11,7 @@ Description
This algorithm removes the exponential time decay from the specified muon
spectra, leaving the rest unchanged. By default, all the spectra
-in a workspace will be corrected. If the detector records a total of
+in a workspace will be corrected. If the detector records a total of
zero counts (i.e. the detector is dead) then the output will be all zeros for that detector.
The formula for removing the exponential decay is given by:
@@ -57,7 +57,7 @@ Output:
#make y data
def genYData(x,phi):
return np.sin(5.0*x+phi)+np.exp(-x/2.2)
-
+
yData = np.append(genYData(x, 0.0), genYData(x, 1.2))
yData = np.append(yData, np.zeros(len(x))) # dead detector
yData = np.append(yData, genYData(x, 3.4))
diff --git a/docs/source/algorithms/RemoveLogs-v1.rst b/docs/source/algorithms/RemoveLogs-v1.rst
index 4944a4e094e55849e413d13d305911cd19dd847d..0c0b17eba43cb8a1294da0aaa7c2a8c398927cf4 100644
--- a/docs/source/algorithms/RemoveLogs-v1.rst
+++ b/docs/source/algorithms/RemoveLogs-v1.rst
@@ -18,11 +18,11 @@ Usage
# create some workspace with an instrument
ws = CreateSampleWorkspace()
print("Original logs: {}".format(ws.run().keys()))
-
+
# remove logs, but keep some
RemoveLogs(ws,KeepLogs="run_start, run_title")
print("Logs left: {}".format(ws.run().keys()))
-
+
# delete all logs
RemoveLogs(ws)
print("Logs left (should be empty): {}".format(ws.run().keys()))
@@ -30,7 +30,7 @@ Usage
.. testcleanup:: RemoveLogs
DeleteWorkspace(ws)
-
+
Output:
.. testoutput:: RemoveLogs
@@ -38,7 +38,7 @@ Output:
Original logs: ['run_title', 'start_time', 'end_time', 'run_start', 'run_end']
Logs left: ['run_title', 'run_start']
Logs left (should be empty): []
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/RemoveLowResTOF-v1.rst b/docs/source/algorithms/RemoveLowResTOF-v1.rst
index e0fac7361d9628c73f367093b0563ee6c5eeb892..7e5ec6f17eb51ac4e5d34043b80f976196315cdc 100644
--- a/docs/source/algorithms/RemoveLowResTOF-v1.rst
+++ b/docs/source/algorithms/RemoveLowResTOF-v1.rst
@@ -9,7 +9,7 @@
Description
-----------
-The low resolution time-of-flight cutoff is determined by one of two methods.
+The low resolution time-of-flight cutoff is determined by one of two methods.
The selection is made based on whether or not ``MinWavelength`` is specified.
MinWavelength
diff --git a/docs/source/algorithms/RemovePromptPulse-v1.rst b/docs/source/algorithms/RemovePromptPulse-v1.rst
index 172346cc8a6578fb4abadcabfb8fdae7108fa62d..ce97cf1b6a55958b9b4df341180b8e5ac630fd65 100644
--- a/docs/source/algorithms/RemovePromptPulse-v1.rst
+++ b/docs/source/algorithms/RemovePromptPulse-v1.rst
@@ -21,7 +21,7 @@ Usage
from numpy import *
x=arange(0,100000,10)
y=0*x+1
- w=CreateWorkspace(x,y[1:],UnitX="TOF")
+ w=CreateWorkspace(x,y[1:],UnitX="TOF")
#apply algorithm
w1=RemovePromptPulse(w,Width=5000,Frequency=50)
@@ -30,7 +30,7 @@ Usage
#do some checks
x=w1.dataX(0)
y=w1.dataY(0)
-
+
print("Y( {} ) = {:.1f}".format(x[100], y[100]))
print("Y( {} ) = {:.1f}".format(x[1000], y[1000]))
print("Y( {} ) = {:.1f}".format(x[4100], y[4100]))
@@ -44,7 +44,7 @@ Usage
Output:
.. testoutput:: RemovePromptPulse
-
+
Y( 1000.0 ) = 0.0
Y( 10000.0 ) = 1.0
Y( 41000.0 ) = 0.0
diff --git a/docs/source/algorithms/RemoveSpectra-v1.rst b/docs/source/algorithms/RemoveSpectra-v1.rst
index 83d14876d8de09b4d57a6d57b06a29656bba5ea8..ff267337c090c0c1d03e59a6231e1eadf3749043 100644
--- a/docs/source/algorithms/RemoveSpectra-v1.rst
+++ b/docs/source/algorithms/RemoveSpectra-v1.rst
@@ -13,7 +13,7 @@ The ``RemoveSpectra`` algorithm allows for removing
of a spectra from a given workspace, allowing specification
of workspace indices, or multiple forms of detected removal.
-This would work well for repairing "Bad Data" which for
+This would work well for repairing "Bad Data" which for
RemoveSpectraWithNoDetector or RemoveMaskedSpectra.
.. categories::
diff --git a/docs/source/algorithms/RemoveWorkspaceHistory-v1.rst b/docs/source/algorithms/RemoveWorkspaceHistory-v1.rst
index 1b089159a3350c37e9aa20f18a747e2dfd22e746..1a6a3410b595975c9f7727b1942859fe77cf20d9 100644
--- a/docs/source/algorithms/RemoveWorkspaceHistory-v1.rst
+++ b/docs/source/algorithms/RemoveWorkspaceHistory-v1.rst
@@ -10,12 +10,12 @@ Description
-----------
Removes all algorithm history records from a given workspace. This includes all workflow and child algorithm history records. After this algorithm has been run, the workspace will not be reproducible
-from its history. Note that this algorithm will not remove the environment history associated with a workspace.
+from its history. Note that this algorithm will not remove the environment history associated with a workspace.
Usage
-----
-**Example:**
+**Example:**
.. testcode:: ExStripHistory
@@ -41,11 +41,11 @@ Usage
print("After RemoveWorkspaceHistory")
print_workspace_history(ws)
-
+
Output:
.. testoutput:: ExStripHistory
-
+
Workspace ws has 5 algorithms in it's history
CreateSampleWorkspace
ConvertUnits
diff --git a/docs/source/algorithms/RenameLog-v1.rst b/docs/source/algorithms/RenameLog-v1.rst
index 83e74bcee0f7ff96b9aeead13d2228998c97bb42..3a14091acbcbefc6d1b7407bcfad0a17a199a8e8 100644
--- a/docs/source/algorithms/RenameLog-v1.rst
+++ b/docs/source/algorithms/RenameLog-v1.rst
@@ -21,15 +21,15 @@ Usage
.. testcode:: ExRenameLog
import os
-
+
nxsfilename = "HYS_11092_event.nxs"
wsname = "HYS_11092_event"
-
- Load(Filename = nxsfilename,
+
+ Load(Filename = nxsfilename,
OutputWorkspace = wsname,
MetaDataOnly = True,
LoadLogs = True)
-
+
RenameLog(Workspace=wsname, OriginalLogName='a1b', NewLogName='A1B_New')
.. testcleanup:: ExRenameLog
diff --git a/docs/source/algorithms/RenameWorkspace-v1.rst b/docs/source/algorithms/RenameWorkspace-v1.rst
index c5d6e2d95e22849caab515882e7ea3478c10317c..7fd410ff9c549ec1fdab1095079db12043f7a6c7 100644
--- a/docs/source/algorithms/RenameWorkspace-v1.rst
+++ b/docs/source/algorithms/RenameWorkspace-v1.rst
@@ -26,8 +26,8 @@ If the Overwrite flag is set to false and any name is in use RenameWorkspace
will not rename the workspace and log an error.
.. warning::
- RenameWorkspace is set to overwrite by default to maintain backwards compatibility.
- Ensure the overwrite flag is set to false to prevent any existing workspaces being
+ RenameWorkspace is set to overwrite by default to maintain backwards compatibility.
+ Ensure the overwrite flag is set to false to prevent any existing workspaces being
replaced with the renamed workspace.
@@ -40,16 +40,16 @@ Usage
AnalysisDataService.clear()
myWs=CreateSampleWorkspace()
- mon_ws = CreateSampleWorkspace()
- myWs.setMonitorWorkspace(mon_ws)
+ mon_ws = CreateSampleWorkspace()
+ myWs.setMonitorWorkspace(mon_ws)
print("*********************************************************************")
print("{0:20}|{1:>20}|{2:>20}|".format("Existing WS names: ",myWs.name(),mon_ws.name()))
obj_inADS = AnalysisDataService.getObjectNames()
obj_inADS.sort()
print("{0:20}|{1:>6}| With Names: |{2:>20}|{3:>20}|".format("Exist in ADS: ",len(obj_inADS),obj_inADS[0],obj_inADS[1]))
-
+
NameA = RenameWorkspace(myWs)
-
+
print("***** After simple rename:")
print("{0:20}|{1:>20}|{2:>20}|".format("Existing WS names: ",NameA.name(),mon_ws.name()))
obj_inADS = AnalysisDataService.getObjectNames()
@@ -59,19 +59,19 @@ Usage
print("Old pointer to myWs refers to workspace with new name: {}".format(myWs.name()))
print("*********************************************************************")
print("***** After renaming workspace and monitors workspace together:")
-
+
NameB = RenameWorkspace(myWs,RenameMonitors=True)
-
+
print("{0:20}|{1:>20}|{2:>20}|".format("Existing WS names: ",NameB.name(),mon_ws.name()))
obj_inADS = AnalysisDataService.getObjectNames()
obj_inADS.sort()
print("{0:20}|{1:>6}| With Names: |{2:>20}|{3:>20}|".format("Exist in ADS: ",len(obj_inADS),obj_inADS[0],obj_inADS[1]))
-
+
mon_ws1 = NameB.getMonitorWorkspace()
print("The name of the monitor workspace attached to workspace:{0:>6}| Is: {1:>10}|".
format(NameB.name(),mon_ws1.name()))
print("*********************************************************************")
-
+
Output:
.. testoutput:: ExRenameWorkspace
@@ -79,7 +79,7 @@ Output:
*********************************************************************
Existing WS names: | myWs| mon_ws|
Exist in ADS: | 2| With Names: | mon_ws| myWs|
- ***** After simple rename:
+ ***** After simple rename:
Existing WS names: | NameA| mon_ws|
Exist in ADS: | 2| With Names: | NameA| mon_ws|
Old pointer to myWs refers to workspace with new name: NameA
@@ -89,32 +89,32 @@ Output:
Exist in ADS: | 2| With Names: | NameB| NameB_monitors|
The name of the monitor workspace attached to workspace: NameB| Is: NameB_monitors|
*********************************************************************
-
+
**Example - Setting Overwrite on and off:**
.. testcode:: ExOverwriteExisting
#Clear the ADS before starting
AnalysisDataService.clear()
-
+
#Create an existing workspace called 'wsOld'
CreateWorkspace([0], [0], OutputWorkspace="wsOld")
-
+
#Next create a workspace we are going to rename
CreateWorkspace([0], [0], OutputWorkspace="wsNew")
-
+
#This will fail telling us that 'wsOld' already exists
print('Trying to rename with OverwriteExisting set to false.')
try:
RenameWorkspace(InputWorkspace="wsNew", OutputWorkspace="wsOld", OverwriteExisting=False)
except RuntimeError:
print('RuntimeError: The workspace wsOld already exists')
-
+
#This will succeed in renaming and 'wsOld' will be replaced with 'wsNew'
print('Trying to rename with OverwriteExisting set to true.')
- RenameWorkspace(InputWorkspace="wsNew", OutputWorkspace="wsOld", OverwriteExisting=True)
+ RenameWorkspace(InputWorkspace="wsNew", OutputWorkspace="wsOld", OverwriteExisting=True)
print('Succeeded')
-
+
Output:
.. testoutput:: ExOverwriteExisting
@@ -124,7 +124,7 @@ Output:
Trying to rename with OverwriteExisting set to true.
Succeeded
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/RenameWorkspaces-v1.rst b/docs/source/algorithms/RenameWorkspaces-v1.rst
index c1fc0899d85cfc4f49769cbf187bf70aa497414d..9e4e5a209b963799f7e0ac97ac4e16a035aa5db7 100644
--- a/docs/source/algorithms/RenameWorkspaces-v1.rst
+++ b/docs/source/algorithms/RenameWorkspaces-v1.rst
@@ -22,14 +22,14 @@ The new names can be either explicitly defined by a comma separated list
or by adding a prefix, suffix or both a prefix and suffix.
The new name can be the same as any existing workspaces if the overwrite flag
-is set to true. This will replace any existing workspaces with the same output
+is set to true. This will replace any existing workspaces with the same output
name.
If the overwrite flag is set to false and any name is in use RenameWorkspaces
will not rename any of the workspaces and log an error.
.. warning::
- RenameWorkspaces is set to overwrite by default to maintain backwards compatibility.
- Ensure the overwrite flag is set to false to prevent any existing workspaces being
+ RenameWorkspaces is set to overwrite by default to maintain backwards compatibility.
+ Ensure the overwrite flag is set to false to prevent any existing workspaces being
replaced with a renamed workspace.
Usage
@@ -101,37 +101,37 @@ Output:
#Clear the ADS before starting
mtd.clear()
-
+
#Create an existing workspace called 'new_ws1'
CreateWorkspace([0], [0], OutputWorkspace="new_ws1")
-
+
#Next create workspaces we are going to rename
names = ['ws1', 'ws2', 'ws3']
-
+
for name in names:
CreateWorkspace([0], [0], OutputWorkspace=name)
-
+
#This will fail telling us that 'new_ws1' already exists
print('Trying to rename with OverwriteExisting set to false.')
try:
RenameWorkspaces(names, Prefix='new_', OverwriteExisting=False)
except RuntimeError:
print('RuntimeError: A workspace called new_ws1 already exists')
-
+
#This will succeed in renaming and 'new_ws1' will be replaced with 'ws1'
print('Trying to rename with OverwriteExisting set to true.')
- RenameWorkspaces(names, Prefix='new_', OverwriteExisting=True)
+ RenameWorkspaces(names, Prefix='new_', OverwriteExisting=True)
print('Succeeded')
-
+
Output:
.. testoutput:: ExOverwriteExisting
-
+
Trying to rename with OverwriteExisting set to false.
RuntimeError: A workspace called new_ws1 already exists
Trying to rename with OverwriteExisting set to true.
Succeeded
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/ReplaceSpecialValues-v1.rst b/docs/source/algorithms/ReplaceSpecialValues-v1.rst
index 9e4f3340da9772904bed8e38b18f9a1f27bc6956..7a04557eafaef918aa67c80e0dcaa63db02092eb 100644
--- a/docs/source/algorithms/ReplaceSpecialValues-v1.rst
+++ b/docs/source/algorithms/ReplaceSpecialValues-v1.rst
@@ -15,16 +15,16 @@ finds a value set to NaN (not a number), infinity, larger or smaller
than the 'big'/'small' threshold given then that value and the associated
error is replaced by the user provided values.
-If no value is provided for either NaNValue, InfinityValue, BigValueThreshold
+If no value is provided for either NaNValue, InfinityValue, BigValueThreshold
or SmallValueThreshold then the algorithm will exit with an error, as in this
case it would not be checking anything.
-The algorithm can also handle event workspaces.
+The algorithm can also handle event workspaces.
Usage
-----
-**Example**
+**Example**
.. testcode:: replaceSV
@@ -38,16 +38,16 @@ Usage
yArray[3] = float("NaN")
yArray[4] = 8e-7
ws.setY(0,yArray)
-
+
ws = ReplaceSpecialValues(ws,NaNValue=0,InfinityValue=1000,
- BigNumberThreshold=1000, BigNumberValue=1000,
+ BigNumberThreshold=1000, BigNumberValue=1000,
SmallNumberThreshold=1e-6, SmallNumberValue=200)
print("i\tBefore\tAfter")
print("-\t------\t-----")
for i in range(5):
print("{}\t{}\t{}".format(i, yArray[i],ws.readY(0)[i]))
-
+
Output:
.. testoutput:: replaceSV
@@ -60,7 +60,7 @@ Output:
2 -inf 1000.0
3 nan 0.0
4 8e-07 200.0
-
+
.. testcode:: replaceSVFloatingPointErrors
import numpy as np
@@ -69,15 +69,15 @@ Output:
value1 = 1.00000004
value2 = 1.00000003
valueDiff = value1 - value2
-
+
wsYArray = np.array(ws.readY(0))
wsYArray[0] = valueDiff
ws.setY(0, wsYArray)
ws = ReplaceSpecialValues(ws, SmallNumberThreshold=1e-6)
-
+
print("Before\t\t After")
print("{0:.11e}\t{1:.1f}".format(wsYArray[0], ws.readY(0)[0]))
-
+
Output:
.. testoutput:: replaceSVFloatingPointErrors
diff --git a/docs/source/algorithms/ResNorm-v1.rst b/docs/source/algorithms/ResNorm-v1.rst
index 22d14ef8272e71d66803acab8e07bd7e37045652..a39f2d7b3a9c9cd844e908d4d1a94abfd3844c72 100644
--- a/docs/source/algorithms/ResNorm-v1.rst
+++ b/docs/source/algorithms/ResNorm-v1.rst
@@ -22,7 +22,7 @@ Usage
**Example - a basic example using ResNorm.**
.. code-block:: python
-
+
def createSampleWorkspace(name, random=False):
""" Creates a sample workspace with a single lorentzian that looks like IRIS data"""
import os
diff --git a/docs/source/algorithms/ResNorm-v2.rst b/docs/source/algorithms/ResNorm-v2.rst
index fc31d42f50819190480450dbe462a923671183f4..50f3aa5fe00928726dce63af967137e2a1683f63 100644
--- a/docs/source/algorithms/ResNorm-v2.rst
+++ b/docs/source/algorithms/ResNorm-v2.rst
@@ -27,7 +27,7 @@ Usage
**Example - a basic example using ResNorm.**
.. testcode:: ExIRISResNorm
-
+
def createSampleWorkspace(name, num_spec=10, random=False):
"""
Creates a sample workspace with a single lorentzian that looks like IRIS data
diff --git a/docs/source/algorithms/RingProfile-v1.rst b/docs/source/algorithms/RingProfile-v1.rst
index 6128ab0c3d49d747f8149b12574ada228be49bd1..bae20280d0121de931e507481e3a8681bca9b052 100644
--- a/docs/source/algorithms/RingProfile-v1.rst
+++ b/docs/source/algorithms/RingProfile-v1.rst
@@ -16,7 +16,7 @@ Below, there is an example of the execution of the RingProfile to a
associated to detector positions, but it is derived from the
`Axes <Interacting_with_Matrix_Workspaces#Axes>`__.
-.. figure:: /images/ExecuteRingProfile.png
+.. figure:: /images/ExecuteRingProfile.png
:width: 800px
:align: center
@@ -35,9 +35,9 @@ define the bin where to put the count for that pixel.
The RingProfile is also defined for Workspace2D which has the positions
based on the detectors, as you can see in the picture below.
-.. figure:: /images/RingProfileInstrument.png
+.. figure:: /images/RingProfileInstrument.png
:align: center
- :width: 800px
+ :width: 800px
In this case, the inputs of the algorithm is like the image below
@@ -64,7 +64,7 @@ RealAngle = StartAngle - Angle
Usage
-----
-**Example - A complete Circle - no inner radius**
+**Example - A complete Circle - no inner radius**
.. testcode:: ExCircle
@@ -79,7 +79,7 @@ Output:
The RingProfile has been calculated with 100 bins
-**Example - A ring**
+**Example - A ring**
.. testcode:: ExRing
@@ -87,7 +87,7 @@ Output:
wsOut = RingProfile(ws,Centre=[0,5,10],MinRadius=1,MaxRadius=5,NumBins=200)
print("The RingProfile has been calculated with {} bins".format(wsOut.blocksize()))
-
+
Output:
.. testoutput:: ExRing
diff --git a/docs/source/algorithms/RotateInstrumentComponent-v1.rst b/docs/source/algorithms/RotateInstrumentComponent-v1.rst
index b5b11e31fa77a83c6a6cbd8dab851222462d8bb7..27b32c0df9310828fb18cfc085926fecfedb9567 100644
--- a/docs/source/algorithms/RotateInstrumentComponent-v1.rst
+++ b/docs/source/algorithms/RotateInstrumentComponent-v1.rst
@@ -14,7 +14,7 @@ by an angle given in degrees. Rotation by 0 degrees does not change the
component's orientation. The rotation axis (X,Y,Z) must be given in the
co-ordinate system attached to the component and rotates with it.
The centre of rotation is the centre of the component to be rotated,
-and any children of that component (such as detectors in a bank, or pixels in a tube)
+and any children of that component (such as detectors in a bank, or pixels in a tube)
are moved and rotated along with the component.
Usage
@@ -22,7 +22,7 @@ Usage
Example 1: Rotating a bank around the Y Axis
############################################
-
+
.. figure:: ../images/RotateBank90.png
:alt: RotateBank90.png‎
:align: center
diff --git a/docs/source/algorithms/SANSAbsoluteScale-v1.rst b/docs/source/algorithms/SANSAbsoluteScale-v1.rst
index dfb8782b7d0bef92589442ecf5668dbe213832d7..ba8a9a1e76116a4c6473c8e712268a1070e696fb 100644
--- a/docs/source/algorithms/SANSAbsoluteScale-v1.rst
+++ b/docs/source/algorithms/SANSAbsoluteScale-v1.rst
@@ -19,17 +19,17 @@ data is then used to compute the scaling factor according to
where :math:`N_b` is the total count within the distance of a beam diameter of the beam center.
-:math:`M` is the monitor count.
+:math:`M` is the monitor count.
-:math:`T` is the attenuator transmission.
+:math:`T` is the attenuator transmission.
-:math:`d` is the detector pixel width.
+:math:`d` is the detector pixel width.
-:math:`L` is the sample-detector distance.
+:math:`L` is the sample-detector distance.
The input workspace is then scaled by :math:`1/f`.
-This algorithm is rarely called directly. It is called by
+This algorithm is rarely called directly. It is called by
:ref:`HFIRSANSReduction <algm-HFIRSANSReduction>`.
.. categories::
diff --git a/docs/source/algorithms/SANSAzimuthalAverage1D-v1.rst b/docs/source/algorithms/SANSAzimuthalAverage1D-v1.rst
index d42709129706e39201f9effece408bc326f02f01..bcd6c47b1ca1b1373b9d827ccf7d55189bfe6aa5 100644
--- a/docs/source/algorithms/SANSAzimuthalAverage1D-v1.rst
+++ b/docs/source/algorithms/SANSAzimuthalAverage1D-v1.rst
@@ -9,9 +9,9 @@
Description
-----------
-Compute I(q) for reduced SANS data.
-This algorithm is rarely called directly. It is called by
-:ref:`HFIRSANSReduction <algm-HFIRSANSReduction>` or
+Compute I(q) for reduced SANS data.
+This algorithm is rarely called directly. It is called by
+:ref:`HFIRSANSReduction <algm-HFIRSANSReduction>` or
:ref:`EQSANSAzimuthalAverage1D <algm-EQSANSAzimuthalAverage1D>`.
This algorithm will gather the relevant information necessary to perform the
@@ -20,10 +20,10 @@ I(Q) calculation. This information includes:
- The Q binning, which is either taken from the inputs (if supplied) or computed.
- The number of pixels in X and Y, which is an input of :ref:`Q1DWeighted <algm-Q1DWeighted>`.
-After this information is gathered, the
+After this information is gathered, the
:ref:`Q1DWeighted <algm-Q1DWeighted>` algorithm is called.
-If *ComputeResolution* was set to True, the
+If *ComputeResolution* was set to True, the
:ref:`ReactorSANSResolution <algm-ReactorSANSResolution>` is called.
.. categories::
diff --git a/docs/source/algorithms/SANSBeamFinder-v1.rst b/docs/source/algorithms/SANSBeamFinder-v1.rst
index 985aaac9c556170a6731798515f409edca6a151d..2c7ac8dcf86cdef781fd53778c7735c34342aba0 100644
--- a/docs/source/algorithms/SANSBeamFinder-v1.rst
+++ b/docs/source/algorithms/SANSBeamFinder-v1.rst
@@ -9,8 +9,8 @@
Description
-----------
-Beam finder workflow algorithm for SANS instruments.
-This algorithm is rarely called directly. It is called by
+Beam finder workflow algorithm for SANS instruments.
+This algorithm is rarely called directly. It is called by
:ref:`SANSReduction <algm-SANSReduction>` or :ref:`HFIRSANSReduction <algm-HFIRSANSReduction>`.
This algorithm abstracts out the details of how to call the :ref:`FindCenterOfMassPosition <algm-FindCenterOfMassPosition>`
diff --git a/docs/source/algorithms/SANSBeamFluxCorrection-v1.rst b/docs/source/algorithms/SANSBeamFluxCorrection-v1.rst
index 89fa891a0efc74e983d71c0fb282e90106679d19..b9375b79b6bfb682eb41e5b345fd2fd13033f824 100644
--- a/docs/source/algorithms/SANSBeamFluxCorrection-v1.rst
+++ b/docs/source/algorithms/SANSBeamFluxCorrection-v1.rst
@@ -18,7 +18,7 @@ The correction goes as follows:
where
:math:`\Phi_{sample} = \frac{M_{sample}}{M_{ref}} \Phi_{ref}`
-
+
Workflow
########
@@ -30,7 +30,7 @@ Usage
**Example - Performing a Beam Flux Correction on Dummy Data**
.. testcode:: ExTable
-
+
# Create some dummy data, as well as a dummy monitor ws for EQSANS.
x = [1,2,3,4,5,6,7,8,9,10,11]
y = 491520*[0.1]
@@ -43,7 +43,7 @@ Usage
print("The expected value of each bin should be {:.11e}.".format(0.1/(49152*0.1)/(49152*0.1)))
print("The actual value of the first bin is {:.11e}.".format(corrected[0].readY(0)[0]))
-
+
Output:
diff --git a/docs/source/algorithms/SANSBeamSpreaderTransmission-v1.rst b/docs/source/algorithms/SANSBeamSpreaderTransmission-v1.rst
index 7ca608d099c251d4ae109d356d3e2e546ad8d823..977d822b9dea944834b391c5ae89afcbd82e5763 100644
--- a/docs/source/algorithms/SANSBeamSpreaderTransmission-v1.rst
+++ b/docs/source/algorithms/SANSBeamSpreaderTransmission-v1.rst
@@ -9,30 +9,30 @@
Description
-----------
-Worfklow algorithm used to compute and apply the sample transmission correction using
-the beam spreader ("glassy carbon") method. The transmission is calculated by the
+Worfklow algorithm used to compute and apply the sample transmission correction using
+the beam spreader ("glassy carbon") method. The transmission is calculated by the
:ref:`CalculateTransmission <algm-CalculateTransmission>` as follows:
:math:`T=\frac{N_{gc,\ sample}/T_{gc,\ sample} - T_{gc}N_{sample}/T_{sample}}{N_{gc,\ empty}/T_{gc,\ empty} - T_{gc}N_{empty}/T_{empty}}`
-where :math:`N_{gc}`, sample and :math:`N_{gc}`, empty are the sums of all pixel counts
-for the sample and direct beam data sets with glass carbon, and
-:math:`N_{sample}` and :math:`N_{empty}` are the sums
-of all the pixel counts for the sample and direct beam without glassy carbon.
-The T values are the corresponding counting times. If the user chose to normalize the
-data using the beam monitor when setting up the reduction process, the beam monitor
+where :math:`N_{gc}`, sample and :math:`N_{gc}`, empty are the sums of all pixel counts
+for the sample and direct beam data sets with glass carbon, and
+:math:`N_{sample}` and :math:`N_{empty}` are the sums
+of all the pixel counts for the sample and direct beam without glassy carbon.
+The T values are the corresponding counting times. If the user chose to normalize the
+data using the beam monitor when setting up the reduction process, the beam monitor
will be used to normalize all data sets instead of the timer.
-If the user chose to use a dark current data set when starting the reduction process,
-that dark current data will be subtracted from all data sets before the transmission
+If the user chose to use a dark current data set when starting the reduction process,
+that dark current data will be subtracted from all data sets before the transmission
is calculated.
-For each detector pixel, the transmission correction is applied by the
+For each detector pixel, the transmission correction is applied by the
:ref:`ApplyTransmissionCorrection <algm-ApplyTransmissionCorrection>` as follows:
:math:`I'(x,y)=\frac{I(x,y)}{T^{[1+\sec(2\theta)]/2}}
\sigma_{I'(x,y)}=[[{\frac{\sigma_I}{{T^{[1+\sec(2\theta)]/2}}}}]^2 + [{\frac{I(x,y)\sigma_T(\frac{1+\sec(2\theta)}{2})}{{T^{[\sec(2\theta)-1]/2}}}}]^2]^{1/2}`
-This algorithm is rarely called directly. It is called by
+This algorithm is rarely called directly. It is called by
:ref:`HFIRSANSReduction <algm-HFIRSANSReduction>`.
.. categories::
diff --git a/docs/source/algorithms/SANSDarkRunBackgroundCorrection-v1.rst b/docs/source/algorithms/SANSDarkRunBackgroundCorrection-v1.rst
index 337b14f2d3c04dc3012e76859e4d6e6ae6f0c736..0dacc052c0a753ec1c83b6f6f2bf433689f96a9d 100644
--- a/docs/source/algorithms/SANSDarkRunBackgroundCorrection-v1.rst
+++ b/docs/source/algorithms/SANSDarkRunBackgroundCorrection-v1.rst
@@ -11,8 +11,8 @@ Description
This algorithm subtracts a dark run from a workspace. *InputWorkspace* and *DarkRun* have to
be of type Workspace2D and need to contain the same spectra.
-The user can choose to either subtract spectra which are associated with detecors
-(*ApplyToDetectors*) and/or monitors (*ApplyToMonitors*). In the case of monitors, the user can
+The user can choose to either subtract spectra which are associated with detecors
+(*ApplyToDetectors*) and/or monitors (*ApplyToMonitors*). In the case of monitors, the user can
select specific monitors (*SelectedMonitors*) according to their detecotor IDs.
The *NormalizationRatio* is used to scale the signal values of the *DarkRun* workspace before
@@ -36,7 +36,7 @@ Usage
ws_sample = CreateSampleWorkspace()
ws_dark_run = CloneWorkspace(ws_sample)
- out_ws = SANSDarkRunBackgroundCorrection(InputWorkspace = ws_sample,
+ out_ws = SANSDarkRunBackgroundCorrection(InputWorkspace = ws_sample,
DarkRun = ws_dark_run,
NormalizationRatio = 0.5,
Uniform = False,
diff --git a/docs/source/algorithms/SANSDirectBeamTransmission-v1.rst b/docs/source/algorithms/SANSDirectBeamTransmission-v1.rst
index dd4b153d066ebd8b52844afca84ad3cdbf01c396..c161f52cc729774655ad8bed1e5f61cb448c8fbf 100644
--- a/docs/source/algorithms/SANSDirectBeamTransmission-v1.rst
+++ b/docs/source/algorithms/SANSDirectBeamTransmission-v1.rst
@@ -9,22 +9,22 @@
Description
-----------
-Worfklow algorithm used to compute and apply the sample transmission correction using
+Worfklow algorithm used to compute and apply the sample transmission correction using
the direct beam method. The transmission is calculated by the
:ref:`CalculateTransmission <algm-CalculateTransmission>`
as follows:
:math:`T=\frac{\sum_{i;\ d(i,j)<R}\ \sum_{j} \frac{I_{sample}(i,j)}{T_{sample}}}{\sum_{i;\ d(i,j)<R}\ \sum_{j} \frac{I_{beam}(i,j)}{T_{beam}}}`
-where :math:`I_{sample}` and :math:`I_{beam}` are the pixel counts for the sample
-data set and the direct beam data set, respectively. The sums for each data set runs
-only over the pixels within a distance R of the beam center equal to the beam radius.
-:math:`T_{sample}` and :math:`T_{beam}` are the counting times for each of the
-two data sets. If the user chose to normalize the data using the beam monitor when
-setting up the reduction process, the beam monitor will be used to normalize the
+where :math:`I_{sample}` and :math:`I_{beam}` are the pixel counts for the sample
+data set and the direct beam data set, respectively. The sums for each data set runs
+only over the pixels within a distance R of the beam center equal to the beam radius.
+:math:`T_{sample}` and :math:`T_{beam}` are the counting times for each of the
+two data sets. If the user chose to normalize the data using the beam monitor when
+setting up the reduction process, the beam monitor will be used to normalize the
sample and direct beam data sets instead of the timer.
-If the user chose to use a dark current data set when starting the reduction process,
-that dark current data will be subtracted from both data sets before the transmission
+If the user chose to use a dark current data set when starting the reduction process,
+that dark current data will be subtracted from both data sets before the transmission
is calculated.
@@ -35,7 +35,7 @@ as follows:
:math:`I'(x,y)=\frac{I(x,y)}{T^{[1+\sec(2\theta)]/2}}
\sigma_{I'(x,y)}=[[{\frac{\sigma_I}{{T^{[1+\sec(2\theta)]/2}}}}]^2 + [{\frac{I(x,y)\sigma_T(\frac{1+\sec(2\theta)}{2})}{{T^{[\sec(2\theta)-1]/2}}}}]^2]^{1/2}`
-This algorithm is rarely called directly. It is called by
+This algorithm is rarely called directly. It is called by
:ref:`HFIRSANSReduction <algm-HFIRSANSReduction>` or :ref:`EQSANSDirectBeamTransmission <algm-EQSANSDirectBeamTransmission>`.
.. categories::
diff --git a/docs/source/algorithms/SANSFitShiftScale-v1.rst b/docs/source/algorithms/SANSFitShiftScale-v1.rst
index 9456909f7fa01bca8772c8744a74a6fbf6169405..7136bf0b354e7da4697e5fbf49dfab6c21326f96 100644
--- a/docs/source/algorithms/SANSFitShiftScale-v1.rst
+++ b/docs/source/algorithms/SANSFitShiftScale-v1.rst
@@ -14,7 +14,7 @@ This algorithm is used to fit data from the high-angle bank to data from the low
Fit Modes
##############
-There are 4 available fit modes used to scale and shift the high angle bank data so that it matches up with the low angle bank data. Where fitting is required :ref:`algm-Fit` is used with a composite function comprised of a *FlatBackground* and *TabulatedFunction*. In all cases the shift and scale are used to alter the counts and errors for the high angle bank.
+There are 4 available fit modes used to scale and shift the high angle bank data so that it matches up with the low angle bank data. Where fitting is required :ref:`algm-Fit` is used with a composite function comprised of a *FlatBackground* and *TabulatedFunction*. In all cases the shift and scale are used to alter the counts and errors for the high angle bank.
*None* is the mode for no fit determined scaling or shifting. In this case the *ScaleFactor* and *ShiftFactor* properties must both be provided. With *Both*, fitting is used to establish optimum parameters for both the scaling and shifting of the high angle bank data. *ScaleOnly* mode ties the shift, so *ShiftFactor* must be provided. *ShiftOnly* mode ties the scale so *ScaleFactor* must be provided.
@@ -39,12 +39,12 @@ Usage
print("{:.1f}".format(shift))
Output:
-
+
.. testoutput:: ExSimpleShift
1.0
2.5
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/SANSMask-v1.rst b/docs/source/algorithms/SANSMask-v1.rst
index 1456c2085b483517d815a8814a459d0ab0b16ac7..525dc10e8b464e6bc8d679cedecb47c889e05b06 100644
--- a/docs/source/algorithms/SANSMask-v1.rst
+++ b/docs/source/algorithms/SANSMask-v1.rst
@@ -9,11 +9,11 @@
Description
-----------
-Apply a mask to a SANS detector. This workflow algorithm will apply any mask that was saved
+Apply a mask to a SANS detector. This workflow algorithm will apply any mask that was saved
in the logs by the reduction UI. It can also apply a mask to the edge of the detectors
according to whether we are dealing with EQSANS or a HFIR SANS.
-This algorithm is rarely called directly. It is called by
+This algorithm is rarely called directly. It is called by
:ref:`SANSReduction <algm-SANSReduction>` or :ref:`HFIRSANSReduction <algm-HFIRSANSReduction>`.
.. categories::
diff --git a/docs/source/algorithms/SANSSensitivityCorrection-v1.rst b/docs/source/algorithms/SANSSensitivityCorrection-v1.rst
index 9b9381673ca60278e0260eab212564bc7f6e460f..0939c563048010a6dad13f8ce481b9f1c814dc3c 100644
--- a/docs/source/algorithms/SANSSensitivityCorrection-v1.rst
+++ b/docs/source/algorithms/SANSSensitivityCorrection-v1.rst
@@ -24,40 +24,40 @@ an input workspace.
-The relative detector efficiency is computed using the
+The relative detector efficiency is computed using the
:ref:`CalculateEfficiency <algm-CalculateEfficiency>`
algorithm the following way:
:math:`S(x,y)=\frac{I_{flood}(x,y)}{1/N_{pixels}\sum_{i,j}I_{flood}(i,j)}`
-where :math:`I_{flood}(x,y)` is the pixel count of the flood data in pixel (x,y).
-If a minimum and/or maximum sensitivity is given, the pixels having an efficiency
-outside the given limits are masked and the efficiency is recomputed without using
+where :math:`I_{flood}(x,y)` is the pixel count of the flood data in pixel (x,y).
+If a minimum and/or maximum sensitivity is given, the pixels having an efficiency
+outside the given limits are masked and the efficiency is recomputed without using
those pixels.
-The sample data is then corrected by dividing the intensity in each pixels by
+The sample data is then corrected by dividing the intensity in each pixels by
the efficiency S:
:math:`I'_{sample}(x,y) = \frac{I_{sample}(x,y)}{S(x,y)}`
-The pixels found to have an efficiency outside the given limits are also masked
+The pixels found to have an efficiency outside the given limits are also masked
in the sample data so that they don’t enter any subsequent calculations.
-If the user chose to use a dark current data set when starting the reduction
-process, that dark current data will be subtracted from the flood data. The
+If the user chose to use a dark current data set when starting the reduction
+process, that dark current data will be subtracted from the flood data. The
subtraction is done before the sensitivity is calculated.
-If the user chose to use the solid angle correction for the reduction process,
+If the user chose to use the solid angle correction for the reduction process,
that correction will be applied to the flood data before the sensitivity is calculated.
This algorithm is usually called by
:ref:`SANSReduction <algm-SANSReduction>` or :ref:`HFIRSANSReduction <algm-HFIRSANSReduction>`.
-**Note 1**: The solid angle correction is either not applied at all, or applied to both
+**Note 1**: The solid angle correction is either not applied at all, or applied to both
the flood data to calculate the sensitivity correction and applied to the sample data as part of the reduction process.
**Note 2**: EQSANS has the option to patch masked areas of the detector using the
efficiency calculated for the unmasked portion of each tube. This creates a sensitivity
-file that covers the entire detector. This option can be enabled by using the
-:ref:`ComputeSensitivity <algm-ComputeSensitivity>`
-workflow algorithm to create a sensitivity workspace, which can then be saved and used
+file that covers the entire detector. This option can be enabled by using the
+:ref:`ComputeSensitivity <algm-ComputeSensitivity>`
+workflow algorithm to create a sensitivity workspace, which can then be saved and used
for EQSANS reduction as a pre-calculated sensitivity file.
.. categories::
diff --git a/docs/source/algorithms/SANSSolidAngleCorrection-v1.rst b/docs/source/algorithms/SANSSolidAngleCorrection-v1.rst
index ad5c4cebaa0d801cd7177d1c5584aae8e36ddd2e..1b33eb3c22807df1e0356e4a22192418ff36e254 100644
--- a/docs/source/algorithms/SANSSolidAngleCorrection-v1.rst
+++ b/docs/source/algorithms/SANSSolidAngleCorrection-v1.rst
@@ -20,7 +20,7 @@ The solid angle correction is applied as follows:
:math:`\sigma_{I'(x,y)}=\frac{\sigma_{I(x,y)}}{\vert\cos^3(2\theta)\vert}`
If *DetectorTubes* is set to True, the correction is calculated according to a tube geometry. The cosine term above then becomes:
-
+
:math:`\cos^3(2\theta) \rightarrow \cos^2(2\theta) \cos(\alpha)`
where :math:`\alpha`: is the angle between the sample-to-pixel vector and its projection on the X-Z plane.
diff --git a/docs/source/algorithms/SANSStitch-v1.rst b/docs/source/algorithms/SANSStitch-v1.rst
index 79768bca62a43b6b98d42def1586e5884d57bdcf..e0ef06a99e149699f0706373621c5bc0e8cdf601 100644
--- a/docs/source/algorithms/SANSStitch-v1.rst
+++ b/docs/source/algorithms/SANSStitch-v1.rst
@@ -9,35 +9,35 @@
Description
-----------
-This algorithm is used to stitch together reduced data typically provided by :ref:`algm-Q1D`. Data from high-angle and low-angle banks in a SANS experiment can be stitched together using this algorithm.
+This algorithm is used to stitch together reduced data typically provided by :ref:`algm-Q1D`. Data from high-angle and low-angle banks in a SANS experiment can be stitched together using this algorithm.
Merging of inputs is achieved using the following foruma, where *C* denotes counts, *N* denotes normalization and *f* and *r* relate to forward (high-angle) and rear (low-angle) respectively:
-.. math::
+.. math::
\frac{C_f(Q)+(shift\cdot N_f(Q))+C_r(Q)}{\frac{N_f(Q)}{scale} + N_r(Q)}
Fit Modes
##############
-There are 4 available fit modes used to scale and shift the high angle bank data so that it can be stitched together with the low angle bank data. Where fitting is required :ref:`algm-Fit` is used with a composite function comprised of a *FlatBackground* and *TabulatedFunction*. In all cases the shift and scale are used to alter the counts and errors for the high angle bank.
+There are 4 available fit modes used to scale and shift the high angle bank data so that it can be stitched together with the low angle bank data. Where fitting is required :ref:`algm-Fit` is used with a composite function comprised of a *FlatBackground* and *TabulatedFunction*. In all cases the shift and scale are used to alter the counts and errors for the high angle bank.
*None* is the mode for no fit determined scaling or shifting. In this case the *ScaleFactor* and *ShiftFactor* properties must both be provided. With *Both*, fitting is used to establish optimum parameters for both the scaling and shifting of the high angle bank data. *ScaleOnly* mode ties the shift, so *ShiftFactor* must be provided. *ShiftOnly* mode ties the scale so *ScaleFactor* must be provided.
Can Runs
############
-When can runs are provided they are processed separately using the same merge formula above, and then subtracted from the processed sample run. If can runs are provided as inputs then the scale and shift factors are determined as part of fitting by operating on a workspace calculated from:
+When can runs are provided they are processed separately using the same merge formula above, and then subtracted from the processed sample run. If can runs are provided as inputs then the scale and shift factors are determined as part of fitting by operating on a workspace calculated from:
-.. math::
+.. math::
\frac{C_{sample}(Q)}{N_{sample}(Q)} - \frac{C_{can}(Q)}{N_{can}(Q)}
This is analogous to how :ref:`algm-Q1D` operates on input workspaces.
-Merging of front and rear banks for the can is achieved using a different form from that above.
+Merging of front and rear banks for the can is achieved using a different form from that above.
-.. math::
+.. math::
\frac{C_f(Q)+C_r(Q)}{\frac{N_f(Q)}{scale} + N_r(Q)}
@@ -60,29 +60,29 @@ Usage
hab_norm = CreateWorkspace(DataX=range(4,10), DataY=[1]*5, UnitX='MomentumTransfer')
lab_counts = CreateWorkspace(DataX=range(0,6), DataY=[6]*5, UnitX='MomentumTransfer')
lab_norm = CreateWorkspace(DataX=range(0,6), DataY=[1]*5, UnitX='MomentumTransfer')
-
+
uniform_binning = [0, 1, 10]
hab_counts = Rebin(hab_counts, Params=uniform_binning)
hab_norm = Rebin(hab_norm, Params=uniform_binning)
lab_counts = Rebin(lab_counts, Params=uniform_binning)
lab_norm = Rebin(lab_norm, Params=uniform_binning)
- stitched, scale, shift = SANSStitch(HABCountsSample=hab_counts,
- HABNormSample=hab_norm,
- LABCountsSample=lab_counts,
- LABNormSample=lab_norm,
+ stitched, scale, shift = SANSStitch(HABCountsSample=hab_counts,
+ HABNormSample=hab_norm,
+ LABCountsSample=lab_counts,
+ LABNormSample=lab_norm,
Mode='ShiftOnly', ScaleFactor=1.0 )
print("{:.1f}".format(scale))
print("{:.1f}".format(shift))
Output:
-
+
.. testoutput:: ExSimpleShift
1.0
6.0
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/SCDCalibratePanels-v1.rst b/docs/source/algorithms/SCDCalibratePanels-v1.rst
index 2bb553c5b6afc493d395fe87efe0158cabe9fb10..5a26069f8ceb1e9ada25f0c7132f3decfa059eca 100644
--- a/docs/source/algorithms/SCDCalibratePanels-v1.rst
+++ b/docs/source/algorithms/SCDCalibratePanels-v1.rst
@@ -9,10 +9,10 @@
Description
-----------
-This algorithm calibrates panels of Rectangular Detectors
+This algorithm calibrates panels of Rectangular Detectors
or packs of tubes in an instrument. The initial path,
panel centers and orientations are adjusted so the error in Q
-positions from the theoretical Q positions is minimized.
+positions from the theoretical Q positions is minimized.
Given a set of peaks indexed by :math:`(h_i, k_i, l_i)`, we
modify the instrument parameters, p, and then find Q in the sample frame,
:math:`\rm Q_{sample}` that mininizes the following:
@@ -28,10 +28,10 @@ modify the instrument parameters, p, and then find Q in the sample frame,
\right) - \rm Q_{sample,i}(p) \right\vert ^2
NINT is the nearest integer function.
-B is fixed from the input lattice parameters, but U is modified by :ref:`CalculateUMatrix <algm-CalculateUMatrix>`
+B is fixed from the input lattice parameters, but U is modified by :ref:`CalculateUMatrix <algm-CalculateUMatrix>`
for all peaks before and after optimization.
-When the peaks are indexed, sample offsets are adjusted to better index the peaks.
-The initial time-of-flight, T0, is optimized for all peaks before any parameters are optimized.
+When the peaks are indexed, sample offsets are adjusted to better index the peaks.
+The initial time-of-flight, T0, is optimized for all peaks before any parameters are optimized.
The initial path, L1, is optimized for all peaks before and after all panels or packs' parameters are optimized.
The panels and packs' parameters are optimized in parallel.
An option is available to adjust the panel widths and heights for Rectangular Detectors in a second iteration with all the other parameters fixed.
@@ -96,7 +96,7 @@ Usage
DeleteWorkspace('peaks')
DeleteWorkspace('MANDI_801_event_xml')
DeleteWorkspace('MANDI_801_event_DetCal')
- import os,mantid
+ import os,mantid
filename=mantid.config.getString("defaultsave.directory")+"mandi_801.xml"
os.remove(filename)
filename=mantid.config.getString("defaultsave.directory")+"mandi_801.DetCal"
diff --git a/docs/source/algorithms/SCDCalibratePanels-v2.rst b/docs/source/algorithms/SCDCalibratePanels-v2.rst
index 8f71e641b73b5a7d33c5db578ce6ebc5bcb5d034..224125ccaa5b89cd77f8b943da46235a6ed4ac56 100644
--- a/docs/source/algorithms/SCDCalibratePanels-v2.rst
+++ b/docs/source/algorithms/SCDCalibratePanels-v2.rst
@@ -11,7 +11,7 @@ Description
This calibration algorithm is develped for CORELLI type instrument (pack of tubes).
The calibration targets includes `L_1` (source to sample distance in meters), panel
-position (in meters) and orientation (as angle-axis pairs, in degrees), as well as
+position (in meters) and orientation (as angle-axis pairs, in degrees), as well as
initial TOF offset (not fully implemented yet).
The underlining mechanism of this calibration is to match the measured Q vectors
(`Q_{sample}`) with the those generated from tweaked instrument position and orientation,
@@ -50,12 +50,12 @@ Usage
# generate synthetic testing data
def convert(dictionary):
return namedtuple('GenericDict', dictionary.keys())(**dictionary)
-
+
# lattice constant for Si
# data from Mantid web documentation
lc_silicon = {
- "a": 5.431, # A
- "b": 5.431, # A
+ "a": 5.431, # A
+ "b": 5.431, # A
"c": 5.431, # A
"alpha": 90, # deg
"beta": 90, # deg
diff --git a/docs/source/algorithms/SassenaFFT-v1.rst b/docs/source/algorithms/SassenaFFT-v1.rst
index bfecdf0357b5c9c922c6c9056253912b473263aa..a1720b4c7c1b0ac73471148a15d8c667cc098aa0 100644
--- a/docs/source/algorithms/SassenaFFT-v1.rst
+++ b/docs/source/algorithms/SassenaFFT-v1.rst
@@ -79,7 +79,7 @@ Usage
center = 0.0
sigma = 0.01 #in meV
startX = -0.1 #in meV
- endX = 0.1
+ endX = 0.1
myFunc = 'name=Gaussian,Height={0},PeakCentre={1},Sigma={2}'.format(intensity,center,sigma)
# Call the Fit algorithm and perform the fit
diff --git a/docs/source/algorithms/SaveBankScatteringAngles-v1.rst b/docs/source/algorithms/SaveBankScatteringAngles-v1.rst
index 718d72c8c8f61a286d688a8ae33132008cdf50b0..289e99a45042e9fdb9754159db5a4947cab06dec 100644
--- a/docs/source/algorithms/SaveBankScatteringAngles-v1.rst
+++ b/docs/source/algorithms/SaveBankScatteringAngles-v1.rst
@@ -48,9 +48,9 @@ Usage
.. testcleanup:: SaveBankScatteringAngles
os.remove(output_file)
-
+
Output:
-
+
.. testoutput:: SaveBankScatteringAngles
File contents:
diff --git a/docs/source/algorithms/SaveFullprofResolution-v1.rst b/docs/source/algorithms/SaveFullprofResolution-v1.rst
index 5f4203d5af4dd7954abaa2b018120edf134764a1..785b4086d6ab98a13a53b7aa8660831853721da5 100644
--- a/docs/source/algorithms/SaveFullprofResolution-v1.rst
+++ b/docs/source/algorithms/SaveFullprofResolution-v1.rst
@@ -66,16 +66,16 @@ Usage
.. testcode:: ExSaveIrf
import os
-
+
wsname = 'PG3Bank1Table'
-
+
LoadFullprofResolution(Filename=r'PG3_Bank1.irf',OutputTableWorkspace=wsname)
-
+
targetdir = config['default.savedirectory']
if targetdir == "":
targetdir = config['defaultsave.directory']
savefile = os.path.join(targetdir, 'test.irf')
-
+
SaveFullprofResolution(InputWorkspace=wsname, OutputFilename=savefile, Bank=1, ProfileFunction='Jason Hodge\'s function (profile 10)')
.. testcleanup:: ExSaveIrf
diff --git a/docs/source/algorithms/SaveGSSCW-v1.rst b/docs/source/algorithms/SaveGSSCW-v1.rst
index db238702881fb737701ca19ad2779d7b007d5ea3..d77f892d2aa1cff0dd142630693c89b7431c2d42 100644
--- a/docs/source/algorithms/SaveGSSCW-v1.rst
+++ b/docs/source/algorithms/SaveGSSCW-v1.rst
@@ -15,7 +15,7 @@ Saves a constant wavelength diffraction pattern in units Degrees to
FXYE GSAS format.
From the GSAS manual a description of the format options:
-If TYPE is 'FXY' or 'FXYE' then the data records give the position,
+If TYPE is 'FXY' or 'FXYE' then the data records give the position,
intensity and in the case of 'FXYE' the esd in the intensity with one set per record and in free format.
The values may also be in scientific form. The position is either in centidegrees for CW data
or microseconds for TOF data. Each record must be padded out to 80 characters and end with CR/LF.
diff --git a/docs/source/algorithms/SaveISISNexus-v1.rst b/docs/source/algorithms/SaveISISNexus-v1.rst
index 0454c04852281dda1ed8aee460c63c29d99ea95e..b7d8e94784cb231853a8590898eb583cc17ae9f7 100644
--- a/docs/source/algorithms/SaveISISNexus-v1.rst
+++ b/docs/source/algorithms/SaveISISNexus-v1.rst
@@ -30,7 +30,7 @@ Usage
.. testcleanup::
os.remove(filePath)
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/SaveMDWorkspaceToVTK-v1.rst b/docs/source/algorithms/SaveMDWorkspaceToVTK-v1.rst
index b07bd15fd44f00c2d4bb748d74a8a3af9fab7caf..3fc063d8b1a5f7bd1a46dc99ca1a86539e9c74cc 100644
--- a/docs/source/algorithms/SaveMDWorkspaceToVTK-v1.rst
+++ b/docs/source/algorithms/SaveMDWorkspaceToVTK-v1.rst
@@ -10,7 +10,7 @@ Description
-----------
The algorithm SaveMDWorkspaceToVTK will write an IMDHistoWorkspace or IMDEventWorkspace
to either a .vts or .vtu file, respectively.This file can be directly loaded into a
-standalone ParaView application.
+standalone ParaView application.
To make use of all stored out features, such as axes annotations, it is required to load
the NonOrthogonalSource plugin. To set this plugin navigate to Tools > Manage Plugins and
@@ -23,17 +23,17 @@ Usage
-----
.. code-block:: python
-
+
import os
signalInput = [i for i in range(1,28)]
errorInput = [1 for i in range(1,28)]
-
+
ws = CreateMDHistoWorkspace(SignalInput=signalInput, ErrorInput=errorInput, Dimensionality='3',
Extents='-1,1,-1,1,-1,1', NumberOfBins='3,3,3', Names='A,B,C', Units='U,T,W')
-
+
ws2 = CreateMDHistoWorkspace(SignalInput='1,2,3,4,5,6,7,8,9', ErrorInput='1,1,1,1,1,1,1,1,1', Dimensionality='2',
- Extents='-1,1,-1,1', NumberOfBins='3,3', Names='A,B', Units='U,T')
-
+ Extents='-1,1,-1,1', NumberOfBins='3,3', Names='A,B', Units='U,T')
+
savefile = os.path.join(config["defaultsave.directory"], "mdhws.vts")
SaveMDWorkspaceToVTK(InputWorkspace = ws, Filename = savefile)
diff --git a/docs/source/algorithms/SaveMask-v1.rst b/docs/source/algorithms/SaveMask-v1.rst
index 8dcb04c173361cb635d7a56942c43be6c2ff941d..1b267d143f3262dd8be08db899f345443beea5c2 100644
--- a/docs/source/algorithms/SaveMask-v1.rst
+++ b/docs/source/algorithms/SaveMask-v1.rst
@@ -33,7 +33,7 @@ Definition of Mask
------------------
If a pixel is **masked**, it means that the data from this pixel won't be used.
-In the masking workspace (i.e., `SpecialWorkspace2D <http://www.mantidproject.org/SpecialWorkspace2D>`__), the corresponding value is 1.
+In the masking workspace (i.e., `SpecialWorkspace2D <http://www.mantidproject.org/SpecialWorkspace2D>`__), the corresponding value is 1.
If a pixel is **NOT masked**, it means that the data from this pixel will be used. ``
In the masking workspace (i.e., `SpecialWorkspace2D <http://www.mantidproject.org/SpecialWorkspace2D>`__), the corresponding value is 0.
diff --git a/docs/source/algorithms/SaveNXSPE-v1.rst b/docs/source/algorithms/SaveNXSPE-v1.rst
index d338239e7bb42f04789ac8a456ea5529ee248ef6..df348d13d5d84c31cd049a3d333f596982234a5e 100644
--- a/docs/source/algorithms/SaveNXSPE-v1.rst
+++ b/docs/source/algorithms/SaveNXSPE-v1.rst
@@ -34,18 +34,18 @@ Usage
import os
import numpy
-
+
# Create dummy workspace.
out_ws = CreateSimulationWorkspace(Instrument="IRIS", BinParams="0,500,2000")
out_ws.setY(0, numpy.array([10.0, 50.0, 30.0, 60.0]))
AddSampleLog(out_ws, 'Ei', LogText='321', LogType='Number', NumberType='Double')
out_ws.setDistribution(True)
-
+
file_path = os.path.join(config["defaultsave.directory"], "NXSPEData.nxspe")
-
+
# Do a "roundtrip" of the data.
SaveNXSPE(out_ws, file_path,Psi=32)
-
+
# By desigghn, SaveMXSPE does not store detector's ID-s. LoadNXSPE sets detector's ID-s to defaults.
# To compare loaded and saved workspaces here, one needs to set-up default detector's ID-s to the source workspace.
nSpec = out_ws.getNumberHistograms()
@@ -53,13 +53,13 @@ Usage
sp=out_ws.getSpectrum(i);
sp.setDetectorID(i+1);
in_ws = LoadNXSPE(file_path)
-
+
ws_comparison_rez = CompareWorkspaces(out_ws,in_ws,1.e-9,CheckInstrument=False)
print("Contents of the first spectrum = {}.".format(in_ws.readY(0)))
print("Initial and loaded workspaces comparison is: {}".format(str(ws_comparison_rez[0])))
run = in_ws.getRun();
print("Loaded workspace has attached incident energy Ei={0:.1f} and rotation angle Psi= {1:.1f}deg".format(run.getLogData('Ei').value,run.getLogData('psi').value))
-
+
.. testcleanup:: ExSimpleSavingRoundtrip
@@ -72,7 +72,7 @@ Output:
Contents of the first spectrum = [ 10. 50. 30. 60.].
Initial and loaded workspaces comparison is: True
Loaded workspace has attached incident energy Ei=321.0 and rotation angle Psi= 32.0deg
-
+
Note that :ref:`algm-LoadNXSPE` automatically applies the `distribution` flag to the loaded workspace.
This is because all examples of workspaces saved to `NXSPE` format by the reduction algorithms
are distributions (signal is count rate and should be multiplied by bin widths to get counts).
diff --git a/docs/source/algorithms/SaveNXcanSAS-v1.rst b/docs/source/algorithms/SaveNXcanSAS-v1.rst
index dfe380ec230ebacdc7c6c94ef373a3edbdbd5d02..81446658f0e9b895233cac385b4de3d1ceae2490 100644
--- a/docs/source/algorithms/SaveNXcanSAS-v1.rst
+++ b/docs/source/algorithms/SaveNXcanSAS-v1.rst
@@ -22,19 +22,19 @@ Usage
.. testcode:: SaveNXcanSAS
import os
-
+
# Create a example workspace with units of momentum transfer
ws = CreateSampleWorkspace("Histogram",NumBanks=1,BankPixelWidth=1)
ws = ConvertUnits(ws,Target="MomentumTransfer")
LoadInstrument(ws,False,InstrumentName="SANS2D")
-
- # Save the file
+
+ # Save the file
file_name = "test_file_for_nxcansas"
SaveNXcanSAS(ws,file_name)
-
+
# Load the file back
ws_loaded = LoadNXcanSAS(file_name)
-
+
#remove the file we created
alg = ws_loaded.getHistory().lastAlgorithm()
filePath = alg.getPropertyValue("Filename")
diff --git a/docs/source/algorithms/SaveNexusGeometry-v1.rst b/docs/source/algorithms/SaveNexusGeometry-v1.rst
index 7dcf7163c49cd9ef56ea9c4dbe57a533589dbbd6..cb4fc93cdd5133a7791ebc6c131179919d5082c8 100644
--- a/docs/source/algorithms/SaveNexusGeometry-v1.rst
+++ b/docs/source/algorithms/SaveNexusGeometry-v1.rst
@@ -41,7 +41,7 @@ Usage
Output:
.. testoutput:: SaveNexusGeometryExampleDefault
-
+
True
.. testcleanup:: SaveNexusGeometryExampleDefault
diff --git a/docs/source/algorithms/SaveNexusProcessed-v1.rst b/docs/source/algorithms/SaveNexusProcessed-v1.rst
index 9c3bfca6e020f1d037d7c42625583d9ed42ef850..aa02cf9ab7d5ca5beb3a7bb1c495b4b460c25a7a 100644
--- a/docs/source/algorithms/SaveNexusProcessed-v1.rst
+++ b/docs/source/algorithms/SaveNexusProcessed-v1.rst
@@ -131,7 +131,7 @@ Output:
ws = Load(path)
print("Saved workspace has {} spectra".format(ws.getNumberHistograms()))
-
+
Output:
.. testoutput:: ExSaveNexusProcessedEvent
diff --git a/docs/source/algorithms/SaveP2D-v1.rst b/docs/source/algorithms/SaveP2D-v1.rst
index 7cfdeab773d9682df145323467ff851ff9e06236..96ccae05330867bb8745d4b7bc52a2245f834f31 100644
--- a/docs/source/algorithms/SaveP2D-v1.rst
+++ b/docs/source/algorithms/SaveP2D-v1.rst
@@ -12,21 +12,21 @@ Description
Input
#####
-This algorithm can be used to create a powder pattern 2d (".p2d") output file as useable for
-multidimensional Rietveld refinements.
-The input for this algorithm needs to be a 2D workspace containing information about dSpacing and
+This algorithm can be used to create a powder pattern 2d (".p2d") output file as useable for
+multidimensional Rietveld refinements.
+The input for this algorithm needs to be a 2D workspace containing information about dSpacing and
dSpacingPerpendicular. A 2D workspace can be created using the :ref:`Bin2DPowderDiffraction
-<algm-Bin2DPowderDiffraction>` algorithm.
-The input values ``removeNaN`` and ``removeNegatives`` control whether intensity values that are negative
-or NaN, respectively, are automatically removed from the dataset.
+<algm-Bin2DPowderDiffraction>` algorithm.
+The input values ``removeNaN`` and ``removeNegatives`` control whether intensity values that are negative
+or NaN, respectively, are automatically removed from the dataset.
``RemoveNegatives`` also removes intensities equal to zero.
-Turning ``cutDdata`` on, allows to cut the measuring data to the specified ranges of
-theta, lambda, dSpacing and dSpacingPerpendicular.
+Turning ``cutDdata`` on, allows to cut the measuring data to the specified ranges of
+theta, lambda, dSpacing and dSpacingPerpendicular.
Output
######
-The output file contains a short comment header giving the title, the instrument parameter file,
+The output file contains a short comment header giving the title, the instrument parameter file,
the binning parameters of the workspace and the used instrument/detector bank.
Thereafter the measuring data is written into 5 columns, namely, 2theta, lambda, dSpacing,
dSpacingPerpendicular and intensity.
@@ -64,7 +64,7 @@ Usage
file_name = "Usage_Example"
path = os.path.join(os.path.expanduser("~"), file_name)
- # Create a .p2d file containing the testdata
+ # Create a .p2d file containing the testdata
SaveP2D(Workspace = "Usage_Example", OutputFile = path, RemoveNaN = False, RemoveNegatives = False, CutData = False)
# Does the file exist? If it exists, print it!
diff --git a/docs/source/algorithms/SavePAR-v1.rst b/docs/source/algorithms/SavePAR-v1.rst
index e6ff5e91f86a297e1f18c6dc418b2e0e2c133123..e3d0e76777a3020b7fbef30f2be78cc3a8cd7616 100644
--- a/docs/source/algorithms/SavePAR-v1.rst
+++ b/docs/source/algorithms/SavePAR-v1.rst
@@ -62,7 +62,7 @@ Usage
DeleteWorkspace("ws")
os.remove(file_name)
-
+
**Output:**
.. testoutput:: exSavePAR
diff --git a/docs/source/algorithms/SavePHX-v1.rst b/docs/source/algorithms/SavePHX-v1.rst
index b362dca83bd3568d29b5327e1d58d84cbf1f94f3..9733a635f0f1b6591a284e1583e99746de284a7a 100644
--- a/docs/source/algorithms/SavePHX-v1.rst
+++ b/docs/source/algorithms/SavePHX-v1.rst
@@ -68,7 +68,7 @@ Usage
DeleteWorkspace("ws")
os.remove(file_name)
-
+
**Output:**
.. testoutput:: exSavePHX
diff --git a/docs/source/algorithms/SaveSESANS-v1.rst b/docs/source/algorithms/SaveSESANS-v1.rst
index 96b4819c112d9dfa4c73a25d8e77e546440450cf..65d64b08c8b481dba64c915bf4f8ec8bccb20545 100644
--- a/docs/source/algorithms/SaveSESANS-v1.rst
+++ b/docs/source/algorithms/SaveSESANS-v1.rst
@@ -21,24 +21,24 @@ Usage
.. testcode:: LoadSESANSRoundTrip
import os
-
+
# Create dummy workspace
dataX = [1,2,3,4,5]
dataY = [6,1,9,14]
dataE = [1,1,4,5]
out_ws = CreateWorkspace(dataX, dataY, dataE)
out_ws.setTitle("Dummy workspace")
-
+
file_path = os.path.join(config["defaultsave.directory"], "example.ses")
-
+
# Do a 'roundtrip' of the data
SaveSESANS(InputWorkspace=out_ws, Filename=file_path, ThetaZMax=1,ThetaYMax=1, EchoConstant=1, Sample="Sample")
LoadSESANS(Filename=file_path, OutputWorkspace="in_ws")
-
+
# Retrieve loaded workspace from ADS
in_ws = mtd["in_ws"]
print("Y values of loaded workspace = " + str(in_ws.readY(0)))
-
+
.. testcleanup:: LoadSESANSRoundTrip
os.remove(file_path)
@@ -51,4 +51,4 @@ Output:
.. categories::
-.. sourcelink::
+.. sourcelink::
diff --git a/docs/source/algorithms/SaveSampleEnvironmentAndShape-v1.rst b/docs/source/algorithms/SaveSampleEnvironmentAndShape-v1.rst
index 5675a237888ff5e6e3bcdd725b5a91bcf00beaf6..de37708a9e7a84979c20f39b5453013ee37be414 100644
--- a/docs/source/algorithms/SaveSampleEnvironmentAndShape-v1.rst
+++ b/docs/source/algorithms/SaveSampleEnvironmentAndShape-v1.rst
@@ -9,13 +9,13 @@
Description
-----------
-Saves out the sample and environment on a workspace as a binary .stl file, the sample shape and environment must have been set using :ref:`LoadSampleShape <algm-LoadSampleShape>` and :ref:`LoadSampleEnvironment <algm-LoadSampleEnvironment>`, as this algorithm only supports shapes stored as a mesh.
+Saves out the sample and environment on a workspace as a binary .stl file, the sample shape and environment must have been set using :ref:`LoadSampleShape <algm-LoadSampleShape>` and :ref:`LoadSampleEnvironment <algm-LoadSampleEnvironment>`, as this algorithm only supports shapes stored as a mesh.
The output is of the following type:
* ``*.stl`` stereolithography `https://en.wikipedia.org/wiki/STL_(file_format) <https://en.wikipedia.org/wiki/STL_(file_format)>`_
This is a file format consisting of a list of faces specified by their vertex coordinates.
- The file will be in Binary format, the Header will contain information about when the file was created, and the normals and attribute code are unset.
+ The file will be in Binary format, the Header will contain information about when the file was created, and the normals and attribute code are unset.
The vertices are in the standard order (counter clockwise when viewed from the outside).
* ``.3mf`` https://3mf.io This is a 3D printing format that allows multiple objects to be stored in a single file, each with a representation similar to the .stl format ie a list of faces and vertices
diff --git a/docs/source/algorithms/SaveVulcanGSS-v1.rst b/docs/source/algorithms/SaveVulcanGSS-v1.rst
index db8f998453dab9c762a0742e56e96eead3a661ae..d6662bb48210c0b7cece6ee23df5676ce6fc5cad 100644
--- a/docs/source/algorithms/SaveVulcanGSS-v1.rst
+++ b/docs/source/algorithms/SaveVulcanGSS-v1.rst
@@ -9,11 +9,11 @@
Description
-----------
-This workflow algorithm is to export a MatrixWorkspace to a GSAS data file,
-which is close enough to the GSAS file generated from VULCAN's V-drive.
+This workflow algorithm is to export a MatrixWorkspace to a GSAS data file,
+which is close enough to the GSAS file generated from VULCAN's V-drive.
-V-drive uses a different bin other than Mantid does.
-Besides, IDL's rebin algorithm is different from Mantid's.
+V-drive uses a different bin other than Mantid does.
+Besides, IDL's rebin algorithm is different from Mantid's.
Usage
@@ -24,15 +24,15 @@ Usage
.. testcode:: ExSaveVulcanGSAS
import os
-
+
# load data and create header
dataws = Load(Filename="focussed.nxs")
dataws.setTitle("Test")
dataws = ConvertUnits(InputWorkspace=dataws, Target="TOF", EMode="Elastic", AlignBins=False)
-
+
file_name = "testvulcan.gda"
path = os.path.join(os.path.expanduser("~"), file_name)
-
+
# create binning table
ref_bin_table = CreateEmptyTableWorkspace(OutputWorkspace='ref_bin_table')
ref_bin_table.addColumn('str', 'indexes')
@@ -40,9 +40,9 @@ Usage
ref_bin_table.addRow(['0, 2, 4', '1000, -0.001, 20000'])
ref_bin_table.addRow(['1, 3, 5', '2000, -0.002, 30000'])
-
+
gsaws = SaveVulcanGSS(InputWorkspace=dataws, BinningTable="ref_bin_table", GSSFilename=path, IPTS=1234, GSSParmFileName="mock.prm")
-
+
gfile = open(path, "r")
lines = gfile.readlines()
gfile.close()
@@ -51,15 +51,15 @@ Usage
for i in range(15):
print(lines[i].rstrip())
print("... ...")
-
+
.. testcleanup:: ExSaveVulcanGSAS
file_name = "testvulcan.gda"
path = os.path.join(os.path.expanduser("~"), file_name)
os.remove(path)
- DeleteWorkspace(Workspace="dataws")
- DeleteWorkspace(Workspace="gsaws")
+ DeleteWorkspace(Workspace="dataws")
+ DeleteWorkspace(Workspace="gsaws")
Output:
diff --git a/docs/source/algorithms/SaveZODS-v1.rst b/docs/source/algorithms/SaveZODS-v1.rst
index 7e884fdc92d2a6aae376d338571c5817523508b7..b3d57e15949c3da997cf7aafa06156333c3f8086 100644
--- a/docs/source/algorithms/SaveZODS-v1.rst
+++ b/docs/source/algorithms/SaveZODS-v1.rst
@@ -81,7 +81,7 @@ using :ref:`CreateMDWorkspace <algm-CreateMDWorkspace>`.
.. testcode:: SaveZODSEx
- ws = CreateMDHistoWorkspace(SignalInput='1,2,3,4,5,6,7,8', ErrorInput='1,1,1,1,1,1,1,1',
+ ws = CreateMDHistoWorkspace(SignalInput='1,2,3,4,5,6,7,8', ErrorInput='1,1,1,1,1,1,1,1',
Dimensionality='3', Extents='-2, 2, -2, 2, -2, 2', Names=['[H,0,0]','[0,K,0]','[0,0,L]'],
NumberOfBins='2,2,2', Units='lattice,lattice,lattice')
import os
@@ -93,7 +93,7 @@ Output:
.. testoutput:: SaveZODSEx
- File created: True
+ File created: True
.. testcleanup:: SaveZODSEx
diff --git a/docs/source/algorithms/SetCrystalLocation-v1.rst b/docs/source/algorithms/SetCrystalLocation-v1.rst
index 114fb8d9e3297278a3e242ce56eaf29bd0867a1b..73740b77b81961d09ba08f8647a8a52aaad78659 100644
--- a/docs/source/algorithms/SetCrystalLocation-v1.rst
+++ b/docs/source/algorithms/SetCrystalLocation-v1.rst
@@ -9,7 +9,7 @@
Description
-----------
-This algorithm changes the sample location for an events workspace. If the InputWorkspace and OutputWorkspace are the same, the position is simply changed. If the InputWorkspace and OutputWorkspace are different, the InputWorkspace is cloned then the clone's position is changed. The former is faster, especially for large workspaces.
+This algorithm changes the sample location for an events workspace. If the InputWorkspace and OutputWorkspace are the same, the position is simply changed. If the InputWorkspace and OutputWorkspace are different, the InputWorkspace is cloned then the clone's position is changed. The former is faster, especially for large workspaces.
Usage
-----
diff --git a/docs/source/algorithms/SetDetScale-v1.rst b/docs/source/algorithms/SetDetScale-v1.rst
index 466cf165cef160a6cc78160ca354b83530b1f443..e7eb5372652717dfc1400468c4e73c8d2ae0e276 100644
--- a/docs/source/algorithms/SetDetScale-v1.rst
+++ b/docs/source/algorithms/SetDetScale-v1.rst
@@ -14,9 +14,9 @@ algorithm will set or change the detector bank scales that are used in
SaveHKL and AnvredCorrection. The input format is the same as
used in anvred3.py, so DetScaleList input can be pasted from
the definition of detScale there. Alternately, there is an option, DetScaleFile, to
-read a text file with each line containing the detector number and scale factor for that detector.
+read a text file with each line containing the detector number and scale factor for that detector.
If scales for a detector are given in both the DetScaleList text string and DetScaleFile,
-the values from the text string will be used. The default values can be
+the values from the text string will be used. The default values can be
set in the instrument parameter file.
Usage
diff --git a/docs/source/algorithms/SetGoniometer-v1.rst b/docs/source/algorithms/SetGoniometer-v1.rst
index bbe4f517fdaf2cc7bfbc11a554a3fb09fa8d2db9..814589a6c6e2c22c67603ddfe029449c9f151b7f 100644
--- a/docs/source/algorithms/SetGoniometer-v1.rst
+++ b/docs/source/algorithms/SetGoniometer-v1.rst
@@ -56,7 +56,7 @@ Usage
print("Log values: {}".format(wg.getRun().keys()))
print("Goniometer angles: {}".format(wg.getRun().getGoniometer().getEulerAngles('YZY')))
print("Clearing goniometer up")
- SetGoniometer(wg)
+ SetGoniometer(wg)
print("Goniometer angles: {}".format(wg.getRun().getGoniometer().getEulerAngles('YZY') ))
.. testcleanup:: SetGoniometer
@@ -71,7 +71,7 @@ Output:
Goniometer angles: [50,0,0]
Clearing goniometer up
Goniometer angles: [0,0,0]
-
+
**Example - multiple goniometers - omega scan**
.. testcode:: OmegaScanExample
diff --git a/docs/source/algorithms/SetSampleMaterial-v1.rst b/docs/source/algorithms/SetSampleMaterial-v1.rst
index 7dddeb7af0c40d7ca212721013404068a5a684fb..14a386d83376a24199c507712673f4cb58671013 100644
--- a/docs/source/algorithms/SetSampleMaterial-v1.rst
+++ b/docs/source/algorithms/SetSampleMaterial-v1.rst
@@ -9,12 +9,12 @@
Description
-----------
-Sets the neutrons information in the sample. You can either enter details
-about the chemical formula or atomic number, or you can provide specific
-values for the attenuation and scattering cross sections and the sample number
-density. If you provide a chemical formula or atomic number, the cross
-sections will be calculated from a database. If you decide to provide specific
-cross sections, they will override the tabulated ones. For details of how the
+Sets the neutrons information in the sample. You can either enter details
+about the chemical formula or atomic number, or you can provide specific
+values for the attenuation and scattering cross sections and the sample number
+density. If you provide a chemical formula or atomic number, the cross
+sections will be calculated from a database. If you decide to provide specific
+cross sections, they will override the tabulated ones. For details of how the
various quantities are calculated, refer to the :ref:`Materials` concept page.
.. note:: It is recommended that you use :ref:`SetSample <algm-SetSample>` instead.
diff --git a/docs/source/algorithms/ShowPeakHKLOffsets-v1.rst b/docs/source/algorithms/ShowPeakHKLOffsets-v1.rst
index e22d8273d34c75a53aa3c0016aa07e7d673cfde4..b2cc8379bb6c7b033fbbe6f6167fc5bac9371490 100644
--- a/docs/source/algorithms/ShowPeakHKLOffsets-v1.rst
+++ b/docs/source/algorithms/ShowPeakHKLOffsets-v1.rst
@@ -27,7 +27,7 @@ Usage
.. testcode:: ExShowHKLOffsetsSimple
#
- # Load Peaks found in SXD23767.raw
+ # Load Peaks found in SXD23767.raw
#
Load(Filename='SXD23767.peaks',OutputWorkspace='peaks_qLab')
@@ -35,7 +35,7 @@ Usage
ublist = [-0.06452276, 0.2478114, -0.23742194, 0.29161678, -0.00914316, -0.12523779, 0.06958942, -0.1802702, -0.14649001]
SetUB('peaks_qLab',UB=ublist)
- # Run Algorithm
+ # Run Algorithm
table = ShowPeakHKLOffsets('peaks_qLab')
#Print part of first four rows
diff --git a/docs/source/algorithms/SignalOverError-v1.rst b/docs/source/algorithms/SignalOverError-v1.rst
index 2f8836135297394fa2b7fc1c6045a36a40f4e408..04474599fe05ecc07cfc5126380bf72fcfe4a239 100644
--- a/docs/source/algorithms/SignalOverError-v1.rst
+++ b/docs/source/algorithms/SignalOverError-v1.rst
@@ -19,7 +19,7 @@ Usage
**Example: Taking the derivative of logs**
.. testcode:: AddLogDerivative
-
+
ws = CreateSampleWorkspace("Event")
wsOut = SignalOverError(ws)
diff --git a/docs/source/algorithms/SliceMD-v1.rst b/docs/source/algorithms/SliceMD-v1.rst
index 7f656d8f2de1922c4637191d33a2e5f7bfdb5f7d..e619662b3d60c65f18a7174c9b221b34986a5f2c 100644
--- a/docs/source/algorithms/SliceMD-v1.rst
+++ b/docs/source/algorithms/SliceMD-v1.rst
@@ -45,9 +45,9 @@ For 1D slices, it may make sense to specify a SplitInto parameter of 1
in every other dimension - that way, boxes will only be split along the
1D direction.
-To force the box structure to match that defined in OutputBins, the
-MaxRecursionDepth property can be set to 1. If this is not the case then
-boxes will split further if sufficient events fall in the same box. Further
+To force the box structure to match that defined in OutputBins, the
+MaxRecursionDepth property can be set to 1. If this is not the case then
+boxes will split further if sufficient events fall in the same box. Further
splitting uses the value of "SplitInto" from the InputWorkspace.
Slicing a MDHistoWorkspace
@@ -106,7 +106,7 @@ Output:
# Create a host workspace
mdew = CreateMDWorkspace(Dimensions=2, Extents=[-10,10,-10,10], Names='A, B', Units='U, U')
# Add a peak at -5,-5
- FakeMDEventData(mdew, PeakParams=[100000, -5, -5, 1])
+ FakeMDEventData(mdew, PeakParams=[100000, -5, -5, 1])
# Add a peak at 5, 5
FakeMDEventData(mdew, PeakParams=[100000, 5, 5, 1])
# Slice at 45 degrees. BasisVector0 now runs through both peaks
diff --git a/docs/source/algorithms/SliceMDHisto-v1.rst b/docs/source/algorithms/SliceMDHisto-v1.rst
index aaafa5507b146e263f847ebcc4a5ed524c3a98d9..8cf8828b0972dce9d7e0f12afc1873098563eb21 100644
--- a/docs/source/algorithms/SliceMDHisto-v1.rst
+++ b/docs/source/algorithms/SliceMDHisto-v1.rst
@@ -9,14 +9,14 @@
Description
-----------
-SliceMDHisto extracts a hyperslab of data from a :ref:`MDHistoWorkspace <MDHistoWorkspace>`. Beyond
+SliceMDHisto extracts a hyperslab of data from a :ref:`MDHistoWorkspace <MDHistoWorkspace>`. Beyond
the usual input and output workspace parameters, the start and end of the
-hyperslabs dimensions are required. Both as comma separated lists with an
-entry for each dimension of the MDHistoWorkspace.
+hyperslabs dimensions are required. Both as comma separated lists with an
+entry for each dimension of the MDHistoWorkspace.
-Example: consider an input MDHistoWorkspace with dimensions 100,100,100.
-Running SliceMDHisto with parameters Start= 20,20,20 and End= 50,50,100
-will copy all the data between x: 20-50, y: 20-50, z:20-100 into the
+Example: consider an input MDHistoWorkspace with dimensions 100,100,100.
+Running SliceMDHisto with parameters Start= 20,20,20 and End= 50,50,100
+will copy all the data between x: 20-50, y: 20-50, z:20-100 into the
result MDHistoWorkspace with dimensions 30,30,80.
For a more up-to-date way of performing slices on a :ref:`MDHistoWorkspace <MDHistoWorkspace>` this see :ref:`algm-IntegrateMDHistoWorkspace`
@@ -37,7 +37,7 @@ Usage
dim.name, dim.getNBins(), dim.getMinimum(), dim.getMaximum()))
#create a test MD event workspace
- mdew = CreateMDWorkspace(Dimensions=3, Extents=[-1,1,-5,5,-9,10],
+ mdew = CreateMDWorkspace(Dimensions=3, Extents=[-1,1,-5,5,-9,10],
Names='A, B, C', Units='U, U, U')
FakeMDEventData(mdew, PeakParams=[100000, 0, 0, 0, 1])
diff --git a/docs/source/algorithms/SmoothMD-v1.rst b/docs/source/algorithms/SmoothMD-v1.rst
index 7dca3269a721bec8d8ee8817cdcc15e1091dcfd3..f3864b8c37d4c81c3cc5eec46f19caa3a3233765 100644
--- a/docs/source/algorithms/SmoothMD-v1.rst
+++ b/docs/source/algorithms/SmoothMD-v1.rst
@@ -19,14 +19,14 @@ Note that the NormalizationWorkspace is not changed, and needs to be smoothed as
:alt: PreSmooth.png
:width: 400px
:align: center
-
+
No smoothing
-
+
.. figure:: /images/Smoothed.png
:alt: PreSmooth.png
:width: 400px
:align: center
-
+
Smooth with WidthVector=5
WidthVector and Functions
diff --git a/docs/source/algorithms/SofQWCentre-v1.rst b/docs/source/algorithms/SofQWCentre-v1.rst
index 43626827092216c49ab218d268af30c94526d183..adf66ef1fc9ab88b207e4f9abf22b2f47be0dddc 100644
--- a/docs/source/algorithms/SofQWCentre-v1.rst
+++ b/docs/source/algorithms/SofQWCentre-v1.rst
@@ -14,14 +14,14 @@ input a workspace where the data's been reduced to be in :ref:`units <Unit Facto
of **energy transfer** against spectrum number (which can be seen as equivalent to
angle, with the angle being taken from the detector(s) to which the
spectrum pertains). For each detector the value of **momentum transfer**
-(:math:`Q`) is calculated, and the counts for detectors and each input
+(:math:`Q`) is calculated, and the counts for detectors and each input
**energy transfer** bin are added to the appropriate output :math:`(Q ;\Delta E)` bin.
-The momentum transfer (:math:`Q`-values) obtained for each detector are
-calculated for the detector center, so the binning algorithm uses center-point
-binning. This algorithm does not use the `DetectorTwoThetaRanges` optional input
-property for the :math:`Q` calculation. Use :ref:`algm-SofQWPolygon` and
-:ref:`algm-SofQWNormalisedPolygon` for more complex and precise (but slower)
+The momentum transfer (:math:`Q`-values) obtained for each detector are
+calculated for the detector center, so the binning algorithm uses center-point
+binning. This algorithm does not use the `DetectorTwoThetaRanges` optional input
+property for the :math:`Q` calculation. Use :ref:`algm-SofQWPolygon` and
+:ref:`algm-SofQWNormalisedPolygon` for more complex and precise (but slower)
binning strategies.
The energy binning will not be changed by this algorithm, so the input
@@ -42,31 +42,31 @@ Usage
# create sample inelastic workspace for MARI instrument containing 1 at all spectra values
ws=CreateSimulationWorkspace(Instrument='MAR',BinParams='-10,1,10')
- # convert workspace into MD workspace
+ # convert workspace into MD workspace
ws=SofQWCentre(InputWorkspace=ws,QAxisBinning='-3,0.1,3',Emode='Direct',EFixed=12)
-
+
print("The converted X values are:")
print(ws.readX(59)[0:10])
- print(ws.readX(59)[10:21])
-
+ print(ws.readX(59)[10:21])
+
print("The converted Y values are:")
print(ws.readY(59)[0:10])
- print(ws.readY(59)[10:21])
+ print(ws.readY(59)[10:21])
.. testcleanup:: SofQWCentre
DeleteWorkspace(ws)
-
+
**Output:**
.. testoutput:: SofQWCentre
- The converted X values are:
+ The converted X values are:
[-10. -9. -8. -7. -6. -5. -4. -3. -2. -1.]
- [ 0. 1. 2. 3. 4. 5. 6. 7. 8. 9. 10.]
- The converted Y values are:
+ [ 0. 1. 2. 3. 4. 5. 6. 7. 8. 9. 10.]
+ The converted Y values are:
[ 12. 18. 18. 18. 18. 21. 18. 18. 21. 12.]
[ 18. 21. 24. 24. 24. 21. 24. 33. 39. 45.]
diff --git a/docs/source/algorithms/SofQWMoments-v1.rst b/docs/source/algorithms/SofQWMoments-v1.rst
index 2da6a995b3684db379325051dcbc3af4e530843b..0cc9447e44028ce129e24dd657f6a9349990f022 100644
--- a/docs/source/algorithms/SofQWMoments-v1.rst
+++ b/docs/source/algorithms/SofQWMoments-v1.rst
@@ -24,7 +24,7 @@ Usage
**Example - Running SofQWMoments from with an SofQW workspace.**
.. testcode:: ExSofQWMomentsSimple
-
+
#create a dummy workspace
function = "name=Lorentzian,Amplitude=1,PeakCentre=5,FWHM=1"
ws = CreateSampleWorkspace("Histogram", Function="User Defined", UserDefinedFunction=function, XMin=0, XMax=10, BinWidth=0.01, XUnit="DeltaE")
diff --git a/docs/source/algorithms/SofQWNormalisedPolygon-v1.rst b/docs/source/algorithms/SofQWNormalisedPolygon-v1.rst
index 8e5581fa804f16f4acc02090c9674114ff003aba..04be4d9e36a62a1f37f05fb514fc996cd097df28 100644
--- a/docs/source/algorithms/SofQWNormalisedPolygon-v1.rst
+++ b/docs/source/algorithms/SofQWNormalisedPolygon-v1.rst
@@ -9,10 +9,10 @@
Description
-----------
-Converts a 2D workspace from :ref:`units <Unit Factory>`
-of spectrum number/**energy transfer**
-to the intensity as a function of **momentum transfer** :math:`Q`
-and **energy transfer** :math:`\Delta E`.
+Converts a 2D workspace from :ref:`units <Unit Factory>`
+of spectrum number/**energy transfer**
+to the intensity as a function of **momentum transfer** :math:`Q`
+and **energy transfer** :math:`\Delta E`.
.. figure:: /images/RebinnedOutputStep1.png
:align: center
@@ -61,25 +61,25 @@ that in places where there are no counts (:math:`Y=0`) and no acceptance
(no fractional areas, :math:`F=0`), :math:`Y/F=`\ **nan**\ -s will
result.
-The algorithm operates in *non-PSD mode* by default. This means that the
-scattering angle :math:`2\theta` range covered by a detector is calculated for
-each detector individually. For grouped detectors, it is the minimum and
-maximum :math:`2\theta` of all detectors in the group. The computation is
-accurate for simple detector shapes (cylinder, cuboid); for other shapes a
-more rough method is used. It is possible to provide precalculated
-per-detector :math:`2\theta` values using the ``DetectorTwoThetaRanges`` input
+The algorithm operates in *non-PSD mode* by default. This means that the
+scattering angle :math:`2\theta` range covered by a detector is calculated for
+each detector individually. For grouped detectors, it is the minimum and
+maximum :math:`2\theta` of all detectors in the group. The computation is
+accurate for simple detector shapes (cylinder, cuboid); for other shapes a
+more rough method is used. It is possible to provide precalculated
+per-detector :math:`2\theta` values using the ``DetectorTwoThetaRanges`` input
property.
-*PSD mode* will determine the detector :math:`2\theta` ranges from the
-instrument geometry. This mode is activated by placing the following named
-parameter in the instrument definition file: *detector-neighbour-offset*. The
-integer value of this parameter should be the number of pixels that separates
+*PSD mode* will determine the detector :math:`2\theta` ranges from the
+instrument geometry. This mode is activated by placing the following named
+parameter in the instrument definition file: *detector-neighbour-offset*. The
+integer value of this parameter should be the number of pixels that separates
two pixels at the same vertical position in adjacent tubes.
See :ref:`algm-SofQWCentre` for centre-point binning or :ref:`algm-SofQWPolygon`
for simpler and less precise but faster binning strategies. The speed-up
is from ignoring the azimuthal positions of the detectors (as for the non-PSD
-mode in this algorithm) but in addition, :ref:`algm-SofQWPolygon` treats
+mode in this algorithm) but in addition, :ref:`algm-SofQWPolygon` treats
all detectors as being the same, and characterised by a single width in
scattering angle. Thereafter, it weights the signal and error by the fractional
overlap, similarly to that shown in the first figure above, but then discards
@@ -93,14 +93,14 @@ Usage
.. testcode:: SofQWNormalisedPolygon
- # create sample inelastic workspace for MARI instrument containing 1 at all spectra
+ # create sample inelastic workspace for MARI instrument containing 1 at all spectra
ws=CreateSimulationWorkspace(Instrument='MAR',BinParams='-10,1,10')
- # convert workspace into Matrix workspace with Q-dE coordinates
+ # convert workspace into Matrix workspace with Q-dE coordinates
ws=SofQWNormalisedPolygon(InputWorkspace=ws,QAxisBinning='-3,0.1,3',Emode='Direct',EFixed=12)
-
+
print("The converted X-Y values are:")
Xrow=ws.readX(59);
- Yrow=ws.readY(59);
+ Yrow=ws.readY(59);
line1= " ".join('! {0:>6.2f} {1:>6.2f} '.format(Xrow[i],Yrow[i]) for i in range(0,10))
print(line1 + " !")
line2= " ".join('! {0:>6.2f} {1:>6.2f} '.format(Xrow[i],Yrow[i]) for i in range(10,20))
@@ -112,7 +112,7 @@ Usage
.. testcleanup:: SofQWNormalisedPolygon
DeleteWorkspace(ws)
-
+
**Output:**
.. testoutput:: SofQWNormalisedPolygon
diff --git a/docs/source/algorithms/SofQWPolygon-v1.rst b/docs/source/algorithms/SofQWPolygon-v1.rst
index 724b4b0b9cc93ea7d1a006c403cb15d267665067..2e2baa27d01536d6de0d29985aeb6a0541dc91ea 100644
--- a/docs/source/algorithms/SofQWPolygon-v1.rst
+++ b/docs/source/algorithms/SofQWPolygon-v1.rst
@@ -9,21 +9,21 @@
Description
-----------
-Converts a 2D workspace in :ref:`units <Unit Factory>`
-of spectrum number/**energy transfer** to
-the intensity as a function of momentum transfer
-:math:`Q` and energy transfer :math:`\Delta E`.
-
-The rebinning is done as a weighted sum of overlapping polygons. The polygon
-in :math:`Q-\Delta E` space is calculated from the energy bin boundaries and
-the detector scattering angle :math:`2\theta`. The detectors (pixels) are
-assumed to be uniform, and characterised by a single angular width
-:math:`\Delta2\theta`. This is calculated from the nominal :math:`2\theta` of
-each detector; this algorithm does not utilize the `DetectorTwoThetaRanges`
-optional input property. The signal and error of the rebinned data (in
-:math:`Q-\Delta E` space) is then the sum of the contributing pixels in each
-bin weighted by their fractional overlap area. Unlike the more precise
-:ref:`algm-SofQWNormalisedPolygon` algorithm, these fractional weights are not
+Converts a 2D workspace in :ref:`units <Unit Factory>`
+of spectrum number/**energy transfer** to
+the intensity as a function of momentum transfer
+:math:`Q` and energy transfer :math:`\Delta E`.
+
+The rebinning is done as a weighted sum of overlapping polygons. The polygon
+in :math:`Q-\Delta E` space is calculated from the energy bin boundaries and
+the detector scattering angle :math:`2\theta`. The detectors (pixels) are
+assumed to be uniform, and characterised by a single angular width
+:math:`\Delta2\theta`. This is calculated from the nominal :math:`2\theta` of
+each detector; this algorithm does not utilize the `DetectorTwoThetaRanges`
+optional input property. The signal and error of the rebinned data (in
+:math:`Q-\Delta E` space) is then the sum of the contributing pixels in each
+bin weighted by their fractional overlap area. Unlike the more precise
+:ref:`algm-SofQWNormalisedPolygon` algorithm, these fractional weights are not
thereafter retained in the workspace produced by this algorithm.
See :ref:`algm-SofQWCentre` for centre-point binning.
@@ -40,12 +40,12 @@ Usage
# create sample inelastic workspace for MARI instrument containing 1 at all spectra values
ws=CreateSimulationWorkspace(Instrument='MAR',BinParams='-10,1,10')
- # convert workspace into MD workspace
+ # convert workspace into MD workspace
ws=SofQWPolygon(InputWorkspace=ws,QAxisBinning='-3,0.1,3',Emode='Direct',EFixed=12)
-
+
print("The converted X-Y values are:")
Xrow=ws.readX(59);
- Yrow=ws.readY(59);
+ Yrow=ws.readY(59);
line1= " ".join('! {0:>6.2f} {1:>6.2f} '.format(Xrow[i],Yrow[i]) for i in range(0,10))
print(line1 + " !")
line2= " ".join('! {0:>6.2f} {1:>6.2f} '.format(Xrow[i],Yrow[i]) for i in range(10,20))
@@ -57,7 +57,7 @@ Usage
.. testcleanup:: SofQWPolygon
DeleteWorkspace(ws)
-
+
**Output:**
.. testoutput:: SofQWPolygon
diff --git a/docs/source/algorithms/SortByQVectors-v1.rst b/docs/source/algorithms/SortByQVectors-v1.rst
index 10ba613fc2c8f10d1912cd2abf789ec63dbfa4ce..79fe88b92bb17a6cc91cbdc2df8afbafdf29c58f 100644
--- a/docs/source/algorithms/SortByQVectors-v1.rst
+++ b/docs/source/algorithms/SortByQVectors-v1.rst
@@ -20,7 +20,7 @@ Usage
.. testcode:: ExSortByQVectors
-
+
ws = LoadSassena("outputSassena_1.4.1.h5", TimeUnit=1.0)
print('workspaces instantiated: ' + ', '.join(ws.getNames()))
SortByQVectors(InputWorkspace='ws')
diff --git a/docs/source/algorithms/SortDetectors-v1.rst b/docs/source/algorithms/SortDetectors-v1.rst
index 120169ba367a4edf96c8fc23f828d8ac686cc5ed..a257c07a70f6964b3256fa2d86089b4af0408d41 100644
--- a/docs/source/algorithms/SortDetectors-v1.rst
+++ b/docs/source/algorithms/SortDetectors-v1.rst
@@ -20,7 +20,7 @@ Usage
ws = CreateSampleWorkspace()
upIDs,upDistances,downIDs,downDistances=SortDetectors(ws)
-
+
# No upstream detectors
print("Type of upID: {}".format(type(upIDs)))
print("Number of upDistances: {}".format(upDistances.shape[0]))
@@ -41,7 +41,7 @@ Output:
Number of upDistances: 0
First few values of downIDs: [ 0 1 10 11 2]
First few values of downDistances: 5.0 5.000006... 5.000006... 5.00001279... 5.00002559...
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/SortHKL-v1.rst b/docs/source/algorithms/SortHKL-v1.rst
index dd135aad819af38828a624bee4bb8f9bdba37b78..31856c77a7ade7ba2e324b4363e550ea8092cec5 100644
--- a/docs/source/algorithms/SortHKL-v1.rst
+++ b/docs/source/algorithms/SortHKL-v1.rst
@@ -39,8 +39,8 @@ Finally, the peaks in the output workspace are sorted by H, K and L.
The EquivalentsWorkspace contains specta that can be plotted for each set of
equivalent intensities. The X axis is the wavelength and the Y axis is the corrected intensity of the
peaks. The error is the difference in the intensity of that peak and the average for all equivalent
-peaks. For example, see the 424 equivalent intensities in plot below. The intensity of the peak at
-wavelength 0.5 is marked as an outlier by setting the error to the same value as the intensity.
+peaks. For example, see the 424 equivalent intensities in plot below. The intensity of the peak at
+wavelength 0.5 is marked as an outlier by setting the error to the same value as the intensity.
The average intensity is 21903.
.. figure:: /images/EquivalentIntensities.png
diff --git a/docs/source/algorithms/SortPeaksWorkspace-v1.rst b/docs/source/algorithms/SortPeaksWorkspace-v1.rst
index 96c37db81220ac23e5d3f9e2c0a063fd40b1018d..b50d315788a9253d0afdbf387935798f5b23f148 100644
--- a/docs/source/algorithms/SortPeaksWorkspace-v1.rst
+++ b/docs/source/algorithms/SortPeaksWorkspace-v1.rst
@@ -18,7 +18,7 @@ sort of the InputWorkspace.
Usage
-----
-**Example - sort a peaks workspace by column name:**
+**Example - sort a peaks workspace by column name:**
.. testcode:: ExSortPeaksWorkspaceSimple
diff --git a/docs/source/algorithms/SortTableWorkspace-v1.rst b/docs/source/algorithms/SortTableWorkspace-v1.rst
index 0394b2223facab3a984e7da23be81a67002c93fd..038b4cc3cbe6158ba58d966dc1143de39c979a6b 100644
--- a/docs/source/algorithms/SortTableWorkspace-v1.rst
+++ b/docs/source/algorithms/SortTableWorkspace-v1.rst
@@ -59,7 +59,7 @@ Usage
Output:
-.. testoutput:: SortTableWorkspaceExample
+.. testoutput:: SortTableWorkspaceExample
Sorted ascending
{'y': 'one (1)', 'x': 1, 'z': 7.0}
@@ -83,7 +83,7 @@ Output:
{'y': 'one (3)', 'x': 1, 'z': 1.0}
{'y': 'one (2)', 'x': 1, 'z': 2.0}
{'y': 'one (1)', 'x': 1, 'z': 7.0}
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/SortXAxis-v1.rst b/docs/source/algorithms/SortXAxis-v1.rst
index 4e1d9836d15c82dabc2b797ed605f385181de448..3c06bb693a4747315c282992de3efb8f3ed5c504 100644
--- a/docs/source/algorithms/SortXAxis-v1.rst
+++ b/docs/source/algorithms/SortXAxis-v1.rst
@@ -69,7 +69,7 @@ Output:
In order print: Ascending
[ 1. 2. 3.]
[ 1. 2. 3.]
- [ 1. 2. 3.]
+ [ 1. 2. 3.]
.. categories::
diff --git a/docs/source/algorithms/SpecularReflectionCalculateTheta-v1.rst b/docs/source/algorithms/SpecularReflectionCalculateTheta-v1.rst
index fccdd37e59184ac0ee8aff44c31e26a417c016ab..58b4f1c0a583fd7826e6bfd9afd92fb9fdc23463 100644
--- a/docs/source/algorithms/SpecularReflectionCalculateTheta-v1.rst
+++ b/docs/source/algorithms/SpecularReflectionCalculateTheta-v1.rst
@@ -9,9 +9,9 @@
Description
-----------
-Uses the Specular reflection condition :math:`\theta_{In} \equiv \theta_{Out}` to calculate and return a corrected :math:`\theta_{In}`.
+Uses the Specular reflection condition :math:`\theta_{In} \equiv \theta_{Out}` to calculate and return a corrected :math:`\theta_{In}`.
-.. math::
+.. math::
2\centerdot\theta = tan^{-1}\left(\frac{UpOffset}{BeamOffset}\right)
@@ -33,7 +33,7 @@ Usage
ws = LoadEmptyInstrument(instrument_def)
inst = ws.getInstrument()
ref_frame = inst.getReferenceFrame()
- upoffset = ref_frame.vecPointingUp()
+ upoffset = ref_frame.vecPointingUp()
det_position = {ref_frame.pointingUpAxis(): 1.0, ref_frame.pointingAlongBeamAxis(): 1.0, ref_frame.pointingHorizontalAxis():0}
MoveInstrumentComponent(ws, 'point-detector',RelativePosition=False, **det_position)
MoveInstrumentComponent(ws, 'some-surface-holder',RelativePosition=False, X=0, Y= 0, Z=0)
@@ -41,13 +41,13 @@ Usage
# Calculate the two theta.
two_theta = SpecularReflectionCalculateTheta(InputWorkspace=ws, DetectorComponentName='point-detector', AnalysisMode='PointDetectorAnalysis', Version=1)
print(two_theta)
-
+
Output:
-.. testoutput:: SpecularReflectionCalculateThetaPointDetectorExample
-
+.. testoutput:: SpecularReflectionCalculateThetaPointDetectorExample
+
90.0
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/SpecularReflectionCalculateTheta-v2.rst b/docs/source/algorithms/SpecularReflectionCalculateTheta-v2.rst
index f5c58e38e2527a198db6821259f84cf8014cd11b..5b59b07e0654c30687edfeb6fd4321b68c607a8e 100644
--- a/docs/source/algorithms/SpecularReflectionCalculateTheta-v2.rst
+++ b/docs/source/algorithms/SpecularReflectionCalculateTheta-v2.rst
@@ -12,7 +12,7 @@ Description
Uses the Specular reflection condition :math:`\theta_{In} \equiv \theta_{Out}`
to calculate and return a corrected :math:`\theta_{In}`.
-.. math::
+.. math::
2\theta = \arctan\left(\frac{UpOffset}{BeamOffset}\right)
@@ -42,7 +42,7 @@ Usage
ws = LoadEmptyInstrument(instrument_def)
inst = ws.getInstrument()
ref_frame = inst.getReferenceFrame()
- upoffset = ref_frame.vecPointingUp()
+ upoffset = ref_frame.vecPointingUp()
det_position = {ref_frame.pointingUpAxis(): 1.0, ref_frame.pointingAlongBeamAxis(): 1.0, ref_frame.pointingHorizontalAxis():0}
MoveInstrumentComponent(ws, 'point-detector',RelativePosition=False, **det_position)
MoveInstrumentComponent(ws, 'some-surface-holder',RelativePosition=False, X=0, Y= 0, Z=0)
@@ -50,13 +50,13 @@ Usage
# Calculate the two theta.
two_theta = SpecularReflectionCalculateTheta(InputWorkspace=ws, DetectorComponentName='point-detector', AnalysisMode='PointDetectorAnalysis')
print(two_theta)
-
+
Output:
-.. testoutput:: SpecularReflectionCalculateThetaPointDetectorExample
-
+.. testoutput:: SpecularReflectionCalculateThetaPointDetectorExample
+
45.0
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/SpecularReflectionPositionCorrect-v1.rst b/docs/source/algorithms/SpecularReflectionPositionCorrect-v1.rst
index a2d9cffa2c2079810e58da5ffc01cf2893868b77..ad6de3317e599e556ea9ae55ebcb2b61bd4738bb 100644
--- a/docs/source/algorithms/SpecularReflectionPositionCorrect-v1.rst
+++ b/docs/source/algorithms/SpecularReflectionPositionCorrect-v1.rst
@@ -11,7 +11,7 @@ Description
Uses the specular reflection condition :math:`\theta_{In} \equiv \theta_{Out}` along with the Beam direction offeset to vertically shift the detectors into a corrected location.
-.. math::
+.. math::
2\centerdot\theta = tan^{-1}\left(\frac{UpOffset}{BeamOffset}\right)
@@ -38,7 +38,7 @@ Usage
ws = LoadEmptyInstrument(instrument_def)
inst = ws.getInstrument()
ref_frame = inst.getReferenceFrame()
- vertical_position = {ref_frame.pointingUpAxis(): 0, ref_frame.pointingAlongBeamAxis(): 1.0, ref_frame.pointingHorizontalAxis():0}
+ vertical_position = {ref_frame.pointingUpAxis(): 0, ref_frame.pointingAlongBeamAxis(): 1.0, ref_frame.pointingHorizontalAxis():0}
MoveInstrumentComponent(ws, 'point-detector',RelativePosition=False, **vertical_position)
MoveInstrumentComponent(ws, 'some-surface-holder',RelativePosition=False, X=0, Y= 0, Z=0)
@@ -49,11 +49,11 @@ Usage
inst = corrected_ws.getInstrument()
det_pos = inst.getComponentByName('point-detector').getPos()
print(det_pos)
-
+
Output:
-.. testoutput:: SpecularReflectionPositionCorrectExample
-
+.. testoutput:: SpecularReflectionPositionCorrectExample
+
[0,0.414214,1]
.. categories::
diff --git a/docs/source/algorithms/SphericalAbsorption-v1.rst b/docs/source/algorithms/SphericalAbsorption-v1.rst
index 2f1262a5dda0ced9aded76bde582787e40a25183..2e02fb80d7a89c51920da42551f2c7b3f17b3685 100644
--- a/docs/source/algorithms/SphericalAbsorption-v1.rst
+++ b/docs/source/algorithms/SphericalAbsorption-v1.rst
@@ -20,7 +20,7 @@ Usage
**Example: A simple spherical sample**
.. testcode:: ExSphericalAbsorption
-
+
ws = CreateSampleWorkspace("Histogram",NumBanks=1,BankPixelWidth=1)
ws = ConvertUnits(ws,"Wavelength")
ws = Rebin(ws,Params=[1])
@@ -28,7 +28,7 @@ Usage
#restrict the number of wavelength points to speed up the example
wsOut = SphericalAbsorption(ws,SphericalSampleRadius=0.2)
-
+
print("The created workspace has spectra: {}".format(wsOut.readY(0)))
Output:
diff --git a/docs/source/algorithms/SplineInterpolation-v1.rst b/docs/source/algorithms/SplineInterpolation-v1.rst
index 3599cc0adeec3a3c331e708297f0e423abf88e1f..deafa3839b870b6e034274d8ec2d696d79d6fe16 100644
--- a/docs/source/algorithms/SplineInterpolation-v1.rst
+++ b/docs/source/algorithms/SplineInterpolation-v1.rst
@@ -46,7 +46,7 @@ boundaries are used.
Usage
-----
-**Example - interpolate between points in one workspace to match a reference workspace:**
+**Example - interpolate between points in one workspace to match a reference workspace:**
.. testcode:: ExSplineInterpolationSimple
@@ -59,13 +59,13 @@ Usage
#create some random points to interpolate between
dataX2 = np.arange(1,110,10) * 0.07
- dataY2 = np.random.random_sample(dataX2.size)
+ dataY2 = np.random.random_sample(dataX2.size)
ws = CreateWorkspace(dataX2, dataY2)
#interpolate using the reference workspace
interpolated_ws = SplineInterpolation(WorkspaceToMatch=spline_ws, WorkspaceToInterpolate=ws, DerivOrder=0)
-
-**Example - output the derivatives of the interpolated workspace:**
+
+**Example - output the derivatives of the interpolated workspace:**
.. testcode:: ExSplineInterpolationDeriv
@@ -78,7 +78,7 @@ Usage
#create some random points to interpolate between
dataX2 = np.arange(1,110,10) * 0.07
- dataY2 = np.random.random_sample(dataX2.size)
+ dataY2 = np.random.random_sample(dataX2.size)
ws = CreateWorkspace(dataX2, dataY2)
#interpolate using the reference workspace and output a group workspace of derivatives for each spectrum
diff --git a/docs/source/algorithms/SplineSmoothing-v1.rst b/docs/source/algorithms/SplineSmoothing-v1.rst
index 9a0a35b49827b18c8355669e0b04b9b12feb0f8c..99751d06c6baf3bdc89410e4a783375691832486 100644
--- a/docs/source/algorithms/SplineSmoothing-v1.rst
+++ b/docs/source/algorithms/SplineSmoothing-v1.rst
@@ -10,7 +10,7 @@ Description
-----------
The algorithm performs a smoothing of the input data using a cubic
-spline. The algorithm takes a 2D workspace and generates a spline
+spline. The algorithm takes a 2D workspace and generates a spline
for each of the spectra to approximate a fit of the data.
Optionally, this algorithm can also calculate the first and second
@@ -36,7 +36,7 @@ be able to successfully and efficiently apply the algorithm to a workspace
with multiple spectrums, which would generate an output of workspace
with multiple spectrums of :ref:`SplineSmoothing <algm-SplineSmoothing-v1>`
algorithm applied to it. `BSpline <http://www.mantidproject.org/BSpline>`_
-can be used to help you understand break-points in further detail.
+can be used to help you understand break-points in further detail.
For Histogram Workspaces
@@ -53,7 +53,7 @@ Usage
.. testcode:: SmoothNoisy
- ws = CreateSampleWorkspace("Histogram","Multiple Peaks",
+ ws = CreateSampleWorkspace("Histogram","Multiple Peaks",
BankPixelWidth=1, NumBanks=10, Random=True,
XMax=30, BinWidth=0.3)
wsOut = SplineSmoothing(ws,Error=1)
diff --git a/docs/source/algorithms/StepScan-v1.rst b/docs/source/algorithms/StepScan-v1.rst
index 68b4294389a09612bcc54b1a1bb372f9bcdb487a..71cc563aeab42710ffae333bb6d4b6074455612b 100644
--- a/docs/source/algorithms/StepScan-v1.rst
+++ b/docs/source/algorithms/StepScan-v1.rst
@@ -21,14 +21,14 @@ The :ref:`algm-SumEventsByLogValue` algorithm is then
called, with 'scan\_index' as the log to sum against. The row of the
resulting table pertaining to scan\_index=0 (which indicates 'not a scan
point') is then removed.
-
+
Before then it will call other algorithms as shown in the flowchart,
if the relevant inputs have been set.
:ref:`algm-MaskDetectors` will be called if a MaskWorkspace is supplied.
-If either Xmin or Xmax or both are supplied,
+If either Xmin or Xmax or both are supplied,
then :ref:`algm-FilterByXValue` algorithm is run to restrict the
region of data included and if RangeUnit is not TOF,
-:ref:`algm-ConvertUnits` is run beforehand.
+:ref:`algm-ConvertUnits` is run beforehand.
If necessary, the input workspace is cloned, to save it from being modified.
diff --git a/docs/source/algorithms/Stitch1DMany-v1.rst b/docs/source/algorithms/Stitch1DMany-v1.rst
index d029c3b14cffbe6734bbf7dde2c8edb8c7031de1..a3a422684b007040b88f18d2990535f894cd4391 100644
--- a/docs/source/algorithms/Stitch1DMany-v1.rst
+++ b/docs/source/algorithms/Stitch1DMany-v1.rst
@@ -18,7 +18,7 @@ You may consider to run :ref:`algm-ConvertToHistogram` on workspaces prior to pa
The algorithm expects pairs of :literal:`StartOverlaps` and
:literal:`EndOverlaps` values. The order in which these are provided determines
-the pairing. There should be N entries in each of these lists, where N = 1 -
+the pairing. There should be N entries in each of these lists, where N = 1 -
(No. of workspaces to stitch). StartOverlaps and EndOverlaps are in the same
units as the X-axis for the workspace and are optional. For each pair of these
values, the :literal:`StartOverlaps` value cannot exceed its corresponding
diff --git a/docs/source/algorithms/StringToPng-v1.rst b/docs/source/algorithms/StringToPng-v1.rst
index 9b4fc275e1656801726fd67439c5b0710264196b..5f3a18b1fa5f23d552ce925fa9e8047a08e013c5 100644
--- a/docs/source/algorithms/StringToPng-v1.rst
+++ b/docs/source/algorithms/StringToPng-v1.rst
@@ -15,7 +15,7 @@ Saves a string as a png file, as part of autoreduction.
.. Note::
Requires matplotlib.
-
+
Usage
-----
@@ -29,10 +29,10 @@ Usage
StringToPng("This is a string\nAnd this is a second line",OutputFilename=filename)
except:
pass
-
+
.. testcleanup:: StringToPng
- import os,mantid
+ import os,mantid
filename=mantid.config.getString("defaultsave.directory")+"StringToPngTest.png"
if os.path.isfile(filename):
os.remove(filename)
@@ -41,7 +41,7 @@ Output:
.. testoutput:: StringToPng
-
+
The file should look like
diff --git a/docs/source/algorithms/SumEventsByLogValue-v1.rst b/docs/source/algorithms/SumEventsByLogValue-v1.rst
index 32b8f891ea8b3c70a836a26711be030ad28244f5..f3250460971f1a2c3129cc8cf0e91312eb94fb53 100644
--- a/docs/source/algorithms/SumEventsByLogValue-v1.rst
+++ b/docs/source/algorithms/SumEventsByLogValue-v1.rst
@@ -51,14 +51,14 @@ of the log value.
Usage
-----
-**Example - Single-Spectrum Mode**
+**Example - Single-Spectrum Mode**
.. testcode:: Single-Spectrum
# a sample workspace with a sample instrument
ws = CreateSampleWorkspace("Event",BankPixelWidth=1)
- AddTimeSeriesLog(ws, Name="Log2FilterBy", Time="2010-01-01T00:00:00", Value=1)
+ AddTimeSeriesLog(ws, Name="Log2FilterBy", Time="2010-01-01T00:00:00", Value=1)
AddTimeSeriesLog(ws, Name="Log2FilterBy", Time="2010-01-01T00:10:00", Value=2)
AddTimeSeriesLog(ws, Name="Log2FilterBy", Time="2010-01-01T00:20:00", Value=3)
AddTimeSeriesLog(ws, Name="Log2FilterBy", Time="2010-01-01T00:30:00", Value=1)
diff --git a/docs/source/algorithms/SumRowColumn-v1.rst b/docs/source/algorithms/SumRowColumn-v1.rst
index 55804d31c4366aec550af6ed1419e7930aef5fc1..6949f2d8459120896e63748678a4631905fba3aa 100644
--- a/docs/source/algorithms/SumRowColumn-v1.rst
+++ b/docs/source/algorithms/SumRowColumn-v1.rst
@@ -36,7 +36,7 @@ Usage
print("Input workspace has {} points.".format(ws.getNPoints()))
print("Output workspace has {} points.".format(OutputWorkspace.getNPoints()))
-
+
Output:
.. testoutput:: ExSumRowColumnSimple
diff --git a/docs/source/algorithms/SwapWidths-v1.rst b/docs/source/algorithms/SwapWidths-v1.rst
index c1360be66769c03204ed6b28cc9d6a65333b0cc1..690e3312d4e98b960c8782557b99655d17dae8a8 100644
--- a/docs/source/algorithms/SwapWidths-v1.rst
+++ b/docs/source/algorithms/SwapWidths-v1.rst
@@ -10,7 +10,7 @@ Description
-----------
This algorithm is used mainly in tandem with the output of BayesQuasi when the data contains multiple peaks.
-Quasi Lines
+Quasi Lines
Usage
@@ -34,9 +34,9 @@ Output:
.. testoutput:: SwapWidthsExample
:options: +NORMALIZE_WHITESPACE
-
+
The resulting workspace has 16 bins and 2 histograms.
-
+
.. categories::
diff --git a/docs/source/algorithms/TOFSANSResolutionByPixel-v1.rst b/docs/source/algorithms/TOFSANSResolutionByPixel-v1.rst
index 19c146448cfdfe07fc61c469ccade7564ac13a94..461dc08cff6be4e5d22fac675708ab1a296e24f0 100644
--- a/docs/source/algorithms/TOFSANSResolutionByPixel-v1.rst
+++ b/docs/source/algorithms/TOFSANSResolutionByPixel-v1.rst
@@ -13,7 +13,7 @@ Calculates the Q-resolution per pixel according to Mildner and Carpenter equatio
.. math:: (\sigma_Q )^2 = \frac{4\pi^2}{12\lambda^2} [ 3(\frac{R_1}{L_1})^2 + 3(\frac{R_2}{L_3})^2 + (\frac{\Delta R}{L_2})^2 ] + Q^2(\frac{\sigma_{\lambda}}{\lambda})^2
-where :math:`L1` and :math:`L2` are the collimation length and sample-to-detector distance respectively and
+where :math:`L1` and :math:`L2` are the collimation length and sample-to-detector distance respectively and
.. math:: \frac{1}{L_3} = \frac{1}{L_1} + \frac{1}{L_2}
@@ -21,48 +21,48 @@ and
.. math:: (\sigma_{\lambda})^2 = (\Delta \lambda )^2 / 12 + (\sigma_{moderator})^2
-where :math:`\sigma_{\lambda}` is the overall effective standard deviation in wavelength.
-:math:`\Delta \lambda` values are found from the wavelength binning of the InputWorkspace,
-:math:`\sigma_{moderator}` is the moderator time spread (the variation in time for the moderator
-to emit neutrons of a given wavelength). Note that :math:`\Delta \lambda` may be imposed
-by wavelength steps set elsewhere in Mantid which should be at least as large as the
-equivalent time bins used in the original histogram data collection. For event mode data
-:math:`\Delta \lambda` is in theory very small, but in practice a histogram in
-time has to be generated (perhaps using monitor time bins or specifically set
-event-time-bins), before a rebinning into user provided wavelength steps in InputWorkspace.
+where :math:`\sigma_{\lambda}` is the overall effective standard deviation in wavelength.
+:math:`\Delta \lambda` values are found from the wavelength binning of the InputWorkspace,
+:math:`\sigma_{moderator}` is the moderator time spread (the variation in time for the moderator
+to emit neutrons of a given wavelength). Note that :math:`\Delta \lambda` may be imposed
+by wavelength steps set elsewhere in Mantid which should be at least as large as the
+equivalent time bins used in the original histogram data collection. For event mode data
+:math:`\Delta \lambda` is in theory very small, but in practice a histogram in
+time has to be generated (perhaps using monitor time bins or specifically set
+event-time-bins), before a rebinning into user provided wavelength steps in InputWorkspace.
Again the latter steps should be the largest.
-Q values needed here are calculated in the same way as for Q1D, including correction
+Q values needed here are calculated in the same way as for Q1D, including correction
for gravity for which detector coordinates are assumed centred at zero wavelength.
-:math:`\sigma_Q` is returned as the y-values of the InputWorkspace, and the
+:math:`\sigma_Q` is returned as the y-values of the InputWorkspace, and the
remaining variables in the main equation above are related to parameters of this
algorithm as follows:
* :math:`R_1` equals SourceApertureRadius
* :math:`R_2` equals SampleApertureRadius
* :math:`\Delta R` equals DeltaR
-* :math:`\sigma_{moderator}` equals SigmaModerator
+* :math:`\sigma_{moderator}` equals SigmaModerator
* :math:`\L_1` equals CollimationLength
-:math:`\lambda` in the equation is the midpoint of wavelength
+:math:`\lambda` in the equation is the midpoint of wavelength
histogram bin values of InputWorkspace.
Collimation length :math:`L_1` in metres in the equation here is the distance between the
first beam defining pinhole (Radius :math:`R_1`) and the sample aperture (radius :math:`R_2`).
(Beware that :math:`L_1` is more often the moderator to sample distance.)
-
+
For rectangular collimation apertures, size H x W, Mildner & Carpenter say to
use :math:`R = \sqrt{( H^2 +W^2)/6 }`. Note that we are assuming isotropically averaged,
scalar :math:`Q`, and making some small angle approximations. Results on higher angle detectors
may not be accurate. For data reduction sliced in different directions on the detector
(e.g. GISANS) adjust the calling parameters to suit the collimation in that direction.
-Note that :math:`\Delta` is the full width of a rectangular distribution in radius or wavelength,
-for which the standard deviation is :math:`\sigma=\Delta/\sqrt{12}`. For a Gaussian distribution
-the FWHM (full width at half maximum) is :math:`\sqrt{8\ln{2}}\sigma=2.35482\sigma`. For an exponential decay
-:math:`e^{-t/\tau}`, the standard deviation (and the mean) is :math:`\tau`. For non-rectangular
+Note that :math:`\Delta` is the full width of a rectangular distribution in radius or wavelength,
+for which the standard deviation is :math:`\sigma=\Delta/\sqrt{12}`. For a Gaussian distribution
+the FWHM (full width at half maximum) is :math:`\sqrt{8\ln{2}}\sigma=2.35482\sigma`. For an exponential decay
+:math:`e^{-t/\tau}`, the standard deviation (and the mean) is :math:`\tau`. For non-rectangular
distributions these equations allow the equivalent :math:`\Delta` to be entered as :math:`\Delta=\sqrt{12}\sigma`.
This version of the algorithm neglects wavelength-dependent detector detection depth effects.
diff --git a/docs/source/algorithms/TOFTOFCropWorkspace-v1.rst b/docs/source/algorithms/TOFTOFCropWorkspace-v1.rst
index 57c006727d5b51be9ef7e4252e8cf3661c7ed38b..5c56c944c6dd99555e1749c43bd8cb5f9baebbc0 100644
--- a/docs/source/algorithms/TOFTOFCropWorkspace-v1.rst
+++ b/docs/source/algorithms/TOFTOFCropWorkspace-v1.rst
@@ -55,7 +55,7 @@ Output:
Number of filled time channels: 1020.0
Output workspace
Total number of time channels: 1020
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/TOFTOFMergeRuns-v1.rst b/docs/source/algorithms/TOFTOFMergeRuns-v1.rst
index 04e788c79a6cad93e2abed8218e780455d5e002f..812c668f9464e8447722c81cefca26ed08b9cf77 100644
--- a/docs/source/algorithms/TOFTOFMergeRuns-v1.rst
+++ b/docs/source/algorithms/TOFTOFMergeRuns-v1.rst
@@ -9,7 +9,7 @@
.. warning::
This algorithm is deprecated (June-2018). Please, use :ref:`MergeRuns <algm-MergeRuns>` instead.
-
+
Description
-----------
@@ -46,7 +46,7 @@ If these conditions are not fulfilled, algorithm terminates with an error messag
Sample log *temperature* is optional. If it is present in some of input workspaces, mean value will be calculated. Otherwise, no *temperature* sample log will be created in the output workspace.
-Algorithm will produce warning if
+Algorithm will produce warning if
- *temperature* and *run_title* sample logs are not present or different,
- some of input workspaces have zero monitor counts.
@@ -69,7 +69,7 @@ Usage
# Input = list of workspaces
ws3 = TOFTOFMergeRuns('ws1,ws2')
- # Temperature
+ # Temperature
print("Temperature of experiment for 1st workspace (in K): {}".format(ws1.getRun().getLogData('temperature').value))
print("Temperature of experiment for 2nd workspace (in K): {}".format(ws2.getRun().getLogData('temperature').value))
print("Temperature of experiment for merged workspaces = average over workspaces (in K): {}".format( ws3.getRun().getLogData('temperature').value))
@@ -79,26 +79,26 @@ Usage
print("Duration of experiment for 2nd workspace (in s): {}".format(ws2.getRun().getLogData('duration').value))
print("Duration of experiment for merged workspaces = sum of all durations (in s): {}".format(ws3.getRun().getLogData('duration').value))
- # Run start
+ # Run start
print("Start of experiment for 1st workspace: {}".format(ws1.getRun().getLogData('run_start').value))
print("Start of experiment for 2nd workspace: {}".format(ws2.getRun().getLogData('run_start').value))
print("Start of experiment for merged workspaces = miminum of all workspaces: {}".format(ws3.getRun().getLogData('run_start').value))
- # Run end
+ # Run end
print("End of experiment for 1st workspace: {}".format(ws1.getRun().getLogData('run_end').value))
print("End of experiment for 2nd workspace: {}".format(ws2.getRun().getLogData('run_end').value))
print("End of experiment for merged workspaces = maximum of all workspaces: {}".format(ws3.getRun().getLogData('run_end').value))
-
- # Run number
+
+ # Run number
print("Run number for 1st workspace: {}".format(ws1.getRun().getLogData('run_number').value))
print("Run number for 2nd workspace: {}".format(ws2.getRun().getLogData('run_number').value))
print("Run number for merged workspaces = list of all workspaces: {}".format(ws3.getRun().getLogData('run_number').value))
-
+
# Monitor counts
print("Monitor counts for 1st workspace: {:.0f}".format(ws1.getRun().getLogData('monitor_counts').value))
print("Monitor counts for 2nd workspace: {:.0f}".format(ws2.getRun().getLogData('monitor_counts').value))
print("Monitor counts for merged workspaces = sum over all workspaces: {:.0f}".format(ws3.getRun().getLogData('monitor_counts').value))
-
+
Output:
@@ -121,7 +121,7 @@ Output:
Run number for merged workspaces = list of all workspaces: ['TOFTOFTestdata', 'TOFTOFTestdata2']
Monitor counts for 1st workspace: 136935
Monitor counts for 2nd workspace: 145145
- Monitor counts for merged workspaces = sum over all workspaces: 282080
+ Monitor counts for merged workspaces = sum over all workspaces: 282080
**Example - Merge group of workspaces**
@@ -155,5 +155,5 @@ Output:
.. sourcelink::
-
+
diff --git a/docs/source/algorithms/Transpose-v1.rst b/docs/source/algorithms/Transpose-v1.rst
index 82df8dd1470ad3b4704e26edc466b908b9a5dd06..c0bcd5ae34ba6252f1d7186bfec5ba2c4b5564b2 100644
--- a/docs/source/algorithms/Transpose-v1.rst
+++ b/docs/source/algorithms/Transpose-v1.rst
@@ -10,7 +10,7 @@ Description
-----------
This algorithm transposes a workspace, so that an N1 x N2 workspace
-becomes N2 x N1.
+becomes N2 x N1.
The X-vector values for the new workspace are taken from the axis values
of the old workspace, which is generally the spectra number but can be
@@ -22,7 +22,7 @@ other values, if say the workspace has gone through
The new axis values are taken from the previous X-vector values for the
first specrum in the workspace. For this reason, use with ragged
workspaces is undefined.
-
+
For transposing multidimensional workspaces use :ref:`TransposeMD <algm-TransposeMD>`.
Usage
diff --git a/docs/source/algorithms/Transpose3D-v1.rst b/docs/source/algorithms/Transpose3D-v1.rst
index 386411cd11094d4181b14b9b016d4e1ef184c4c0..4e6860b97dfbfc24984606782fdda719dc283c2b 100644
--- a/docs/source/algorithms/Transpose3D-v1.rst
+++ b/docs/source/algorithms/Transpose3D-v1.rst
@@ -8,7 +8,7 @@
.. warning::
- For transposing multidimensional workspaces now use :ref:`TransposeMD <algm-TransposeMD>`. This algorithm is currently under review and may change or disappear in a future release of Mantid.
+ For transposing multidimensional workspaces now use :ref:`TransposeMD <algm-TransposeMD>`. This algorithm is currently under review and may change or disappear in a future release of Mantid.
diff --git a/docs/source/algorithms/USANSReduction-v1.rst b/docs/source/algorithms/USANSReduction-v1.rst
index 8779eac3736ab57c4fffde8babe45ad72573ab0b..0143ee91cdb44f0bb0002221adeea6fd93f29c1c 100644
--- a/docs/source/algorithms/USANSReduction-v1.rst
+++ b/docs/source/algorithms/USANSReduction-v1.rst
@@ -11,10 +11,10 @@ Description
Perform USANS reduction.
-- Load the data and the empty run.
+- Load the data and the empty run.
- Normalize the data.
- Compute the transmission and apply the transmission correction.
-
+
The procedure is repeated for each monochromator reflection.
Each analyzer angle is treated separately.
diff --git a/docs/source/algorithms/UnwrapSNS-v1.rst b/docs/source/algorithms/UnwrapSNS-v1.rst
index 39b1d63ff8e35ce04a4ce5cbe107f6ac5a9e8ddf..ee94c1ca74c02afdf6b1870400101d4b672298f1 100644
--- a/docs/source/algorithms/UnwrapSNS-v1.rst
+++ b/docs/source/algorithms/UnwrapSNS-v1.rst
@@ -50,7 +50,7 @@ Usage
**Example: Unwrap sample data**
.. testcode:: ExUnwrapSNS
-
+
ws = CreateSampleWorkspace("Event",NumBanks=1,BankPixelWidth=1)
wsOut = UnwrapSNS(ws,LRef=10)
diff --git a/docs/source/algorithms/UpdateInstrumentFromFile-v1.rst b/docs/source/algorithms/UpdateInstrumentFromFile-v1.rst
index 81011f0bd5dae09b9f00aca91f8fea1ec9f88d20..597236cdf472a0061c13dc6a888f7dc25b709791 100644
--- a/docs/source/algorithms/UpdateInstrumentFromFile-v1.rst
+++ b/docs/source/algorithms/UpdateInstrumentFromFile-v1.rst
@@ -24,7 +24,7 @@ face the sample perfectly after this algorithm has been applied.
Related or similar algorithms
##############################
-See :ref:`algm-LoadDetectorInfo` which can do similar job modifying the detector parameters and positions and working with special format ASCII files or ISIS raw or special nexus files.
+See :ref:`algm-LoadDetectorInfo` which can do similar job modifying the detector parameters and positions and working with special format ASCII files or ISIS raw or special nexus files.
Additional Detector Parameters Using ASCII File
@@ -74,13 +74,13 @@ Usage
**Example - Update Instrument:**
.. testcode:: exUpdateInstrumentFromFile
-
+
import math
import os
# priting procedure
def print_10_detectors(instr_type,instr):
''' print first 10 detectors from given instrument '''
- # get first 10 detectors using detector ID
+ # get first 10 detectors using detector ID
print("{0} {1} instrument".format(instr_type, instr.getName()))
for i in range(0,10):
@@ -94,41 +94,41 @@ Usage
print('det with ID: {0:5} is monitor? {1:5}, polar angle: {2:10.3f}, position: | {3:<10.3f} | {4:<10.3f} | {5:<10.3f}|'.format(\
detID,det1.isMonitor(),(det1.getPhi()*(180/math.pi)),pos.X(),pos.Y(),pos.Z()))
print('*********************************************************************************')
-
- #--------------------------------------------------------------------------------------
+
+ #--------------------------------------------------------------------------------------
# create sample workspace
- ws=CreateSampleWorkspace();
- #--------------------------------------------------------------------------------------
+ ws=CreateSampleWorkspace();
+ #--------------------------------------------------------------------------------------
# load MARI
- det=LoadInstrument(ws,InstrumentName='MARI', RewriteSpectraMap=True)
- inst1=ws.getInstrument();
- #
+ det=LoadInstrument(ws,InstrumentName='MARI', RewriteSpectraMap=True)
+ inst1=ws.getInstrument();
+ #
print_10_detectors('unCalibrated',inst1);
- #--------------------------------------------------------------------------------------
+ #--------------------------------------------------------------------------------------
# Prepare calibration file changing first 6 detectors & monitors
- file_name = os.path.join(config["defaultsave.directory"], "TestCalibration.dat")
+ file_name = os.path.join(config["defaultsave.directory"], "TestCalibration.dat")
f = open(file_name,'w');
# prepare through each spectra in the test workspace and change its detector calibration parameters
- f.write(' Test calibration file \n')
+ f.write(' Test calibration file \n')
f.write(' detID theta delay source_dist detector_dist\n')
for i in range(0,6):
f.write('{0} {1} {2} {3} {4} {5}\n'.format(i+1,(i+1)*3.1415926/200,0.5,100,(i+1)*3.1415926/5,10))
-
+
f.close();
- #--------------------------------------------------------------------------------------
+ #--------------------------------------------------------------------------------------
# CALIBRATE:
UpdateInstrumentFromFile(ws,Filename=file_name,AsciiHeader='spectrum,theta,-,-,phi,R',MoveMonitors=True,SkipFirstNLines=2)
inst1=ws.getInstrument();
- #--------------------------------------------------------------------------------------
+ #--------------------------------------------------------------------------------------
# look at the result:
print_10_detectors('Calibrated',inst1);
-
+
.. testcleanup:: exUpdateInstrumentFromFile
- os.remove(file_name)
-
+ os.remove(file_name)
+
**Output:**
@@ -158,7 +158,7 @@ Usage
det with ID: 1106 is monitor? 0, polar angle: -71.570, position: | 0.347 | -1.043 | 3.869 |
det with ID: 1107 is monitor? 0, polar angle: -72.060, position: | 0.347 | -1.073 | 3.861 |
*********************************************************************************
-
+
.. categories::
diff --git a/docs/source/algorithms/UpdatePeakParameterTableValue-v1.rst b/docs/source/algorithms/UpdatePeakParameterTableValue-v1.rst
index dea5efa30f2fec5e3397494e08acbcc291d715d0..9ac25c1eb54758019687ace1dd5c9f210e3acc5f 100644
--- a/docs/source/algorithms/UpdatePeakParameterTableValue-v1.rst
+++ b/docs/source/algorithms/UpdatePeakParameterTableValue-v1.rst
@@ -67,7 +67,7 @@ Usage
print("Value before %.2f" % tablews.cell(0, 1))
UpdatePeakParameterTableValue(tablews, Column="Value", ParameterNames=["A"], NewFloatValue=1.00)
-
+
print("Value after %.2f" % tablews.cell(0, 1))
Output:
diff --git a/docs/source/algorithms/VesuvioAnalysis-v1.rst b/docs/source/algorithms/VesuvioAnalysis-v1.rst
index 32d7126c959a6c887abdd98bb7e53d0d7c6cf7dc..3374aaf09499fdfbe3d68a181e89b7e99c55a2e6 100644
--- a/docs/source/algorithms/VesuvioAnalysis-v1.rst
+++ b/docs/source/algorithms/VesuvioAnalysis-v1.rst
@@ -8,12 +8,12 @@
Description
-----------
-This algorithm allows the loading, reduction, and analysis of data obtained using Deep Inelastic Neutron Scattering (DINS), also referred to as Neutron Compton Scattering (NCS), at the VESUVIO spectrometer.
+This algorithm allows the loading, reduction, and analysis of data obtained using Deep Inelastic Neutron Scattering (DINS), also referred to as Neutron Compton Scattering (NCS), at the VESUVIO spectrometer.
The algorithm has been developed by the VESUVIO Instrument Scientists, Giovanni Romanelli and Matthew Krzystyniak.
A previous version of the algorithm was described in: G. Romanelli et al.; Journal of Physics: Conf. Series 1055 (2018) 012016.
-DINS allows the direct measurements of nuclear kinetic energies and momentum distributions, thus accessing the importance of nuclear quantum effects in condensed-matter systems, as well as the degree of anisotropy and anharmonicity in the local potentials affecting nuclei.
-DINS data appear as a collection of mass-resolved peaks (Neutron Compton Profiles, NCPs), that are fitted independently in the time-of-flight spectra, using the formalism of the Impulse Approximation and the y-scaling introduced by G. B. West.
+DINS allows the direct measurements of nuclear kinetic energies and momentum distributions, thus accessing the importance of nuclear quantum effects in condensed-matter systems, as well as the degree of anisotropy and anharmonicity in the local potentials affecting nuclei.
+DINS data appear as a collection of mass-resolved peaks (Neutron Compton Profiles, NCPs), that are fitted independently in the time-of-flight spectra, using the formalism of the Impulse Approximation and the y-scaling introduced by G. B. West.
Additional information about DINS theory and applications can be found in the recent review:
C. Andreani et al., Advances in Physics, 66 (2017) 1-73
@@ -26,7 +26,7 @@ G. Romanelli et al., Measurement Science and Technology, 28 (2017), 095501
Warning
#######
-This algorithm is still in development.
+This algorithm is still in development.
If you encounter any problems please contact the Mantid team and the Vesuvio scientists.
Usage:
@@ -44,7 +44,7 @@ Usage:
.. testcode:: ExVesuvioAnalysis
# create table of elements
- table = CreateEmptyTableWorkspace()
+ table = CreateEmptyTableWorkspace()
table.addColumn(type="str", name="Symbol")
table.addColumn(type="double", name="Mass (a.u.)")
table.addColumn(type="double", name="Intensity lower limit")
@@ -65,7 +65,7 @@ Usage:
ConstraintsProfileScatteringCrossSection = "2.*82.03/5.51", SpectraToBeMasked = [173,174,181],
SubtractResonancesFunction = 'name=Voigt,LorentzAmp=1.,LorentzPos=284.131,LorentzFWHM=2,GaussianFWHM=3;',
YSpaceFitFunctionTies = "(c6=0., c4=0.)")
-
+
fit_results = mtd["polyethylene_H_JoY_sym_Parameters"]
print("variable", "value")
@@ -88,7 +88,7 @@ Output:
f1.A 0.080
f1.B0 0.000
Cost function value 0.200
-
+
.. categories::
.. sourcelink::
diff --git a/docs/source/algorithms/VesuvioCalculateMS-v1.rst b/docs/source/algorithms/VesuvioCalculateMS-v1.rst
index 8d767a4d48c5c550f46995bf1bf402656f4d0500..622c1c74f7f548e7987a53f41fe062fac55aeeec 100644
--- a/docs/source/algorithms/VesuvioCalculateMS-v1.rst
+++ b/docs/source/algorithms/VesuvioCalculateMS-v1.rst
@@ -32,7 +32,7 @@ Usage
height = 0.1 # y-dir (m)
width = 0.1 # x-dir (m)
thick = 0.005 # z-dir (m)
-
+
half_height, half_width, half_thick = 0.5*height, 0.5*width, 0.5*thick
xml_str = \
" <cuboid id=\"sample-shape\"> " \
diff --git a/docs/source/algorithms/ViewBOA-v1.rst b/docs/source/algorithms/ViewBOA-v1.rst
index a32bba25f598072f4e951796e86189c6853c46c5..7070cb99852b441d48e09befc8c7adcd952214e2 100644
--- a/docs/source/algorithms/ViewBOA-v1.rst
+++ b/docs/source/algorithms/ViewBOA-v1.rst
@@ -16,15 +16,15 @@ histogram *N* contains the wavelength spectrum and can be plotted using "Plot sp
.. image:: /images/ViewBOA_output_histogram61.png
:width: 30%
:alt: Wavelength spectrum.
-
+
.. image:: /images/ViewBOA_output_psdsum61.png
:width: 30%
:alt: Beam profile.
-
+
.. image:: /images/ViewBOA_output_ysum61.png
:width: 30%
:alt: Neutron TOF distribution along x-direction of detector.
-
+
Usage
-----
@@ -33,26 +33,26 @@ Usage
The following code loads a BOA file and prints out information about the wavelength distribution of the neutrons.
.. testcode:: ViewBOAEx
-
+
import numpy as np
ViewBOA(2014, 61, 6)
-
+
lamdba_distribution = mtd['histogram61'].readY(0)
lambda_values = mtd['histogram61'].readX(0)
-
+
print("The wavelength spectrum is described by {} points.".format(len(lamdba_distribution)))
print("The range covered is {0} - {1} Angstrom.".format(round(lambda_values[0], 4),round(lambda_values[-1], 4)))
print("The maximum is located at {} Angstrom.".format(round(lambda_values[np.argmax(lamdba_distribution)], 4)))
-
+
This script leads to the following output:
-
+
.. testoutput:: ViewBOAEx
The wavelength spectrum is described by 400 points.
The range covered is 0.7912 - 8.6638 Angstrom.
The maximum is located at 2.3894 Angstrom.
-
+
In addition, the three workspaces described above are available, plotting them should produce figures like the above.
.. categories::
diff --git a/docs/source/algorithms/WANDPowderReduction-v1.rst b/docs/source/algorithms/WANDPowderReduction-v1.rst
index 65f418eb3e43a582651f867867b50505cc1297f4..fa6b88cbb0b99b8796289c058c3cb8bb9ab90f01 100644
--- a/docs/source/algorithms/WANDPowderReduction-v1.rst
+++ b/docs/source/algorithms/WANDPowderReduction-v1.rst
@@ -162,7 +162,7 @@ Usage
OutputWorkspace=f'si_reduced',
Sum=True,
)
-
+
# merged ws - group output ws
WANDPowderReduction(
InputWorkspace=[si1, si2],
diff --git a/docs/source/algorithms/WorkflowAlgorithmRunner-v1.rst b/docs/source/algorithms/WorkflowAlgorithmRunner-v1.rst
index 8e471727226ce5d43f017dcf1818cd3c6535fb8e..080d812d60ae97a286869aaab58a0eeb8ea24287 100644
--- a/docs/source/algorithms/WorkflowAlgorithmRunner-v1.rst
+++ b/docs/source/algorithms/WorkflowAlgorithmRunner-v1.rst
@@ -16,10 +16,10 @@ The runs are specified in a `TableWorkspace` and given as the *SetupTable* input
Each row in the *SetupTable* corresponds to a single run of the managed algorithm. Its properties are set without modifications from the corresponding columns of the row except for special input/output columns declare in the *InputOutputMap*. For example, two independent runs of the :ref:`algm-Scale` would be specified as
======= ============== =============== ====== =========
-Id InputWorkspace OutputWorkspace Factor Operation
+Id InputWorkspace OutputWorkspace Factor Operation
======= ============== =============== ====== =========
-1st run ws1 ws1 0.42 Multiply
-2nd run ws2 scaled_ws2 100 Multiply
+1st run ws1 ws1 0.42 Multiply
+2nd run ws2 scaled_ws2 100 Multiply
======= ============== =============== ====== =========
The *Operation* column could have been omitted in the above to use the default value of the *Operation* property of `Scale`.
@@ -71,7 +71,7 @@ Usage
# This is our initial workspace. We want to scale it first by 100
# and then by 0.42
CreateSingleValuedWorkspace(OutputWorkspace='ws2', DataValue=1.0)
-
+
# Setup the runs for the Scale algorithm
setupTable = WorkspaceFactoryImpl.Instance().createTable()
setupTable.addColumn('str', 'Run name') # First column can have arbitrary name.
@@ -94,16 +94,16 @@ Usage
}
setupTable.addRow(row)
AnalysisDataServiceImpl.Instance().addOrReplace('setupTable', setupTable)
-
+
# Map OutputWorkspace to InputWorkspace
ioMap = WorkspaceFactoryImpl.Instance().createTable()
ioMap.addColumn('str', 'InputWorkspace')
ioMap.addRow({'InputWorkspace': 'OutputWorkspace'})
AnalysisDataServiceImpl.Instance().addOrReplace('ioMapTable', ioMap)
-
+
# Execute the algorithm
WorkflowAlgorithmRunner('Scale', SetupTable=setupTable, InputOutputMap=ioMap)
-
+
# Print some results
print('Original input value: {0}'.format(mtd['ws2'].dataY(0)[0]))
print('After scaling by 100: {0}'.format(mtd['scaled_ws2'].dataY(0)[0]))
diff --git a/docs/source/algorithms/XrayAbsorptionCorrection-v1.rst b/docs/source/algorithms/XrayAbsorptionCorrection-v1.rst
index 3bd0b733a5853b301d7d85caa3b4793191709dbb..e9d970b71b374aed3306451582f27fcf9684d5db 100644
--- a/docs/source/algorithms/XrayAbsorptionCorrection-v1.rst
+++ b/docs/source/algorithms/XrayAbsorptionCorrection-v1.rst
@@ -9,10 +9,10 @@
Description
-----------
-This algorithm calculates the correction factors due to the absorption of Xrays
-by the sample. This is done by determining path of an xray from a
-muon in sample to detector and using the calculated distance travelled by emitted xray in sample to
-calculate correction factor using
+This algorithm calculates the correction factors due to the absorption of Xrays
+by the sample. This is done by determining path of an xray from a
+muon in sample to detector and using the calculated distance travelled by emitted xray in sample to
+calculate correction factor using
.. math:: \exp(-absorptioncoefficient(energy) * distance)
Input Workspace Requirements
@@ -20,9 +20,9 @@ Input Workspace Requirements
The algorithm will compute the correction factors on a bin-by-bin basis for each spectrum within
the input workspace. The following assumptions on the input workspace are made:
-
+
- properties of the sample and optionally its environment have been set with :ref:`SetSample <algm-SetSample>`
-
+
- Xray Attenuation profile data is provided by using :ref:`SetSampleMaterial <algm-SetSampleMaterial>`
- Muon Implantation Profile has a single spectrum. The x data is the muon depth in cm and the y data is intensity in counts.
@@ -48,7 +48,7 @@ Usage
index = int(ylen/2) -3 + x
print("Energy(Kev) : {0:.4f},Factor : {1:.4f}".format(xdata[index],ydata[index]))
-
+
Output:
.. testoutput:: ExCylinderSample
diff --git a/docs/source/api/python/mantid/api/Algorithm.rst b/docs/source/api/python/mantid/api/Algorithm.rst
index 946d81dad6bc562d597077adbf76c5e8c4a6f82e..652ecbcd30542867d1b9dfd2931194c2450c4994 100644
--- a/docs/source/api/python/mantid/api/Algorithm.rst
+++ b/docs/source/api/python/mantid/api/Algorithm.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::Algorithm.
.. module:`mantid.api`
-.. autoclass:: mantid.api.Algorithm
+.. autoclass:: mantid.api.Algorithm
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/AlgorithmFactoryImpl.rst b/docs/source/api/python/mantid/api/AlgorithmFactoryImpl.rst
index 63c883f2a7d9306917913c81bce7f268e4e984c9..b91d78341e91cc6f493423dde7ac5784374c705f 100644
--- a/docs/source/api/python/mantid/api/AlgorithmFactoryImpl.rst
+++ b/docs/source/api/python/mantid/api/AlgorithmFactoryImpl.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::AlgorithmFactoryImpl.
.. module:`mantid.api`
-.. autoclass:: mantid.api.AlgorithmFactoryImpl
+.. autoclass:: mantid.api.AlgorithmFactoryImpl
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/AlgorithmHistory.rst b/docs/source/api/python/mantid/api/AlgorithmHistory.rst
index 64a2f86f530482799c5594d2bc9709486d814cd6..db176383e08d647fa0c6e3336fa677efeca123ef 100644
--- a/docs/source/api/python/mantid/api/AlgorithmHistory.rst
+++ b/docs/source/api/python/mantid/api/AlgorithmHistory.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::AlgorithmHistory.
.. module:`mantid.api`
-.. autoclass:: mantid.api.AlgorithmHistory
+.. autoclass:: mantid.api.AlgorithmHistory
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/AlgorithmID.rst b/docs/source/api/python/mantid/api/AlgorithmID.rst
index 04041b46f6ae4d91952c3e748fc226a1ab008f1e..9651433cc5ed6d9141f375ca1e1bab9947cf953c 100644
--- a/docs/source/api/python/mantid/api/AlgorithmID.rst
+++ b/docs/source/api/python/mantid/api/AlgorithmID.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::AlgorithmID.
.. module:`mantid.api`
-.. autoclass:: mantid.api.AlgorithmID
+.. autoclass:: mantid.api.AlgorithmID
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/AlgorithmManagerImpl.rst b/docs/source/api/python/mantid/api/AlgorithmManagerImpl.rst
index 9c2cd1a43bffa5ee8459f03149c758ce4c1f8c4b..a4c2eb6b4b1569d235f17870f2e5e4037ce187fa 100644
--- a/docs/source/api/python/mantid/api/AlgorithmManagerImpl.rst
+++ b/docs/source/api/python/mantid/api/AlgorithmManagerImpl.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::AlgorithmManagerImpl.
.. module:`mantid.api`
-.. autoclass:: mantid.api.AlgorithmManagerImpl
+.. autoclass:: mantid.api.AlgorithmManagerImpl
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/AlgorithmProperty.rst b/docs/source/api/python/mantid/api/AlgorithmProperty.rst
index 91aedcafd5b686b8a5c2f5d5ac8628c61231108c..302735ede658abaa0cc54776b1158ddc2142fd86 100644
--- a/docs/source/api/python/mantid/api/AlgorithmProperty.rst
+++ b/docs/source/api/python/mantid/api/AlgorithmProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::AlgorithmProperty.
.. module:`mantid.api`
-.. autoclass:: mantid.api.AlgorithmProperty
+.. autoclass:: mantid.api.AlgorithmProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/AlgorithmPropertyWithValue.rst b/docs/source/api/python/mantid/api/AlgorithmPropertyWithValue.rst
index 815568edacd5c896b1929ec9afc5606bc58ee372..4253be7f18e3549a537144e730691acc441d8ef6 100644
--- a/docs/source/api/python/mantid/api/AlgorithmPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/api/AlgorithmPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::AlgorithmPropertyWithValu
.. module:`mantid.api`
-.. autoclass:: mantid.api.AlgorithmPropertyWithValue
+.. autoclass:: mantid.api.AlgorithmPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/AnalysisDataServiceImpl.rst b/docs/source/api/python/mantid/api/AnalysisDataServiceImpl.rst
index 00cc4673d3069ec20235bd76002b2e4580400a03..80ff33288b00e82027bd69b7a470dd9dd4b90bc3 100644
--- a/docs/source/api/python/mantid/api/AnalysisDataServiceImpl.rst
+++ b/docs/source/api/python/mantid/api/AnalysisDataServiceImpl.rst
@@ -9,7 +9,7 @@ This is a Python binding to the C++ class Mantid::API::AnalysisDataServiceImpl.
.. module:`mantid.api`
-.. autoclass:: mantid.api.AnalysisDataServiceImpl
+.. autoclass:: mantid.api.AnalysisDataServiceImpl
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/BinEdgeAxis.rst b/docs/source/api/python/mantid/api/BinEdgeAxis.rst
index 94924675eb07a4e5325704b40e574164ddc223bd..8c35d432e93472b712af06874fe6afbc237dc2da 100644
--- a/docs/source/api/python/mantid/api/BinEdgeAxis.rst
+++ b/docs/source/api/python/mantid/api/BinEdgeAxis.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::BinEdgeAxis.
.. module:`mantid.api`
-.. autoclass:: mantid.api.BinEdgeAxis
+.. autoclass:: mantid.api.BinEdgeAxis
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/BoxController.rst b/docs/source/api/python/mantid/api/BoxController.rst
index 5dccc338fae3e6c16e43cba8c27c2e996b1ee1e4..9c48867571b8ce8e7a307b37927889743d01fc32 100644
--- a/docs/source/api/python/mantid/api/BoxController.rst
+++ b/docs/source/api/python/mantid/api/BoxController.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::BoxController.
.. module:`mantid.api`
-.. autoclass:: mantid.api.BoxController
+.. autoclass:: mantid.api.BoxController
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/CommonBinsValidator.rst b/docs/source/api/python/mantid/api/CommonBinsValidator.rst
index 2697c761822dc879b54e952bfec008dc152a9ef4..535ea567c2444ab1f8249012a7c4df7b4d06ed89 100644
--- a/docs/source/api/python/mantid/api/CommonBinsValidator.rst
+++ b/docs/source/api/python/mantid/api/CommonBinsValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::CommonBinsValidator.
.. module:`mantid.api`
-.. autoclass:: mantid.api.CommonBinsValidator
+.. autoclass:: mantid.api.CommonBinsValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/DataProcessorAlgorithm.rst b/docs/source/api/python/mantid/api/DataProcessorAlgorithm.rst
index f7dbfc62c03e6fbaf2a4200e758b093a7c60a946..d70024a9fd05cfdbb9614e9a0e27a8f022e24436 100644
--- a/docs/source/api/python/mantid/api/DataProcessorAlgorithm.rst
+++ b/docs/source/api/python/mantid/api/DataProcessorAlgorithm.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::DataProcessorAlgorithm.
.. module:`mantid.api`
-.. autoclass:: mantid.api.DataProcessorAlgorithm
+.. autoclass:: mantid.api.DataProcessorAlgorithm
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/DeprecatedAlgorithmChecker.rst b/docs/source/api/python/mantid/api/DeprecatedAlgorithmChecker.rst
index 584cb3c10ab31a691622ed6407096fca67ddadb7..5cb53c73445f32f9c1a3349325317adc7f4f8d26 100644
--- a/docs/source/api/python/mantid/api/DeprecatedAlgorithmChecker.rst
+++ b/docs/source/api/python/mantid/api/DeprecatedAlgorithmChecker.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::DeprecatedAlgorithm.
.. module:`mantid.api`
-.. autoclass:: mantid.api.DeprecatedAlgorithmChecker
+.. autoclass:: mantid.api.DeprecatedAlgorithmChecker
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/EventType.rst b/docs/source/api/python/mantid/api/EventType.rst
index 39cf0d9ce261eeba3f13a1360d93e7fdc175941c..73050e6d6e5563d7dd2baf9ce726979037b95d54 100644
--- a/docs/source/api/python/mantid/api/EventType.rst
+++ b/docs/source/api/python/mantid/api/EventType.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::EventType.
.. module:`mantid.api`
-.. autoclass:: mantid.api.EventType
+.. autoclass:: mantid.api.EventType
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/ExperimentInfo.rst b/docs/source/api/python/mantid/api/ExperimentInfo.rst
index f0dd848220970419ac751c09026180f326505007..4fc0c92d1c5edf378e0f3bcf2b536d10b8fa0a86 100644
--- a/docs/source/api/python/mantid/api/ExperimentInfo.rst
+++ b/docs/source/api/python/mantid/api/ExperimentInfo.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::ExperimentInfo.
.. module:`mantid.api`
-.. autoclass:: mantid.api.ExperimentInfo
+.. autoclass:: mantid.api.ExperimentInfo
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/ExperimentInfoValidator.rst b/docs/source/api/python/mantid/api/ExperimentInfoValidator.rst
index 1080b03df7713d50d196bdc0400e2fb7d95306f9..ccbad9502c078c3bfb7f9685f2e629e64598ea82 100644
--- a/docs/source/api/python/mantid/api/ExperimentInfoValidator.rst
+++ b/docs/source/api/python/mantid/api/ExperimentInfoValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::ExperimentInfoValidator.
.. module:`mantid.api`
-.. autoclass:: mantid.api.ExperimentInfoValidator
+.. autoclass:: mantid.api.ExperimentInfoValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/FileAction.rst b/docs/source/api/python/mantid/api/FileAction.rst
index 6a3cc2b26023e8cd17b58724c09ce83fbcded8b6..d03e799c6ba853adbdac068758d4bce6188b7e16 100644
--- a/docs/source/api/python/mantid/api/FileAction.rst
+++ b/docs/source/api/python/mantid/api/FileAction.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::FileProperty.
.. module:`mantid.api`
-.. autoclass:: mantid.api.FileAction
+.. autoclass:: mantid.api.FileAction
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/FileFinderImpl.rst b/docs/source/api/python/mantid/api/FileFinderImpl.rst
index 4ffde854f75ed21a85e8b70c920f7999b087375f..6d07637af084dba3fab8d10b2be235915035766c 100644
--- a/docs/source/api/python/mantid/api/FileFinderImpl.rst
+++ b/docs/source/api/python/mantid/api/FileFinderImpl.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::FileFinderImpl.
.. module:`mantid.api`
-.. autoclass:: mantid.api.FileFinderImpl
+.. autoclass:: mantid.api.FileFinderImpl
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/FileProperty.rst b/docs/source/api/python/mantid/api/FileProperty.rst
index 124195b82b479994243ec85d8d1ab7d40f642ac3..52493951ed7ee5b97fc956fd5dcefa5dbb46989f 100644
--- a/docs/source/api/python/mantid/api/FileProperty.rst
+++ b/docs/source/api/python/mantid/api/FileProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::FileProperty.
.. module:`mantid.api`
-.. autoclass:: mantid.api.FileProperty
+.. autoclass:: mantid.api.FileProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/FrameworkManagerImpl.rst b/docs/source/api/python/mantid/api/FrameworkManagerImpl.rst
index 6219184b659d6e6efe281fc1aec9d0bca04d97e8..11f799665edc93ad0a5ae75936ab2335939d339f 100644
--- a/docs/source/api/python/mantid/api/FrameworkManagerImpl.rst
+++ b/docs/source/api/python/mantid/api/FrameworkManagerImpl.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::FrameworkManagerImpl.
.. module:`mantid.api`
-.. autoclass:: mantid.api.FrameworkManagerImpl
+.. autoclass:: mantid.api.FrameworkManagerImpl
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/FunctionFactoryImpl.rst b/docs/source/api/python/mantid/api/FunctionFactoryImpl.rst
index 1f2da3a8d49fc0535a6b2783c46bb1c64c9a08a5..43c762ff4ef45728785bd60539602d1743c6f089 100644
--- a/docs/source/api/python/mantid/api/FunctionFactoryImpl.rst
+++ b/docs/source/api/python/mantid/api/FunctionFactoryImpl.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::FunctionFactoryImpl.
.. module:`mantid.api`
-.. autoclass:: mantid.api.FunctionFactoryImpl
+.. autoclass:: mantid.api.FunctionFactoryImpl
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/FunctionProperty.rst b/docs/source/api/python/mantid/api/FunctionProperty.rst
index 6079290a329bd664d729c38da47d264c04722ae1..1bb4691b18c24316bff8415ab9aacb56d2af3ba4 100644
--- a/docs/source/api/python/mantid/api/FunctionProperty.rst
+++ b/docs/source/api/python/mantid/api/FunctionProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::FunctionProperty.
.. module:`mantid.api`
-.. autoclass:: mantid.api.FunctionProperty
+.. autoclass:: mantid.api.FunctionProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/FunctionPropertyWithValue.rst b/docs/source/api/python/mantid/api/FunctionPropertyWithValue.rst
index 73c3ea7b75add25206b32f964503148b20f71ad6..0d91e664e603860142c1779a46c55d622ad0bc22 100644
--- a/docs/source/api/python/mantid/api/FunctionPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/api/FunctionPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::FunctionPropertyWithValue
.. module:`mantid.api`
-.. autoclass:: mantid.api.FunctionPropertyWithValue
+.. autoclass:: mantid.api.FunctionPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/HistogramValidator.rst b/docs/source/api/python/mantid/api/HistogramValidator.rst
index f7cb98a8dc22e47ba1bc8ec2bb77ad9c8d4fcbbf..1043bdbafb1fced8bc80055cd6a0dc1bc4c85af0 100644
--- a/docs/source/api/python/mantid/api/HistogramValidator.rst
+++ b/docs/source/api/python/mantid/api/HistogramValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::HistogramValidator.
.. module:`mantid.api`
-.. autoclass:: mantid.api.HistogramValidator
+.. autoclass:: mantid.api.HistogramValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/IAlgorithm.rst b/docs/source/api/python/mantid/api/IAlgorithm.rst
index ea2f0177e4ecf5400bbcbdd8a0bfbf067a3c6cfd..8f51af4b1eb740a52e41bdc60303fce123c61f3e 100644
--- a/docs/source/api/python/mantid/api/IAlgorithm.rst
+++ b/docs/source/api/python/mantid/api/IAlgorithm.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::IAlgorithm.
.. module:`mantid.api`
-.. autoclass:: mantid.api.IAlgorithm
+.. autoclass:: mantid.api.IAlgorithm
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/IEventList.rst b/docs/source/api/python/mantid/api/IEventList.rst
index 2272702fa45475734a319d96e7a94ccdbd4d213c..d88ee7877cec3d69fb9893bb861e791d6397a7d7 100644
--- a/docs/source/api/python/mantid/api/IEventList.rst
+++ b/docs/source/api/python/mantid/api/IEventList.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::IEventList.
.. module:`mantid.api`
-.. autoclass:: mantid.api.IEventList
+.. autoclass:: mantid.api.IEventList
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/IEventWorkspace.rst b/docs/source/api/python/mantid/api/IEventWorkspace.rst
index 93576ffd0b1962bb10b6a99775c804b5f146c0bf..29bd33d29ed479c7fe4d35bd7b0f6cf8ad8cf485 100644
--- a/docs/source/api/python/mantid/api/IEventWorkspace.rst
+++ b/docs/source/api/python/mantid/api/IEventWorkspace.rst
@@ -10,7 +10,7 @@ This is a Python binding to the C++ class Mantid::API::IEventWorkspace.
.. module:`mantid.api`
-.. autoclass:: mantid.api.IEventWorkspace
+.. autoclass:: mantid.api.IEventWorkspace
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/IEventWorkspaceProperty.rst b/docs/source/api/python/mantid/api/IEventWorkspaceProperty.rst
index 9668c4cd038e99c4140516b5e2c0f6b5251d43c0..243228273550fe81543ba80e8b61d3bb75fd5683 100644
--- a/docs/source/api/python/mantid/api/IEventWorkspaceProperty.rst
+++ b/docs/source/api/python/mantid/api/IEventWorkspaceProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::WorkspaceProperty.
.. module:`mantid.api`
-.. autoclass:: mantid.api.IEventWorkspaceProperty
+.. autoclass:: mantid.api.IEventWorkspaceProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/IEventWorkspacePropertyPropertyWithValue.rst b/docs/source/api/python/mantid/api/IEventWorkspacePropertyPropertyWithValue.rst
index 8b617996f5859c0c8a4688588345e0cba00600a3..a218cfc10d3fcf350bbbd2c5ac4c4c75062b131f 100644
--- a/docs/source/api/python/mantid/api/IEventWorkspacePropertyPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/api/IEventWorkspacePropertyPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::IEventWorkspacePropertyPr
.. module:`mantid.api`
-.. autoclass:: mantid.api.IEventWorkspacePropertyPropertyWithValue
+.. autoclass:: mantid.api.IEventWorkspacePropertyPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/IFunction.rst b/docs/source/api/python/mantid/api/IFunction.rst
index 6306a0b297c74e41b14db1d67ca6be834301d36a..1e08356b7da149ac9d096be718cfa19eb10df3f4 100644
--- a/docs/source/api/python/mantid/api/IFunction.rst
+++ b/docs/source/api/python/mantid/api/IFunction.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::IFunction.
.. module:`mantid.api`
-.. autoclass:: mantid.api.IFunction
+.. autoclass:: mantid.api.IFunction
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/IFunction1D.rst b/docs/source/api/python/mantid/api/IFunction1D.rst
index ad381f84593993aa744fb5a9d0b23e687d5e1b02..66346ee2cf3213c07d690a362ebd7283f05f7462 100644
--- a/docs/source/api/python/mantid/api/IFunction1D.rst
+++ b/docs/source/api/python/mantid/api/IFunction1D.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::IFunction1D.
.. module:`mantid.api`
-.. autoclass:: mantid.api.IFunction1D
+.. autoclass:: mantid.api.IFunction1D
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/IMDEventWorkspace.rst b/docs/source/api/python/mantid/api/IMDEventWorkspace.rst
index c28c6cc7c7fac4179185c586d5d20c26cad82580..2c1cc5abc484224f7b8709fd8468510693aa0506 100644
--- a/docs/source/api/python/mantid/api/IMDEventWorkspace.rst
+++ b/docs/source/api/python/mantid/api/IMDEventWorkspace.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::IMDEventWorkspace.
.. module:`mantid.api`
-.. autoclass:: mantid.api.IMDEventWorkspace
+.. autoclass:: mantid.api.IMDEventWorkspace
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/IMDHistoWorkspace.rst b/docs/source/api/python/mantid/api/IMDHistoWorkspace.rst
index e5112da098f57b11ba3dda6aa913775e5c627516..f1b0eb08aa158c37a25286adef11e171c6831193 100644
--- a/docs/source/api/python/mantid/api/IMDHistoWorkspace.rst
+++ b/docs/source/api/python/mantid/api/IMDHistoWorkspace.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::IMDHistoWorkspace.
.. module:`mantid.api`
-.. autoclass:: mantid.api.IMDHistoWorkspace
+.. autoclass:: mantid.api.IMDHistoWorkspace
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/IMDHistoWorkspaceProperty.rst b/docs/source/api/python/mantid/api/IMDHistoWorkspaceProperty.rst
index 06a1da7444e8726a88229c7156433fbd93138688..da7d460d8f95bee0f2ffcc1c4caa53377332ec86 100644
--- a/docs/source/api/python/mantid/api/IMDHistoWorkspaceProperty.rst
+++ b/docs/source/api/python/mantid/api/IMDHistoWorkspaceProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::WorkspaceProperty.
.. module:`mantid.api`
-.. autoclass:: mantid.api.IMDHistoWorkspaceProperty
+.. autoclass:: mantid.api.IMDHistoWorkspaceProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/IMDHistoWorkspacePropertyPropertyWithValue.rst b/docs/source/api/python/mantid/api/IMDHistoWorkspacePropertyPropertyWithValue.rst
index 80d831ea764faf7f0c035efbc813fa70f2546900..62ec2832c55130a57295dbfe0d609b889ae193e1 100644
--- a/docs/source/api/python/mantid/api/IMDHistoWorkspacePropertyPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/api/IMDHistoWorkspacePropertyPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::IMDHistoWorkspaceProperty
.. module:`mantid.api`
-.. autoclass:: mantid.api.IMDHistoWorkspacePropertyPropertyWithValue
+.. autoclass:: mantid.api.IMDHistoWorkspacePropertyPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/IMDWorkspace.rst b/docs/source/api/python/mantid/api/IMDWorkspace.rst
index 5fa073fd5d583b8d64b3243999f204f9be0e6872..ecbf4e74918f11bace0ae668017c163f53acd214 100644
--- a/docs/source/api/python/mantid/api/IMDWorkspace.rst
+++ b/docs/source/api/python/mantid/api/IMDWorkspace.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::IMDWorkspace.
.. module:`mantid.api`
-.. autoclass:: mantid.api.IMDWorkspace
+.. autoclass:: mantid.api.IMDWorkspace
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/IPeak.rst b/docs/source/api/python/mantid/api/IPeak.rst
index a21314871654c6e6c9c3d4e51fd65c4b4a8506d6..b0dd848cd1e008fd1b97ea5983fcf1b1c8d6b855 100644
--- a/docs/source/api/python/mantid/api/IPeak.rst
+++ b/docs/source/api/python/mantid/api/IPeak.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::IPeak.
.. module:`mantid.api`
-.. autoclass:: mantid.api.IPeak
+.. autoclass:: mantid.api.IPeak
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/IPeakFunction.rst b/docs/source/api/python/mantid/api/IPeakFunction.rst
index cea35fedbe6afad189f8010c47537128aa04e1b2..ef55b9c06a20ee627240c6dfaf66af37a372bc9b 100644
--- a/docs/source/api/python/mantid/api/IPeakFunction.rst
+++ b/docs/source/api/python/mantid/api/IPeakFunction.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::IPeakFunction.
.. module:`mantid.api`
-.. autoclass:: mantid.api.IPeakFunction
+.. autoclass:: mantid.api.IPeakFunction
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/IPeaksWorkspace.rst b/docs/source/api/python/mantid/api/IPeaksWorkspace.rst
index eb28217de03f33e9abaadd81750e2b60a8184cd9..b7b1a2c92ed464ace80191a3b8f9ea1e12a2d01c 100644
--- a/docs/source/api/python/mantid/api/IPeaksWorkspace.rst
+++ b/docs/source/api/python/mantid/api/IPeaksWorkspace.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::IPeaksWorkspace.
.. module:`mantid.api`
-.. autoclass:: mantid.api.IPeaksWorkspace
+.. autoclass:: mantid.api.IPeaksWorkspace
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/ISpectrum.rst b/docs/source/api/python/mantid/api/ISpectrum.rst
index c8a5911f25c42bd20128c568cc92c34ec84d6b8d..7e451fe244644b1d3bfb37fadd395e2533f51f38 100644
--- a/docs/source/api/python/mantid/api/ISpectrum.rst
+++ b/docs/source/api/python/mantid/api/ISpectrum.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::ISpectrum.
.. module:`mantid.api`
-.. autoclass:: mantid.api.ISpectrum
+.. autoclass:: mantid.api.ISpectrum
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/ITableWorkspace.rst b/docs/source/api/python/mantid/api/ITableWorkspace.rst
index 2065d1496957aa5c26461c86f9f2a229c51aee15..a99d58737effd68987865218afbbe4701c154cf9 100644
--- a/docs/source/api/python/mantid/api/ITableWorkspace.rst
+++ b/docs/source/api/python/mantid/api/ITableWorkspace.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::ITableWorkspace.
.. module:`mantid.api`
-.. autoclass:: mantid.api.ITableWorkspace
+.. autoclass:: mantid.api.ITableWorkspace
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/ITableWorkspaceProperty.rst b/docs/source/api/python/mantid/api/ITableWorkspaceProperty.rst
index 74140b09917318cae1e8afaa1481458d57338fe7..b3df26f9027cc029a83aa66035e487ce3d71e930 100644
--- a/docs/source/api/python/mantid/api/ITableWorkspaceProperty.rst
+++ b/docs/source/api/python/mantid/api/ITableWorkspaceProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::WorkspaceProperty.
.. module:`mantid.api`
-.. autoclass:: mantid.api.ITableWorkspaceProperty
+.. autoclass:: mantid.api.ITableWorkspaceProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/ITableWorkspacePropertyPropertyWithValue.rst b/docs/source/api/python/mantid/api/ITableWorkspacePropertyPropertyWithValue.rst
index b3e78603f85030d22152cd3a0ab3081111bf3a41..f662be23db31c4c99b10853ec98bac89dfff94f4 100644
--- a/docs/source/api/python/mantid/api/ITableWorkspacePropertyPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/api/ITableWorkspacePropertyPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::ITableWorkspacePropertyPr
.. module:`mantid.api`
-.. autoclass:: mantid.api.ITableWorkspacePropertyPropertyWithValue
+.. autoclass:: mantid.api.ITableWorkspacePropertyPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/IWorkspaceProperty.rst b/docs/source/api/python/mantid/api/IWorkspaceProperty.rst
index 317987b6fbd9883eb02fda95d3577a02c1a60df7..be5e1e25ab9af859352cb103c2aa9893288148ed 100644
--- a/docs/source/api/python/mantid/api/IWorkspaceProperty.rst
+++ b/docs/source/api/python/mantid/api/IWorkspaceProperty.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::WorkspaceProperty.
.. module:`mantid.api`
-.. autoclass:: mantid.api.IWorkspaceProperty
+.. autoclass:: mantid.api.IWorkspaceProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/InstrumentValidator.rst b/docs/source/api/python/mantid/api/InstrumentValidator.rst
index dea355bba6a95b91d017b668b0e6e9d96b055616..d471d96dd9f2c21a77e678bc462cf36934f87b3b 100644
--- a/docs/source/api/python/mantid/api/InstrumentValidator.rst
+++ b/docs/source/api/python/mantid/api/InstrumentValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::InstrumentValidator.
.. module:`mantid.api`
-.. autoclass:: mantid.api.InstrumentValidator
+.. autoclass:: mantid.api.InstrumentValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/Jacobian.rst b/docs/source/api/python/mantid/api/Jacobian.rst
index afbc351460c2db34c6622c7fabea50940726df50..69ade524f62f468933bc8db8f9ce809556a58ab9 100644
--- a/docs/source/api/python/mantid/api/Jacobian.rst
+++ b/docs/source/api/python/mantid/api/Jacobian.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::Jacobian.
.. module:`mantid.api`
-.. autoclass:: mantid.api.Jacobian
+.. autoclass:: mantid.api.Jacobian
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/LockMode.rst b/docs/source/api/python/mantid/api/LockMode.rst
index 356acdf37cb2519c82d9a15901a6e846a27bdfbc..5028c53583cf6b3b330bfb028f74d0985f2f6760 100644
--- a/docs/source/api/python/mantid/api/LockMode.rst
+++ b/docs/source/api/python/mantid/api/LockMode.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::LockMode.
.. module:`mantid.api`
-.. autoclass:: mantid.api.LockMode
+.. autoclass:: mantid.api.LockMode
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/MDGeometry.rst b/docs/source/api/python/mantid/api/MDGeometry.rst
index c3b6c292364496a33158a904ce0a3cf77e2b2198..f2a6d8a8b5caff13d51d32d0d07fc5c1b6cc15d3 100644
--- a/docs/source/api/python/mantid/api/MDGeometry.rst
+++ b/docs/source/api/python/mantid/api/MDGeometry.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::MDGeometry.
.. module:`mantid.api`
-.. autoclass:: mantid.api.MDGeometry
+.. autoclass:: mantid.api.MDGeometry
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/MDNormalization.rst b/docs/source/api/python/mantid/api/MDNormalization.rst
index 43005deb9a34821a3a43fab296790c531d493cb0..8b59e141648fa2829a10f309db2b7fba0fce42b7 100644
--- a/docs/source/api/python/mantid/api/MDNormalization.rst
+++ b/docs/source/api/python/mantid/api/MDNormalization.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::MDNormalization.
.. module:`mantid.api`
-.. autoclass:: mantid.api.MDNormalization
+.. autoclass:: mantid.api.MDNormalization
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/MantidAxis.rst b/docs/source/api/python/mantid/api/MantidAxis.rst
index 39374c824a6a9558ab39aaec001e9b7126d7246b..f871c17d561fe071fbc93014aec8af23a7dbc567 100644
--- a/docs/source/api/python/mantid/api/MantidAxis.rst
+++ b/docs/source/api/python/mantid/api/MantidAxis.rst
@@ -9,7 +9,7 @@ This is a Python binding to the C++ class Mantid::API::MantidAxis.
.. module:`mantid.api`
-.. autoclass:: mantid.api.MantidAxis
+.. autoclass:: mantid.api.MantidAxis
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/MatrixWorkspace.rst b/docs/source/api/python/mantid/api/MatrixWorkspace.rst
index 2e29a3e6e89296c7f3c9bb4b1639d3fa5d92fce4..f888e31d9d272ed211ba2d76c93c5c89ebea3677 100644
--- a/docs/source/api/python/mantid/api/MatrixWorkspace.rst
+++ b/docs/source/api/python/mantid/api/MatrixWorkspace.rst
@@ -10,7 +10,7 @@ This is a Python binding to the C++ class Mantid::API::MatrixWorkspace.
.. module:`mantid.api`
-.. autoclass:: mantid.api.MatrixWorkspace
+.. autoclass:: mantid.api.MatrixWorkspace
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/MatrixWorkspaceProperty.rst b/docs/source/api/python/mantid/api/MatrixWorkspaceProperty.rst
index cfac0149d6d296583c4c84362c78044c33f7334e..756abdd430ee08dbbc62567f36e7649e52538714 100644
--- a/docs/source/api/python/mantid/api/MatrixWorkspaceProperty.rst
+++ b/docs/source/api/python/mantid/api/MatrixWorkspaceProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::WorkspaceProperty.
.. module:`mantid.api`
-.. autoclass:: mantid.api.MatrixWorkspaceProperty
+.. autoclass:: mantid.api.MatrixWorkspaceProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/MatrixWorkspacePropertyPropertyWithValue.rst b/docs/source/api/python/mantid/api/MatrixWorkspacePropertyPropertyWithValue.rst
index a2a72aa00d306aa5275680cacf16a2fa985a12ba..4c1be095205ea579cb68439283bec8b8c97c035e 100644
--- a/docs/source/api/python/mantid/api/MatrixWorkspacePropertyPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/api/MatrixWorkspacePropertyPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::MatrixWorkspacePropertyPr
.. module:`mantid.api`
-.. autoclass:: mantid.api.MatrixWorkspacePropertyPropertyWithValue
+.. autoclass:: mantid.api.MatrixWorkspacePropertyPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/MatrixWorkspaceValidator.rst b/docs/source/api/python/mantid/api/MatrixWorkspaceValidator.rst
index 706608f9effca7da753b4ae999afc343469238da..0cd1c6a26becbb014b554291cfb734b7020772b8 100644
--- a/docs/source/api/python/mantid/api/MatrixWorkspaceValidator.rst
+++ b/docs/source/api/python/mantid/api/MatrixWorkspaceValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::MatrixWorkspaceValidator.
.. module:`mantid.api`
-.. autoclass:: mantid.api.MatrixWorkspaceValidator
+.. autoclass:: mantid.api.MatrixWorkspaceValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/MultipleExperimentInfos.rst b/docs/source/api/python/mantid/api/MultipleExperimentInfos.rst
index 9da85b12a807600e7b296b74ab5f5e927f69dd13..2459d9dc9ceed43ce6154dc5a98e0d4b90dee68d 100644
--- a/docs/source/api/python/mantid/api/MultipleExperimentInfos.rst
+++ b/docs/source/api/python/mantid/api/MultipleExperimentInfos.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::MultipleExperimentInfos.
.. module:`mantid.api`
-.. autoclass:: mantid.api.MultipleExperimentInfos
+.. autoclass:: mantid.api.MultipleExperimentInfos
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/NumericAxis.rst b/docs/source/api/python/mantid/api/NumericAxis.rst
index 953fd5622f041681a88bb6ee2ae5e98583b61821..d8a70d5d84834827629048c103fc6ea64607a3dd 100644
--- a/docs/source/api/python/mantid/api/NumericAxis.rst
+++ b/docs/source/api/python/mantid/api/NumericAxis.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::NumericAxis.
.. module:`mantid.api`
-.. autoclass:: mantid.api.NumericAxis
+.. autoclass:: mantid.api.NumericAxis
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/NumericAxisValidator.rst b/docs/source/api/python/mantid/api/NumericAxisValidator.rst
index ebd0b0327c18e464d3df9169a86f0869f10d253b..9cd1252b154785eb4647ebd68694acf5bfc691b6 100644
--- a/docs/source/api/python/mantid/api/NumericAxisValidator.rst
+++ b/docs/source/api/python/mantid/api/NumericAxisValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::NumericAxisValidator.
.. module:`mantid.api`
-.. autoclass:: mantid.api.NumericAxisValidator
+.. autoclass:: mantid.api.NumericAxisValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/Progress.rst b/docs/source/api/python/mantid/api/Progress.rst
index 859b6394b58e9a7d7f33aa0afb6f079a912ab910..348643be160bc504b60f39a7288868cf55eceb69 100644
--- a/docs/source/api/python/mantid/api/Progress.rst
+++ b/docs/source/api/python/mantid/api/Progress.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::Progress.
.. module:`mantid.api`
-.. autoclass:: mantid.api.Progress
+.. autoclass:: mantid.api.Progress
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/PropertyMode.rst b/docs/source/api/python/mantid/api/PropertyMode.rst
index 5519aebdd82962b12d7f7f153f74badc9f33a5dd..476f3a8be0b844fb801d7c97ae366d707b7d5375 100644
--- a/docs/source/api/python/mantid/api/PropertyMode.rst
+++ b/docs/source/api/python/mantid/api/PropertyMode.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::PropertyMode.
.. module:`mantid.api`
-.. autoclass:: mantid.api.PropertyMode
+.. autoclass:: mantid.api.PropertyMode
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/RawCountValidator.rst b/docs/source/api/python/mantid/api/RawCountValidator.rst
index 0c1e986ba0614a8b676cc34f0138a58a69d9a04b..b78275fa37c8f4f89e487332f4b2af07575562dd 100644
--- a/docs/source/api/python/mantid/api/RawCountValidator.rst
+++ b/docs/source/api/python/mantid/api/RawCountValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::RawCountValidator.
.. module:`mantid.api`
-.. autoclass:: mantid.api.RawCountValidator
+.. autoclass:: mantid.api.RawCountValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/Run.rst b/docs/source/api/python/mantid/api/Run.rst
index 1a51506bbff7a15d05abc1204e3b9792f35cbff3..976ffc76a698870e42f3fbdfe328ad7b533b34f4 100644
--- a/docs/source/api/python/mantid/api/Run.rst
+++ b/docs/source/api/python/mantid/api/Run.rst
@@ -9,7 +9,7 @@ This is a Python binding to the C++ class Mantid::API::Run.
.. module:`mantid.api`
-.. autoclass:: mantid.api.Run
+.. autoclass:: mantid.api.Run
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/Sample.rst b/docs/source/api/python/mantid/api/Sample.rst
index 22634d087028ac719b4c5d3e4bd2ee57f8ab278c..a7dca1a2018b1b200cbbd1554f39bdfa9b685e30 100644
--- a/docs/source/api/python/mantid/api/Sample.rst
+++ b/docs/source/api/python/mantid/api/Sample.rst
@@ -9,7 +9,7 @@ This is a Python binding to the C++ class Mantid::API::Sample.
.. module:`mantid.api`
-.. autoclass:: mantid.api.Sample
+.. autoclass:: mantid.api.Sample
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/ScriptRepository.rst b/docs/source/api/python/mantid/api/ScriptRepository.rst
index ef1df92efc09c4f0ed91f025d2882ace5e63efd8..6cb6fc02084601da5ec2b081c5bff1772399d891 100644
--- a/docs/source/api/python/mantid/api/ScriptRepository.rst
+++ b/docs/source/api/python/mantid/api/ScriptRepository.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::ScriptRepository.
.. module:`mantid.api`
-.. autoclass:: mantid.api.ScriptRepository
+.. autoclass:: mantid.api.ScriptRepository
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/ScriptRepositoryFactory.rst b/docs/source/api/python/mantid/api/ScriptRepositoryFactory.rst
index ff4f39df068fa8a45facfbf5b399da5240146dea..ecafe53255c67149f310033e8f485646ca7fbb78 100644
--- a/docs/source/api/python/mantid/api/ScriptRepositoryFactory.rst
+++ b/docs/source/api/python/mantid/api/ScriptRepositoryFactory.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::ScriptRepositoryFactory.
.. module:`mantid.api`
-.. autoclass:: mantid.api.ScriptRepositoryFactory
+.. autoclass:: mantid.api.ScriptRepositoryFactory
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/SpectraAxisValidator.rst b/docs/source/api/python/mantid/api/SpectraAxisValidator.rst
index 7cf2102718696c3dcbf369d3ca1e770afd26dc51..825fa764e06ba00060a4386338f1baad053a63cf 100644
--- a/docs/source/api/python/mantid/api/SpectraAxisValidator.rst
+++ b/docs/source/api/python/mantid/api/SpectraAxisValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::SpectraAxisValidator.
.. module:`mantid.api`
-.. autoclass:: mantid.api.SpectraAxisValidator
+.. autoclass:: mantid.api.SpectraAxisValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/TextAxis.rst b/docs/source/api/python/mantid/api/TextAxis.rst
index 362d35f62029b50557ad06afa5e491effeadb3e2..f08611b2b565a0a39ec2c8be3dc2b03d678d730e 100644
--- a/docs/source/api/python/mantid/api/TextAxis.rst
+++ b/docs/source/api/python/mantid/api/TextAxis.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::TextAxis.
.. module:`mantid.api`
-.. autoclass:: mantid.api.TextAxis
+.. autoclass:: mantid.api.TextAxis
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/VectorVectorStringPropertyWithValue.rst b/docs/source/api/python/mantid/api/VectorVectorStringPropertyWithValue.rst
index 7dfbc084cb8e0d9015aff238c53242dd8d8f3493..769911e66060cc618eb3fa0e33d62721294c943a 100644
--- a/docs/source/api/python/mantid/api/VectorVectorStringPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/api/VectorVectorStringPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::VectorVectorStringPropert
.. module:`mantid.api`
-.. autoclass:: mantid.api.VectorVectorStringPropertyWithValue
+.. autoclass:: mantid.api.VectorVectorStringPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/Workspace.rst b/docs/source/api/python/mantid/api/Workspace.rst
index 4e3837ad20afa7f8409cb485bd3cb77813849b42..6c25a21753a41f380ae10e44c30240bcf822fb2f 100644
--- a/docs/source/api/python/mantid/api/Workspace.rst
+++ b/docs/source/api/python/mantid/api/Workspace.rst
@@ -10,7 +10,7 @@ This is a Python binding to the C++ class Mantid::API::Workspace.
.. module:`mantid.api`
-.. autoclass:: mantid.api.Workspace
+.. autoclass:: mantid.api.Workspace
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/WorkspaceFactoryImpl.rst b/docs/source/api/python/mantid/api/WorkspaceFactoryImpl.rst
index 8946d7111a2c63bf5fb09a6e753ff493a734c72f..14deb3a68ea0cdc993132efd637f3be72f3730a2 100644
--- a/docs/source/api/python/mantid/api/WorkspaceFactoryImpl.rst
+++ b/docs/source/api/python/mantid/api/WorkspaceFactoryImpl.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::API::WorkspaceFactoryImpl.
.. module:`mantid.api`
-.. autoclass:: mantid.api.WorkspaceFactoryImpl
+.. autoclass:: mantid.api.WorkspaceFactoryImpl
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/WorkspaceGroup.rst b/docs/source/api/python/mantid/api/WorkspaceGroup.rst
index 0b08e41d1baa64680b3eebb55b81d8f85e001b09..b6c74ff98ca03b201313c03b74b449a00c998e85 100644
--- a/docs/source/api/python/mantid/api/WorkspaceGroup.rst
+++ b/docs/source/api/python/mantid/api/WorkspaceGroup.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::WorkspaceGroup.
.. module:`mantid.api`
-.. autoclass:: mantid.api.WorkspaceGroup
+.. autoclass:: mantid.api.WorkspaceGroup
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/WorkspaceGroupProperty.rst b/docs/source/api/python/mantid/api/WorkspaceGroupProperty.rst
index 6aeb719c24ecf50024993e1381459ae87d06e7af..ad04df856b3efc1c356304378f313c0a787db4e9 100644
--- a/docs/source/api/python/mantid/api/WorkspaceGroupProperty.rst
+++ b/docs/source/api/python/mantid/api/WorkspaceGroupProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::WorkspaceGroupProperty.
.. module:`mantid.api`
-.. autoclass:: mantid.api.WorkspaceGroupProperty
+.. autoclass:: mantid.api.WorkspaceGroupProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/WorkspaceGroupPropertyPropertyWithValue.rst b/docs/source/api/python/mantid/api/WorkspaceGroupPropertyPropertyWithValue.rst
index 2ace041a204a0f9ebb0029dcb3d91cc7b0438ffa..a11067acfe37bb4519722a9521eea5c8d0c90364 100644
--- a/docs/source/api/python/mantid/api/WorkspaceGroupPropertyPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/api/WorkspaceGroupPropertyPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::WorkspaceGroupPropertyPro
.. module:`mantid.api`
-.. autoclass:: mantid.api.WorkspaceGroupPropertyPropertyWithValue
+.. autoclass:: mantid.api.WorkspaceGroupPropertyPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/WorkspaceHistory.rst b/docs/source/api/python/mantid/api/WorkspaceHistory.rst
index 48bd42d9f26870d3fa63142e20732f2c2cceade8..19a8d50e1a02052ffcaab82ec17a7e86120875da 100644
--- a/docs/source/api/python/mantid/api/WorkspaceHistory.rst
+++ b/docs/source/api/python/mantid/api/WorkspaceHistory.rst
@@ -9,7 +9,7 @@ This is a Python binding to the C++ class Mantid::API::WorkspaceHistory.
.. module:`mantid.api`
-.. autoclass:: mantid.api.WorkspaceHistory
+.. autoclass:: mantid.api.WorkspaceHistory
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/WorkspaceProperty.rst b/docs/source/api/python/mantid/api/WorkspaceProperty.rst
index 373ba96e882bad30869f870ff5a94f2215568330..328ff19d917cdbe79ea6bfbcb99680e4d9e0c99f 100644
--- a/docs/source/api/python/mantid/api/WorkspaceProperty.rst
+++ b/docs/source/api/python/mantid/api/WorkspaceProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::WorkspaceProperty.
.. module:`mantid.api`
-.. autoclass:: mantid.api.WorkspaceProperty
+.. autoclass:: mantid.api.WorkspaceProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/WorkspacePropertyPropertyWithValue.rst b/docs/source/api/python/mantid/api/WorkspacePropertyPropertyWithValue.rst
index e7f7fba109690039b7fd5bd116ab1a06efa3aea1..6676f30c6298e1f719ea155b961e0a2158f236e7 100644
--- a/docs/source/api/python/mantid/api/WorkspacePropertyPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/api/WorkspacePropertyPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::WorkspacePropertyProperty
.. module:`mantid.api`
-.. autoclass:: mantid.api.WorkspacePropertyPropertyWithValue
+.. autoclass:: mantid.api.WorkspacePropertyPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/api/WorkspaceUnitValidator.rst b/docs/source/api/python/mantid/api/WorkspaceUnitValidator.rst
index 28482b04af36d7f01bb46b209d8b60ee3f002074..c6d1d34020fb6e09809a5b4f528b9bd801de9ab9 100644
--- a/docs/source/api/python/mantid/api/WorkspaceUnitValidator.rst
+++ b/docs/source/api/python/mantid/api/WorkspaceUnitValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::API::WorkspaceUnitValidator.
.. module:`mantid.api`
-.. autoclass:: mantid.api.WorkspaceUnitValidator
+.. autoclass:: mantid.api.WorkspaceUnitValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/AngleUnits.rst b/docs/source/api/python/mantid/geometry/AngleUnits.rst
index 409051953ff0506f9ca89e5e5992550f744975c4..80b7b7c6931a9d7f1dc8e7ef3ee595280f54a718 100644
--- a/docs/source/api/python/mantid/geometry/AngleUnits.rst
+++ b/docs/source/api/python/mantid/geometry/AngleUnits.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Geometry::AngleUnits.
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.AngleUnits
+.. autoclass:: mantid.geometry.AngleUnits
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/BoundingBox.rst b/docs/source/api/python/mantid/geometry/BoundingBox.rst
index 1d1077a1f8235f03ba5ad5f70b0a4dc538ae273a..d9cd41d7f993caa257f65d2867b2122ce8650ebf 100644
--- a/docs/source/api/python/mantid/geometry/BoundingBox.rst
+++ b/docs/source/api/python/mantid/geometry/BoundingBox.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Geometry::BoundingBox.
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.BoundingBox
+.. autoclass:: mantid.geometry.BoundingBox
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/CompAssembly.rst b/docs/source/api/python/mantid/geometry/CompAssembly.rst
index 5ac09f0895862ed27bc7e446870393c7479246d4..c397fd966a3e40f2e14d5472515fa134bb2e0ef6 100644
--- a/docs/source/api/python/mantid/geometry/CompAssembly.rst
+++ b/docs/source/api/python/mantid/geometry/CompAssembly.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Geometry::CompAssembly.
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.CompAssembly
+.. autoclass:: mantid.geometry.CompAssembly
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/Component.rst b/docs/source/api/python/mantid/geometry/Component.rst
index f977b6ab52db90cb9d27bc6a2c2940338eaf946f..af289b717f5ed69ce77773283105831c7461dcde 100644
--- a/docs/source/api/python/mantid/geometry/Component.rst
+++ b/docs/source/api/python/mantid/geometry/Component.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Geometry::Component.
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.Component
+.. autoclass:: mantid.geometry.Component
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/Detector.rst b/docs/source/api/python/mantid/geometry/Detector.rst
index c657b1eb586b8f9bad43e9558157e05c85e60133..7a98c9e0da248829af6f0141d413811222c49bf3 100644
--- a/docs/source/api/python/mantid/geometry/Detector.rst
+++ b/docs/source/api/python/mantid/geometry/Detector.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Geometry::Detector.
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.Detector
+.. autoclass:: mantid.geometry.Detector
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/DetectorGroup.rst b/docs/source/api/python/mantid/geometry/DetectorGroup.rst
index b8bb0a44af6edebe613f23b878728677e7a0af66..0276433eb731bc34ade5ee7e160489d8d7bec7d1 100644
--- a/docs/source/api/python/mantid/geometry/DetectorGroup.rst
+++ b/docs/source/api/python/mantid/geometry/DetectorGroup.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Geometry::DetectorGroup.
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.DetectorGroup
+.. autoclass:: mantid.geometry.DetectorGroup
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/Goniometer.rst b/docs/source/api/python/mantid/geometry/Goniometer.rst
index b98a0f9708b911aa7cd7f64653083b4925e18b80..34c7cd198b3304320c09ce8cb57a391921e1a558 100644
--- a/docs/source/api/python/mantid/geometry/Goniometer.rst
+++ b/docs/source/api/python/mantid/geometry/Goniometer.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Geometry::Goniometer.
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.Goniometer
+.. autoclass:: mantid.geometry.Goniometer
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/GridDetectorPixel.rst b/docs/source/api/python/mantid/geometry/GridDetectorPixel.rst
index a9f278412d030191b8f9f67ce1fb752245e39785..1b90a86901c80be8ef8b648e5b9abd4d88cb6311 100644
--- a/docs/source/api/python/mantid/geometry/GridDetectorPixel.rst
+++ b/docs/source/api/python/mantid/geometry/GridDetectorPixel.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Geometry::GridDetectorPixel.
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.GridDetectorPixel
+.. autoclass:: mantid.geometry.GridDetectorPixel
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/ICompAssembly.rst b/docs/source/api/python/mantid/geometry/ICompAssembly.rst
index 7ca2fe1ed122a0db0c32192d406d97754c559d5e..930e007821ffb86deda353816331f7c2fd9334f8 100644
--- a/docs/source/api/python/mantid/geometry/ICompAssembly.rst
+++ b/docs/source/api/python/mantid/geometry/ICompAssembly.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Geometry::ICompAssembly.
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.ICompAssembly
+.. autoclass:: mantid.geometry.ICompAssembly
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/IComponent.rst b/docs/source/api/python/mantid/geometry/IComponent.rst
index 19b449c4a947968dd7d50bb66bcaed5a57a93e34..42163dd8dcbde5939ddbe050aa120e482ab70932 100644
--- a/docs/source/api/python/mantid/geometry/IComponent.rst
+++ b/docs/source/api/python/mantid/geometry/IComponent.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Geometry::IComponent.
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.IComponent
+.. autoclass:: mantid.geometry.IComponent
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/IDetector.rst b/docs/source/api/python/mantid/geometry/IDetector.rst
index c1db0e2487a95e7eaa3c87789e711076643d8763..5fcab9d8a444e09c9d780dbb6aebd2f094ad542d 100644
--- a/docs/source/api/python/mantid/geometry/IDetector.rst
+++ b/docs/source/api/python/mantid/geometry/IDetector.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Geometry::IDetector.
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.IDetector
+.. autoclass:: mantid.geometry.IDetector
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/IMDDimension.rst b/docs/source/api/python/mantid/geometry/IMDDimension.rst
index 168696c3ce5f938c6fd7b9d6b7e405a9d7debc5a..44a6d0219e290c1eca4d67d4ff13e253c860c91d 100644
--- a/docs/source/api/python/mantid/geometry/IMDDimension.rst
+++ b/docs/source/api/python/mantid/geometry/IMDDimension.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Geometry::IMDDimension.
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.IMDDimension
+.. autoclass:: mantid.geometry.IMDDimension
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/IObjCompAssembly.rst b/docs/source/api/python/mantid/geometry/IObjCompAssembly.rst
index d052f660c768bd3bf1ddfd9e6b4706c9d2b94944..361d61aa872d8eb28b035ec8790dea2d4e36cb8c 100644
--- a/docs/source/api/python/mantid/geometry/IObjCompAssembly.rst
+++ b/docs/source/api/python/mantid/geometry/IObjCompAssembly.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Geometry::ObjCompAssembly.
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.IObjCompAssembly
+.. autoclass:: mantid.geometry.IObjCompAssembly
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/IObjComponent.rst b/docs/source/api/python/mantid/geometry/IObjComponent.rst
index 1ed300ff7a7e79f38aa3168a07ee9b443745ed8f..ad329d4ca5fbdb3759ac8197303d1f6d08ad1457 100644
--- a/docs/source/api/python/mantid/geometry/IObjComponent.rst
+++ b/docs/source/api/python/mantid/geometry/IObjComponent.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Geometry::IObjComponent.
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.IObjComponent
+.. autoclass:: mantid.geometry.IObjComponent
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/IObject.rst b/docs/source/api/python/mantid/geometry/IObject.rst
index e2f503ce0e765db5cdb8ada8cd3f956a7316def1..214a10ecb6fc2d46a38881e6e44466a0bb9c8731 100644
--- a/docs/source/api/python/mantid/geometry/IObject.rst
+++ b/docs/source/api/python/mantid/geometry/IObject.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Geometry::Object.
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.IObject
+.. autoclass:: mantid.geometry.IObject
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/Instrument.rst b/docs/source/api/python/mantid/geometry/Instrument.rst
index 098f95811fd82dfe9bcac0b23f4e3119b52c01c6..10dcc80cd2d996b89204f79eb03301916d47b69f 100644
--- a/docs/source/api/python/mantid/geometry/Instrument.rst
+++ b/docs/source/api/python/mantid/geometry/Instrument.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Geometry::Instrument.
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.Instrument
+.. autoclass:: mantid.geometry.Instrument
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/ObjComponent.rst b/docs/source/api/python/mantid/geometry/ObjComponent.rst
index 138547515ebc9d169bb89bbcc7241f240788b355..ea5506e26a20668570f7079470fc0624845bc309 100644
--- a/docs/source/api/python/mantid/geometry/ObjComponent.rst
+++ b/docs/source/api/python/mantid/geometry/ObjComponent.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Geometry::ObjComponent.
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.ObjComponent
+.. autoclass:: mantid.geometry.ObjComponent
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/PointingAlong.rst b/docs/source/api/python/mantid/geometry/PointingAlong.rst
index 6e88ff305338ede298124756f81976deee2f93c4..881c1f3125e27f34bccd8d9db7b0627de86be85d 100644
--- a/docs/source/api/python/mantid/geometry/PointingAlong.rst
+++ b/docs/source/api/python/mantid/geometry/PointingAlong.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Geometry::PointingAlong.
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.PointingAlong
+.. autoclass:: mantid.geometry.PointingAlong
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/RectangularDetector.rst b/docs/source/api/python/mantid/geometry/RectangularDetector.rst
index 15417c9cea73057f8b7303dd0d3bb6517adfedbf..1ab0ab8294be4d2d50039eba8fe450b82915789f 100644
--- a/docs/source/api/python/mantid/geometry/RectangularDetector.rst
+++ b/docs/source/api/python/mantid/geometry/RectangularDetector.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Geometry::RectangularDetector.
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.RectangularDetector
+.. autoclass:: mantid.geometry.RectangularDetector
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/ReferenceFrame.rst b/docs/source/api/python/mantid/geometry/ReferenceFrame.rst
index 23383e2037e7c6e5ef21c964790a087e77613d8c..c5ba4b716fb6425cabb4893f4f1dd2e7ac8a123c 100644
--- a/docs/source/api/python/mantid/geometry/ReferenceFrame.rst
+++ b/docs/source/api/python/mantid/geometry/ReferenceFrame.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Geometry::ReferenceFrame.
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.ReferenceFrame
+.. autoclass:: mantid.geometry.ReferenceFrame
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/geometry/UnitCell.rst b/docs/source/api/python/mantid/geometry/UnitCell.rst
index e0461011a4015896d8045e19cf8cdb6246e0e5f7..c83ff306d4d244f5884b96555757bf3880490ea9 100644
--- a/docs/source/api/python/mantid/geometry/UnitCell.rst
+++ b/docs/source/api/python/mantid/geometry/UnitCell.rst
@@ -9,7 +9,7 @@ on this class follow naming conventions for parameters as defined in the
.. module:`mantid.geometry`
-.. autoclass:: mantid.geometry.UnitCell
+.. autoclass:: mantid.geometry.UnitCell
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/Atom.rst b/docs/source/api/python/mantid/kernel/Atom.rst
index 848890371b69db11398ed56eb55fe2d1b7e2765f..9cd71c60f8142b8bc5055f82cd3996ad34156e26 100644
--- a/docs/source/api/python/mantid/kernel/Atom.rst
+++ b/docs/source/api/python/mantid/kernel/Atom.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::PhysicalConstants::Atom.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.Atom
+.. autoclass:: mantid.kernel.Atom
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/BoolFilteredTimeSeriesProperty.rst b/docs/source/api/python/mantid/kernel/BoolFilteredTimeSeriesProperty.rst
index 3a7167ac1aa051fe6191997b7155fddbef6857ee..7f08da3eea411e8662db1f900ee94bcc3c4261c6 100644
--- a/docs/source/api/python/mantid/kernel/BoolFilteredTimeSeriesProperty.rst
+++ b/docs/source/api/python/mantid/kernel/BoolFilteredTimeSeriesProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::FilteredTimeSeriesProp
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.BoolFilteredTimeSeriesProperty
+.. autoclass:: mantid.kernel.BoolFilteredTimeSeriesProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/BoolPropertyWithValue.rst b/docs/source/api/python/mantid/kernel/BoolPropertyWithValue.rst
index a41599fb68be22398546776cf190fd4d96f0b753..2e6e7242a043819e7e03a806ec5bdffa4e22b6a9 100644
--- a/docs/source/api/python/mantid/kernel/BoolPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/kernel/BoolPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::BoolPropertyWithValue.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.BoolPropertyWithValue
+.. autoclass:: mantid.kernel.BoolPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/BoolTimeSeriesProperty.rst b/docs/source/api/python/mantid/kernel/BoolTimeSeriesProperty.rst
index 6ddc20468fc74eb957ca688f696164f4a1974de5..cf79b585ca2507badcec061af5d397ce74a18dc1 100644
--- a/docs/source/api/python/mantid/kernel/BoolTimeSeriesProperty.rst
+++ b/docs/source/api/python/mantid/kernel/BoolTimeSeriesProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::TimeSeriesProperty.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.BoolTimeSeriesProperty
+.. autoclass:: mantid.kernel.BoolTimeSeriesProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/CIntArrayProperty.rst b/docs/source/api/python/mantid/kernel/CIntArrayProperty.rst
index d9ad65ca8dc3846778e9aec1311f006e26852ee6..b4a376aaf47a561728e24addbe23eb11b7dd8e23 100644
--- a/docs/source/api/python/mantid/kernel/CIntArrayProperty.rst
+++ b/docs/source/api/python/mantid/kernel/CIntArrayProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::ArrayProperty.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.CIntArrayProperty
+.. autoclass:: mantid.kernel.CIntArrayProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/CompositeValidator.rst b/docs/source/api/python/mantid/kernel/CompositeValidator.rst
index a3d95a0d646d241f213f81a2df6536b76e3b60fa..5d2b46424d4c773fb4bb25288318bf188ebbe820 100644
--- a/docs/source/api/python/mantid/kernel/CompositeValidator.rst
+++ b/docs/source/api/python/mantid/kernel/CompositeValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::CompositeValidator.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.CompositeValidator
+.. autoclass:: mantid.kernel.CompositeValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/DataItem.rst b/docs/source/api/python/mantid/kernel/DataItem.rst
index b6d8bae897355822537e30874cea0fe9f9a92cb6..a6274418e72c26636f8cc5f61185120bf2e36091 100644
--- a/docs/source/api/python/mantid/kernel/DataItem.rst
+++ b/docs/source/api/python/mantid/kernel/DataItem.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::DataItem.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.DataItem
+.. autoclass:: mantid.kernel.DataItem
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/DeltaEMode.rst b/docs/source/api/python/mantid/kernel/DeltaEMode.rst
index d420e7d77d9fddf3b99600f80c3e823847a52d5e..b88b6a366663ae54b6ba840d570b7f336f7323b2 100644
--- a/docs/source/api/python/mantid/kernel/DeltaEMode.rst
+++ b/docs/source/api/python/mantid/kernel/DeltaEMode.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::DeltaEMode.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.DeltaEMode
+.. autoclass:: mantid.kernel.DeltaEMode
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/DeltaEModeType.rst b/docs/source/api/python/mantid/kernel/DeltaEModeType.rst
index 11861b44d72de9112457136737ea6d0c1a32c2c4..4049d89deedea84f24942ca6bcb2a3be3d8337d3 100644
--- a/docs/source/api/python/mantid/kernel/DeltaEModeType.rst
+++ b/docs/source/api/python/mantid/kernel/DeltaEModeType.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::DeltaEMode.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.DeltaEModeType
+.. autoclass:: mantid.kernel.DeltaEModeType
:members:
:undoc-members:
diff --git a/docs/source/api/python/mantid/kernel/Direction.rst b/docs/source/api/python/mantid/kernel/Direction.rst
index c97315da0b61e32ba4f3ffd9943cb13e223ffb10..8fd1e5cb58a6d8772eae5ebb1b5fc10d85b2702c 100644
--- a/docs/source/api/python/mantid/kernel/Direction.rst
+++ b/docs/source/api/python/mantid/kernel/Direction.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::Direction.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.Direction
+.. autoclass:: mantid.kernel.Direction
:members:
:undoc-members:
diff --git a/docs/source/api/python/mantid/kernel/EnabledWhenProperty.rst b/docs/source/api/python/mantid/kernel/EnabledWhenProperty.rst
index 624e72ca2495fa2b66678d748cdfb22c628ffc46..2c9cd570b16685c4502f3ac91828daeb8d236080 100644
--- a/docs/source/api/python/mantid/kernel/EnabledWhenProperty.rst
+++ b/docs/source/api/python/mantid/kernel/EnabledWhenProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::EnabledWhenProperty.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.EnabledWhenProperty
+.. autoclass:: mantid.kernel.EnabledWhenProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/FacilityInfo.rst b/docs/source/api/python/mantid/kernel/FacilityInfo.rst
index 402f05f622599c4242ddae3215917d36675a1387..d7be50f4dc66145a32f72a7a2120e667c0d80590 100644
--- a/docs/source/api/python/mantid/kernel/FacilityInfo.rst
+++ b/docs/source/api/python/mantid/kernel/FacilityInfo.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::FacilityInfo.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.FacilityInfo
+.. autoclass:: mantid.kernel.FacilityInfo
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/FloatArrayBoundedValidator.rst b/docs/source/api/python/mantid/kernel/FloatArrayBoundedValidator.rst
index b0fd3570b5fceab9d27fe5738821ae6c5f41a40f..9aa6e1e9d51cd9a068ab28b6f2c33566c9e0919d 100644
--- a/docs/source/api/python/mantid/kernel/FloatArrayBoundedValidator.rst
+++ b/docs/source/api/python/mantid/kernel/FloatArrayBoundedValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::ArrayBoundedValidator.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.FloatArrayBoundedValidator
+.. autoclass:: mantid.kernel.FloatArrayBoundedValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/FloatArrayLengthValidator.rst b/docs/source/api/python/mantid/kernel/FloatArrayLengthValidator.rst
index 94d301dbce6dffe15e65806681d2f2dbcbc1ae3c..38b938b443f22a12e84bc70b947209af24389d9b 100644
--- a/docs/source/api/python/mantid/kernel/FloatArrayLengthValidator.rst
+++ b/docs/source/api/python/mantid/kernel/FloatArrayLengthValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::ArrayLengthValidator.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.FloatArrayLengthValidator
+.. autoclass:: mantid.kernel.FloatArrayLengthValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/FloatArrayMandatoryValidator.rst b/docs/source/api/python/mantid/kernel/FloatArrayMandatoryValidator.rst
index 5e791b635f1b658b247d77e2ea048914631fb1d0..3d4ee5cfce6475c8b8c560d8c85ce8332db8ad47 100644
--- a/docs/source/api/python/mantid/kernel/FloatArrayMandatoryValidator.rst
+++ b/docs/source/api/python/mantid/kernel/FloatArrayMandatoryValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::MandatoryValidator.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.FloatArrayMandatoryValidator
+.. autoclass:: mantid.kernel.FloatArrayMandatoryValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/FloatArrayProperty.rst b/docs/source/api/python/mantid/kernel/FloatArrayProperty.rst
index 8bafae48fbce001b8f2153ae0fe24934bd62a55f..85e0ab7c363f9a1d6c48db6f4bcf9301302371a0 100644
--- a/docs/source/api/python/mantid/kernel/FloatArrayProperty.rst
+++ b/docs/source/api/python/mantid/kernel/FloatArrayProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::ArrayProperty.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.FloatArrayProperty
+.. autoclass:: mantid.kernel.FloatArrayProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/FloatBoundedValidator.rst b/docs/source/api/python/mantid/kernel/FloatBoundedValidator.rst
index fd29166b5a335067a713ff78552b21784d7a84bd..96e34be998f5b634f4c8b7f86c6b6127f1c28ade 100644
--- a/docs/source/api/python/mantid/kernel/FloatBoundedValidator.rst
+++ b/docs/source/api/python/mantid/kernel/FloatBoundedValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::FloatBoundedValidator.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.FloatBoundedValidator
+.. autoclass:: mantid.kernel.FloatBoundedValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/FloatFilteredTimeSeriesProperty.rst b/docs/source/api/python/mantid/kernel/FloatFilteredTimeSeriesProperty.rst
index 20f25cc27e8a07c6d91dc70728d0ce808e127396..841456785ac99843e2c790462dbbdfa5f1ea20a3 100644
--- a/docs/source/api/python/mantid/kernel/FloatFilteredTimeSeriesProperty.rst
+++ b/docs/source/api/python/mantid/kernel/FloatFilteredTimeSeriesProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::FilteredTimeSeriesProp
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.FloatFilteredTimeSeriesProperty
+.. autoclass:: mantid.kernel.FloatFilteredTimeSeriesProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/FloatMandatoryValidator.rst b/docs/source/api/python/mantid/kernel/FloatMandatoryValidator.rst
index 30d6bb13d1d581367da9ea5facef669cd577c917..6a48da3484eb449eaee08ef30955f668513d6030 100644
--- a/docs/source/api/python/mantid/kernel/FloatMandatoryValidator.rst
+++ b/docs/source/api/python/mantid/kernel/FloatMandatoryValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::MandatoryValidator.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.FloatMandatoryValidator
+.. autoclass:: mantid.kernel.FloatMandatoryValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/FloatPropertyWithValue.rst b/docs/source/api/python/mantid/kernel/FloatPropertyWithValue.rst
index 486edadc873b1dd7b08b2b33f4c91529b4c66799..2b857a9a1cce6a3e852c363b08b2f4c936a81196 100644
--- a/docs/source/api/python/mantid/kernel/FloatPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/kernel/FloatPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::FloatPropertyWithValue
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.FloatPropertyWithValue
+.. autoclass:: mantid.kernel.FloatPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/FloatTimeSeriesProperty.rst b/docs/source/api/python/mantid/kernel/FloatTimeSeriesProperty.rst
index 6239517b7eea7da93d7b257106068952bf4f4a6d..d8729c6a1bd99cfb6c9f820c01823d5b9e618fcd 100644
--- a/docs/source/api/python/mantid/kernel/FloatTimeSeriesProperty.rst
+++ b/docs/source/api/python/mantid/kernel/FloatTimeSeriesProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::TimeSeriesProperty.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.FloatTimeSeriesProperty
+.. autoclass:: mantid.kernel.FloatTimeSeriesProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/IPropertyManager.rst b/docs/source/api/python/mantid/kernel/IPropertyManager.rst
index 791569f18cba0d8b53bae09a7dc42a4672ebff9b..df62a98629122e6f332791ac45e1679f9904b6a0 100644
--- a/docs/source/api/python/mantid/kernel/IPropertyManager.rst
+++ b/docs/source/api/python/mantid/kernel/IPropertyManager.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::IPropertyManager.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.IPropertyManager
+.. autoclass:: mantid.kernel.IPropertyManager
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/IPropertySettings.rst b/docs/source/api/python/mantid/kernel/IPropertySettings.rst
index 1e9de915eaae2bb272444886bc755321f8bf4e3a..7d68bf1f65008deb2d64c46735b893dabf4c2364 100644
--- a/docs/source/api/python/mantid/kernel/IPropertySettings.rst
+++ b/docs/source/api/python/mantid/kernel/IPropertySettings.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::IPropertySettings.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.IPropertySettings
+.. autoclass:: mantid.kernel.IPropertySettings
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/IValidator.rst b/docs/source/api/python/mantid/kernel/IValidator.rst
index ee68a9f5e1c9e7d8a68948abb8638263ea2af3f7..e39700a9f1b113cc621aa0fd23864f7ece36a219 100644
--- a/docs/source/api/python/mantid/kernel/IValidator.rst
+++ b/docs/source/api/python/mantid/kernel/IValidator.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::IValidator.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.IValidator
+.. autoclass:: mantid.kernel.IValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/InstrumentInfo.rst b/docs/source/api/python/mantid/kernel/InstrumentInfo.rst
index 1084f84ab77699034e1cd5912a162ebf0630e6d5..0cf7e93a0a17a3e089ec7b5b65493888fe104cc5 100644
--- a/docs/source/api/python/mantid/kernel/InstrumentInfo.rst
+++ b/docs/source/api/python/mantid/kernel/InstrumentInfo.rst
@@ -9,7 +9,7 @@ This is a Python binding to the C++ class Mantid::Kernel::InstrumentInfo.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.InstrumentInfo
+.. autoclass:: mantid.kernel.InstrumentInfo
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/Int32FilteredTimeSeriesProperty.rst b/docs/source/api/python/mantid/kernel/Int32FilteredTimeSeriesProperty.rst
index f6be1e75b3cfe570a641d3079e02801102b3984d..e360d40607e11a480c8f352d5d8f223e8010e6fa 100644
--- a/docs/source/api/python/mantid/kernel/Int32FilteredTimeSeriesProperty.rst
+++ b/docs/source/api/python/mantid/kernel/Int32FilteredTimeSeriesProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::FilteredTimeSeriesProp
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.Int32FilteredTimeSeriesProperty
+.. autoclass:: mantid.kernel.Int32FilteredTimeSeriesProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/Int32TimeSeriesProperty.rst b/docs/source/api/python/mantid/kernel/Int32TimeSeriesProperty.rst
index 7d5b1a6a9af34c2011241b9f081671e98d37d7f6..ef0e2fbde6f38ae715e52a122b3381407aad47a7 100644
--- a/docs/source/api/python/mantid/kernel/Int32TimeSeriesProperty.rst
+++ b/docs/source/api/python/mantid/kernel/Int32TimeSeriesProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::TimeSeriesProperty.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.Int32TimeSeriesProperty
+.. autoclass:: mantid.kernel.Int32TimeSeriesProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/Int64FilteredTimeSeriesProperty.rst b/docs/source/api/python/mantid/kernel/Int64FilteredTimeSeriesProperty.rst
index 80d09719020057eb5bed1dfff135a2e90694d154..386bbcbd5f83aeb95a4a27fc81d98bfb79ebc589 100644
--- a/docs/source/api/python/mantid/kernel/Int64FilteredTimeSeriesProperty.rst
+++ b/docs/source/api/python/mantid/kernel/Int64FilteredTimeSeriesProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::FilteredTimeSeriesProp
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.Int64FilteredTimeSeriesProperty
+.. autoclass:: mantid.kernel.Int64FilteredTimeSeriesProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/Int64TimeSeriesProperty.rst b/docs/source/api/python/mantid/kernel/Int64TimeSeriesProperty.rst
index c56ef0c2989ee25d7a2ccd480230214db728fe0c..7a532f07982b6d141b9121279c1fdb0d4077c122 100644
--- a/docs/source/api/python/mantid/kernel/Int64TimeSeriesProperty.rst
+++ b/docs/source/api/python/mantid/kernel/Int64TimeSeriesProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::TimeSeriesProperty.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.Int64TimeSeriesProperty
+.. autoclass:: mantid.kernel.Int64TimeSeriesProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/IntArrayBoundedValidator.rst b/docs/source/api/python/mantid/kernel/IntArrayBoundedValidator.rst
index 11dd5c63c9e56df0a8e5d5f3397b1c4663e12344..602a0812d7ca52c490eb24e8f7f755cbdc4bf202 100644
--- a/docs/source/api/python/mantid/kernel/IntArrayBoundedValidator.rst
+++ b/docs/source/api/python/mantid/kernel/IntArrayBoundedValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::ArrayBoundedValidator.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.IntArrayBoundedValidator
+.. autoclass:: mantid.kernel.IntArrayBoundedValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/IntArrayLengthValidator.rst b/docs/source/api/python/mantid/kernel/IntArrayLengthValidator.rst
index 68787462b52a5798d68f2ab6bc01827f216208a3..96b4e3acc22c8c3576365a559576c4f57ecd7152 100644
--- a/docs/source/api/python/mantid/kernel/IntArrayLengthValidator.rst
+++ b/docs/source/api/python/mantid/kernel/IntArrayLengthValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::ArrayLengthValidator.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.IntArrayLengthValidator
+.. autoclass:: mantid.kernel.IntArrayLengthValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/IntArrayMandatoryValidator.rst b/docs/source/api/python/mantid/kernel/IntArrayMandatoryValidator.rst
index 776ac8576c8cb7b7205e91d795db27bf2fd158d8..014122d873c4b45b18f2d03c0727bf1bb11cbe7a 100644
--- a/docs/source/api/python/mantid/kernel/IntArrayMandatoryValidator.rst
+++ b/docs/source/api/python/mantid/kernel/IntArrayMandatoryValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::MandatoryValidator.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.IntArrayMandatoryValidator
+.. autoclass:: mantid.kernel.IntArrayMandatoryValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/IntBoundedValidator.rst b/docs/source/api/python/mantid/kernel/IntBoundedValidator.rst
index e918504551906a8ae326d6747d351fd0c2dc7460..3db2355a0e26f362d8c235a58b6b1dfa4174e523 100644
--- a/docs/source/api/python/mantid/kernel/IntBoundedValidator.rst
+++ b/docs/source/api/python/mantid/kernel/IntBoundedValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::IntBoundedValidator.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.IntBoundedValidator
+.. autoclass:: mantid.kernel.IntBoundedValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/IntListValidator.rst b/docs/source/api/python/mantid/kernel/IntListValidator.rst
index 289ffb7fddfcb08bfb43db55aa085f50031a1b3e..8beb0ad194a69272ac2319a6b9e2acb3b591f33a 100644
--- a/docs/source/api/python/mantid/kernel/IntListValidator.rst
+++ b/docs/source/api/python/mantid/kernel/IntListValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::IntListValidator.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.IntListValidator
+.. autoclass:: mantid.kernel.IntListValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/IntMandatoryValidator.rst b/docs/source/api/python/mantid/kernel/IntMandatoryValidator.rst
index a49486a8da102f343a7395fd7ec4224af0cc4317..8b858e307723dd2c435220ffbf375cde8ec1abef 100644
--- a/docs/source/api/python/mantid/kernel/IntMandatoryValidator.rst
+++ b/docs/source/api/python/mantid/kernel/IntMandatoryValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::MandatoryValidator.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.IntMandatoryValidator
+.. autoclass:: mantid.kernel.IntMandatoryValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/IntPropertyWithValue.rst b/docs/source/api/python/mantid/kernel/IntPropertyWithValue.rst
index 37c2c37db4e2c2d83e5cd7a8454727c4f346e95d..bc354c392e045c84bd045b1ff81b71054917405c 100644
--- a/docs/source/api/python/mantid/kernel/IntPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/kernel/IntPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::IntPropertyWithValue.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.IntPropertyWithValue
+.. autoclass:: mantid.kernel.IntPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/Label.rst b/docs/source/api/python/mantid/kernel/Label.rst
index 04586fd6dddaa6fa3db09d545f1a0deac981fa2f..5b4c9f4157547084555940b69050a564a248a0db 100644
--- a/docs/source/api/python/mantid/kernel/Label.rst
+++ b/docs/source/api/python/mantid/kernel/Label.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::Label.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.Label
+.. autoclass:: mantid.kernel.Label
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/LiveListenerInfo.rst b/docs/source/api/python/mantid/kernel/LiveListenerInfo.rst
index 9e40ff7520bb8990d2fa111af636f1a499ac8300..ab471a3434a1c9efa7e79ec94f4aa8ea827564e7 100644
--- a/docs/source/api/python/mantid/kernel/LiveListenerInfo.rst
+++ b/docs/source/api/python/mantid/kernel/LiveListenerInfo.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::LiveListenerInfo.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.LiveListenerInfo
+.. autoclass:: mantid.kernel.LiveListenerInfo
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/LogFilter.rst b/docs/source/api/python/mantid/kernel/LogFilter.rst
index 25c32c4ddce27c8a352b08d442149c7fb804be3c..75bdb55873aa241dbb18310789c68299188d946e 100644
--- a/docs/source/api/python/mantid/kernel/LogFilter.rst
+++ b/docs/source/api/python/mantid/kernel/LogFilter.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::LogFilter.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.LogFilter
+.. autoclass:: mantid.kernel.LogFilter
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/Logger.rst b/docs/source/api/python/mantid/kernel/Logger.rst
index 50e8e446e37186f8bb49eaee725ab5054c7de369..bdfd634b2bbfa953af42f2decbe258932ccf52b9 100644
--- a/docs/source/api/python/mantid/kernel/Logger.rst
+++ b/docs/source/api/python/mantid/kernel/Logger.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::Logger.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.Logger
+.. autoclass:: mantid.kernel.Logger
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/LongLongPropertyWithValue.rst b/docs/source/api/python/mantid/kernel/LongLongPropertyWithValue.rst
index 75a77bb0789ca3c4cfe273ac220057c7b7d60fd5..dd63e770b3806a25b3a246a2012c848cf1391202 100644
--- a/docs/source/api/python/mantid/kernel/LongLongPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/kernel/LongLongPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::LongLongPropertyWithVa
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.LongLongPropertyWithValue
+.. autoclass:: mantid.kernel.LongLongPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/LongPropertyWithValue.rst b/docs/source/api/python/mantid/kernel/LongPropertyWithValue.rst
index b7d3053573e78b54359c2b99eaa5266d95664c0c..fa82df59d811a5eabae8b9c2fc89fe19ac3d8bfb 100644
--- a/docs/source/api/python/mantid/kernel/LongPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/kernel/LongPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::LongPropertyWithValue.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.LongPropertyWithValue
+.. autoclass:: mantid.kernel.LongPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/Material.rst b/docs/source/api/python/mantid/kernel/Material.rst
index 589fbd5f0e4a9401fb65e5bcdfb4ebe4e9c14383..d748ce0377c78c55cb9e8693b48672192758d504 100644
--- a/docs/source/api/python/mantid/kernel/Material.rst
+++ b/docs/source/api/python/mantid/kernel/Material.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::Material.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.Material
+.. autoclass:: mantid.kernel.Material
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/MemoryStats.rst b/docs/source/api/python/mantid/kernel/MemoryStats.rst
index 553c15b8139e24146bd9b22aafa146a7189351d1..7154c95573e565bce551c26dc35df449afb01f3c 100644
--- a/docs/source/api/python/mantid/kernel/MemoryStats.rst
+++ b/docs/source/api/python/mantid/kernel/MemoryStats.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::MemoryStats.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.MemoryStats
+.. autoclass:: mantid.kernel.MemoryStats
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/NullValidator.rst b/docs/source/api/python/mantid/kernel/NullValidator.rst
index 3ef2b0ab68daa9adbd3ebbc01ea5de69cd58242e..5b2810318f9ab058c178afe89af050dc2cd6c30f 100644
--- a/docs/source/api/python/mantid/kernel/NullValidator.rst
+++ b/docs/source/api/python/mantid/kernel/NullValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::NullValidator.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.NullValidator
+.. autoclass:: mantid.kernel.NullValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/ProgressBase.rst b/docs/source/api/python/mantid/kernel/ProgressBase.rst
index cb3e70440a2e2dee2404e85f10988d539e83d88b..6ddfda86120ec15e47ef102def2b576aae65fcd2 100644
--- a/docs/source/api/python/mantid/kernel/ProgressBase.rst
+++ b/docs/source/api/python/mantid/kernel/ProgressBase.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::ProgressBase.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.ProgressBase
+.. autoclass:: mantid.kernel.ProgressBase
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/Property.rst b/docs/source/api/python/mantid/kernel/Property.rst
index 7f9b12f28c3880028298ebacaa7c1f0c3bcaf15e..2870ec5825b2d5458041499ff49cae398388359f 100644
--- a/docs/source/api/python/mantid/kernel/Property.rst
+++ b/docs/source/api/python/mantid/kernel/Property.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::Property.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.Property
+.. autoclass:: mantid.kernel.Property
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/PropertyCriterion.rst b/docs/source/api/python/mantid/kernel/PropertyCriterion.rst
index e08f972d0e875156f74bfb6edbda8d02d65ec71a..e36ca945b52f99c0f8dbda4d02e442cae253382d 100644
--- a/docs/source/api/python/mantid/kernel/PropertyCriterion.rst
+++ b/docs/source/api/python/mantid/kernel/PropertyCriterion.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::PropertyCriterion.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.PropertyCriterion
+.. autoclass:: mantid.kernel.PropertyCriterion
:members:
:undoc-members:
diff --git a/docs/source/api/python/mantid/kernel/PropertyHistory.rst b/docs/source/api/python/mantid/kernel/PropertyHistory.rst
index 6caa2dc34f7f6a0f608956e036dbdb378fd98e6b..f8fbc77b6cd8d6c2068deb3bd4474766e80c1961 100644
--- a/docs/source/api/python/mantid/kernel/PropertyHistory.rst
+++ b/docs/source/api/python/mantid/kernel/PropertyHistory.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::PropertyHistory.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.PropertyHistory
+.. autoclass:: mantid.kernel.PropertyHistory
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/PropertyManager.rst b/docs/source/api/python/mantid/kernel/PropertyManager.rst
index 075758257035b38474142e88f90b571b1c8ee1be..72a035100ffa2c12a07875f6300343b097fba7c1 100644
--- a/docs/source/api/python/mantid/kernel/PropertyManager.rst
+++ b/docs/source/api/python/mantid/kernel/PropertyManager.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::PropertyManager.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.PropertyManager
+.. autoclass:: mantid.kernel.PropertyManager
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/PropertyManagerDataServiceImpl.rst b/docs/source/api/python/mantid/kernel/PropertyManagerDataServiceImpl.rst
index 6d1bf369d34a1063a7302bcd51e32885bebb4762..e403d96c27907c6fad5eaa5f930d78418f3f448d 100644
--- a/docs/source/api/python/mantid/kernel/PropertyManagerDataServiceImpl.rst
+++ b/docs/source/api/python/mantid/kernel/PropertyManagerDataServiceImpl.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::PropertyManagerDataSer
.. module:`mantid.api`
-.. autoclass:: mantid.kernel.PropertyManagerDataServiceImpl
+.. autoclass:: mantid.kernel.PropertyManagerDataServiceImpl
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/Quat.rst b/docs/source/api/python/mantid/kernel/Quat.rst
index 9a7e8cd20d12215422b4e7189eaafd13a520f0c0..670f31d207d4e0e04fe9cc332a7d21d5b7449a30 100644
--- a/docs/source/api/python/mantid/kernel/Quat.rst
+++ b/docs/source/api/python/mantid/kernel/Quat.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::Quat.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.Quat
+.. autoclass:: mantid.kernel.Quat
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/RebinParamsValidator.rst b/docs/source/api/python/mantid/kernel/RebinParamsValidator.rst
index 16eac58b20a3993b72e182ea4c773cc824f0af51..84ae76d0cd1f3f75d4bccbca228beb7c3910ee3e 100644
--- a/docs/source/api/python/mantid/kernel/RebinParamsValidator.rst
+++ b/docs/source/api/python/mantid/kernel/RebinParamsValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::RebinParamsValidator.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.RebinParamsValidator
+.. autoclass:: mantid.kernel.RebinParamsValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/Stats.rst b/docs/source/api/python/mantid/kernel/Stats.rst
index eb93536fe0c9e00671fe62a40590018cdc7cfb07..73f5cd889f8728a6a2739588cba10e94d7207a0f 100644
--- a/docs/source/api/python/mantid/kernel/Stats.rst
+++ b/docs/source/api/python/mantid/kernel/Stats.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::Stats.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.Stats
+.. autoclass:: mantid.kernel.Stats
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/StringArrayLengthValidator.rst b/docs/source/api/python/mantid/kernel/StringArrayLengthValidator.rst
index 0254bb995736ead83ae7b9fb20189e4f2dbd7e24..25f6836260f026084008b4af72db32bb1267bcf6 100644
--- a/docs/source/api/python/mantid/kernel/StringArrayLengthValidator.rst
+++ b/docs/source/api/python/mantid/kernel/StringArrayLengthValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::ArrayLengthValidator.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.StringArrayLengthValidator
+.. autoclass:: mantid.kernel.StringArrayLengthValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/StringArrayMandatoryValidator.rst b/docs/source/api/python/mantid/kernel/StringArrayMandatoryValidator.rst
index b2a15fb60f978bfdc725f2d3c833e754d9d008e9..c1e8afde464c8a72e3846d5daa58406a4a429a5b 100644
--- a/docs/source/api/python/mantid/kernel/StringArrayMandatoryValidator.rst
+++ b/docs/source/api/python/mantid/kernel/StringArrayMandatoryValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::MandatoryValidator.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.StringArrayMandatoryValidator
+.. autoclass:: mantid.kernel.StringArrayMandatoryValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/StringArrayProperty.rst b/docs/source/api/python/mantid/kernel/StringArrayProperty.rst
index 59e4b41620421472ccfcf7065f17e33694b75fcb..00c2bf4d3713ab7ca58673e0df7088025d425c88 100644
--- a/docs/source/api/python/mantid/kernel/StringArrayProperty.rst
+++ b/docs/source/api/python/mantid/kernel/StringArrayProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::ArrayProperty.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.StringArrayProperty
+.. autoclass:: mantid.kernel.StringArrayProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/StringFilteredTimeSeriesProperty.rst b/docs/source/api/python/mantid/kernel/StringFilteredTimeSeriesProperty.rst
index 987232d025c222acbe51c2659e0ab8d7fefd1aae..7cedb32407011cc72ca8afeb7c1de89b2e7cd422 100644
--- a/docs/source/api/python/mantid/kernel/StringFilteredTimeSeriesProperty.rst
+++ b/docs/source/api/python/mantid/kernel/StringFilteredTimeSeriesProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::FilteredTimeSeriesProp
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.StringFilteredTimeSeriesProperty
+.. autoclass:: mantid.kernel.StringFilteredTimeSeriesProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/StringListValidator.rst b/docs/source/api/python/mantid/kernel/StringListValidator.rst
index 81fc7c7ec166bb51aafbcbbd678dad752a91a2b0..a84a37a358c79b2a74d452fa42de608c183cb100 100644
--- a/docs/source/api/python/mantid/kernel/StringListValidator.rst
+++ b/docs/source/api/python/mantid/kernel/StringListValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::StringListValidator.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.StringListValidator
+.. autoclass:: mantid.kernel.StringListValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/StringMandatoryValidator.rst b/docs/source/api/python/mantid/kernel/StringMandatoryValidator.rst
index 11be4aa51266d3b8f057d1cd23757b227bc8c700..43ceee7168b4d633a4d4b4c64258a8d271547a70 100644
--- a/docs/source/api/python/mantid/kernel/StringMandatoryValidator.rst
+++ b/docs/source/api/python/mantid/kernel/StringMandatoryValidator.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::MandatoryValidator.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.StringMandatoryValidator
+.. autoclass:: mantid.kernel.StringMandatoryValidator
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/StringPropertyWithValue.rst b/docs/source/api/python/mantid/kernel/StringPropertyWithValue.rst
index 429c604080e9fbcf5bd7902d92a6797f3ea5a6fc..77b27712754147e34073a8d40b58ce6c3f885755 100644
--- a/docs/source/api/python/mantid/kernel/StringPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/kernel/StringPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::StringPropertyWithValu
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.StringPropertyWithValue
+.. autoclass:: mantid.kernel.StringPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/StringTimeSeriesProperty.rst b/docs/source/api/python/mantid/kernel/StringTimeSeriesProperty.rst
index fa2778ecf50d2623ca2867795433247d2451da5f..92d0bc4c0070a00b4ad8f1bd9298b6b6fd6436ac 100644
--- a/docs/source/api/python/mantid/kernel/StringTimeSeriesProperty.rst
+++ b/docs/source/api/python/mantid/kernel/StringTimeSeriesProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::TimeSeriesProperty.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.StringTimeSeriesProperty
+.. autoclass:: mantid.kernel.StringTimeSeriesProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/TimeSeriesPropertyStatistics.rst b/docs/source/api/python/mantid/kernel/TimeSeriesPropertyStatistics.rst
index 6e5b955a44181dcb5cc041111b5520f6eebf11c2..15a7365982dffe1586e0412bdb3cac51f96e4cd2 100644
--- a/docs/source/api/python/mantid/kernel/TimeSeriesPropertyStatistics.rst
+++ b/docs/source/api/python/mantid/kernel/TimeSeriesPropertyStatistics.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::TimeSeriesPropertyStat
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.TimeSeriesPropertyStatistics
+.. autoclass:: mantid.kernel.TimeSeriesPropertyStatistics
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/UIntPropertyWithValue.rst b/docs/source/api/python/mantid/kernel/UIntPropertyWithValue.rst
index eb186cb1741549d73a4dbd302e5b47bcd4cbae2c..4e49067e7f487e7c6b828aa2d58ec32ea0362fcc 100644
--- a/docs/source/api/python/mantid/kernel/UIntPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/kernel/UIntPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::UIntPropertyWithValue.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.UIntPropertyWithValue
+.. autoclass:: mantid.kernel.UIntPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/ULongLongPropertyWithValue.rst b/docs/source/api/python/mantid/kernel/ULongLongPropertyWithValue.rst
index 2e0d8a63132c6a1d3a74d5e7dc3e48b4c5a780c8..a6adc059484d764b54d086fcda563fbb05e5e3fb 100644
--- a/docs/source/api/python/mantid/kernel/ULongLongPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/kernel/ULongLongPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::ULongLongPropertyWithV
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.ULongLongPropertyWithValue
+.. autoclass:: mantid.kernel.ULongLongPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/ULongPropertyWithValue.rst b/docs/source/api/python/mantid/kernel/ULongPropertyWithValue.rst
index 8abc4011235857e5e9abb326ffc83bf73d01b1e0..3d93beced3d84d36097c49b7e1424669aee44113 100644
--- a/docs/source/api/python/mantid/kernel/ULongPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/kernel/ULongPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::ULongPropertyWithValue
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.ULongPropertyWithValue
+.. autoclass:: mantid.kernel.ULongPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/Unit.rst b/docs/source/api/python/mantid/kernel/Unit.rst
index 8be7e1f5539291d7486243d2933486b82f215d18..b5fddb643b5af7fa3c89bb0c2f1ea60ab8bc71cf 100644
--- a/docs/source/api/python/mantid/kernel/Unit.rst
+++ b/docs/source/api/python/mantid/kernel/Unit.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::Unit.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.Unit
+.. autoclass:: mantid.kernel.Unit
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/UnitConversion.rst b/docs/source/api/python/mantid/kernel/UnitConversion.rst
index 9ae7c3a19c76d9a98298e9cd2ac561db78389334..a301ddfc0a79d400f008ca785a039e7599b07692 100644
--- a/docs/source/api/python/mantid/kernel/UnitConversion.rst
+++ b/docs/source/api/python/mantid/kernel/UnitConversion.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::UnitConversion.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.UnitConversion
+.. autoclass:: mantid.kernel.UnitConversion
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/UnitFactoryImpl.rst b/docs/source/api/python/mantid/kernel/UnitFactoryImpl.rst
index bcbaef252aebe140f90b0d05f2525360aefed23b..7aec1e65e0fb5213488b986bf8a8a6f163459fde 100644
--- a/docs/source/api/python/mantid/kernel/UnitFactoryImpl.rst
+++ b/docs/source/api/python/mantid/kernel/UnitFactoryImpl.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::UnitFactoryImpl.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.UnitFactoryImpl
+.. autoclass:: mantid.kernel.UnitFactoryImpl
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/UnitLabel.rst b/docs/source/api/python/mantid/kernel/UnitLabel.rst
index d48b25594782a04069dcb9b456edc2bda4af07f8..76d6e23806691284e74c99d84f6e32e20ec88d20 100644
--- a/docs/source/api/python/mantid/kernel/UnitLabel.rst
+++ b/docs/source/api/python/mantid/kernel/UnitLabel.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::UnitLabel.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.UnitLabel
+.. autoclass:: mantid.kernel.UnitLabel
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/UnsignedIntArrayProperty.rst b/docs/source/api/python/mantid/kernel/UnsignedIntArrayProperty.rst
index ee3897ab4f3db599f6e93821a4bbd21902806446..dd5a05751b7a47d24113398b0f59662803f3de27 100644
--- a/docs/source/api/python/mantid/kernel/UnsignedIntArrayProperty.rst
+++ b/docs/source/api/python/mantid/kernel/UnsignedIntArrayProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::ArrayProperty.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.UnsignedIntArrayProperty
+.. autoclass:: mantid.kernel.UnsignedIntArrayProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/V3D.rst b/docs/source/api/python/mantid/kernel/V3D.rst
index ab4777e58df98796b0db3a2100a5851104bdec20..98a0a3b34d2d40175e9d0558a30d42b0b08cdec2 100644
--- a/docs/source/api/python/mantid/kernel/V3D.rst
+++ b/docs/source/api/python/mantid/kernel/V3D.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::V3D.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.V3D
+.. autoclass:: mantid.kernel.V3D
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/VMD.rst b/docs/source/api/python/mantid/kernel/VMD.rst
index a7a3145a1f8d4a351dcec613569e21b371c936f8..c63e9968b52f39dc9da8a9b7b37fec69bde20fc6 100644
--- a/docs/source/api/python/mantid/kernel/VMD.rst
+++ b/docs/source/api/python/mantid/kernel/VMD.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::VMD.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.VMD
+.. autoclass:: mantid.kernel.VMD
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/VectorBoolPropertyWithValue.rst b/docs/source/api/python/mantid/kernel/VectorBoolPropertyWithValue.rst
index 89ed216b23f07d6f85af645838757581b642c00a..cb7f8a561e35ced51a33cc22aa6ac1481ced4f93 100644
--- a/docs/source/api/python/mantid/kernel/VectorBoolPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/kernel/VectorBoolPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::VectorBoolPropertyWith
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.VectorBoolPropertyWithValue
+.. autoclass:: mantid.kernel.VectorBoolPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/VectorFloatPropertyWithValue.rst b/docs/source/api/python/mantid/kernel/VectorFloatPropertyWithValue.rst
index 60fad3354489d7037989c2def0c2a169f61ae284..9c3f73d772dcc9919ccf982ae6c1ebcadf2dce95 100644
--- a/docs/source/api/python/mantid/kernel/VectorFloatPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/kernel/VectorFloatPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::VectorFloatPropertyWit
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.VectorFloatPropertyWithValue
+.. autoclass:: mantid.kernel.VectorFloatPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/VectorIntPropertyWithValue.rst b/docs/source/api/python/mantid/kernel/VectorIntPropertyWithValue.rst
index 9717aa9526f3edeed808078468e8112e1056a06e..a01d087f5be39d23b103cf7b0b216092873f72b3 100644
--- a/docs/source/api/python/mantid/kernel/VectorIntPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/kernel/VectorIntPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::VectorIntPropertyWithV
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.VectorIntPropertyWithValue
+.. autoclass:: mantid.kernel.VectorIntPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/VectorLongLongPropertyWithValue.rst b/docs/source/api/python/mantid/kernel/VectorLongLongPropertyWithValue.rst
index a6398bebcfcfffdd9d94f7eaa1a4d7723f875e83..4e5b9efd5d2ef10362d14c117703a1cf14405c74 100644
--- a/docs/source/api/python/mantid/kernel/VectorLongLongPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/kernel/VectorLongLongPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::VectorLongLongProperty
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.VectorLongLongPropertyWithValue
+.. autoclass:: mantid.kernel.VectorLongLongPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/VectorLongPropertyWithValue.rst b/docs/source/api/python/mantid/kernel/VectorLongPropertyWithValue.rst
index e77dd9749895d771539e0e2d185dfb61b3bbf0ca..c5728d2533fd2d0e448136628b0701c2a532b383 100644
--- a/docs/source/api/python/mantid/kernel/VectorLongPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/kernel/VectorLongPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::VectorLongPropertyWith
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.VectorLongPropertyWithValue
+.. autoclass:: mantid.kernel.VectorLongPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/VectorStringPropertyWithValue.rst b/docs/source/api/python/mantid/kernel/VectorStringPropertyWithValue.rst
index bf608e7d0847915409c26944697b0458972092fd..abcefcf4135398adb704d621845a97e07dc445dc 100644
--- a/docs/source/api/python/mantid/kernel/VectorStringPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/kernel/VectorStringPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::VectorStringPropertyWi
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.VectorStringPropertyWithValue
+.. autoclass:: mantid.kernel.VectorStringPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/VectorUIntPropertyWithValue.rst b/docs/source/api/python/mantid/kernel/VectorUIntPropertyWithValue.rst
index 5c618f73a3f713abbbed6bc21fb7c7fca186ff6b..f71b42c72416bd0de2ea5d2ab293e1a52c326140 100644
--- a/docs/source/api/python/mantid/kernel/VectorUIntPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/kernel/VectorUIntPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::VectorUIntPropertyWith
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.VectorUIntPropertyWithValue
+.. autoclass:: mantid.kernel.VectorUIntPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/VectorULongLongPropertyWithValue.rst b/docs/source/api/python/mantid/kernel/VectorULongLongPropertyWithValue.rst
index 9063cd526c819c75b460870ebb31f617906c4318..fd12cb4ce0ffc2da484ef58a3a1df8a005866eef 100644
--- a/docs/source/api/python/mantid/kernel/VectorULongLongPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/kernel/VectorULongLongPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::VectorULongLongPropert
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.VectorULongLongPropertyWithValue
+.. autoclass:: mantid.kernel.VectorULongLongPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/VectorULongPropertyWithValue.rst b/docs/source/api/python/mantid/kernel/VectorULongPropertyWithValue.rst
index 8a07b419e69a02a7d7ee372bc5e407c85df6ced5..1f038474af0cc16c50f1825964b45e23ce74dc49 100644
--- a/docs/source/api/python/mantid/kernel/VectorULongPropertyWithValue.rst
+++ b/docs/source/api/python/mantid/kernel/VectorULongPropertyWithValue.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::VectorULongPropertyWit
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.VectorULongPropertyWithValue
+.. autoclass:: mantid.kernel.VectorULongPropertyWithValue
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/VisibleWhenProperty.rst b/docs/source/api/python/mantid/kernel/VisibleWhenProperty.rst
index 309cf95692e0008f6074f97498b03b1719c632cb..dd41c69856b74460118fda4059b64029880f7629 100644
--- a/docs/source/api/python/mantid/kernel/VisibleWhenProperty.rst
+++ b/docs/source/api/python/mantid/kernel/VisibleWhenProperty.rst
@@ -8,7 +8,7 @@ This is a Python binding to the C++ class Mantid::Kernel::VisibleWhenProperty.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.VisibleWhenProperty
+.. autoclass:: mantid.kernel.VisibleWhenProperty
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/std_set_int.rst b/docs/source/api/python/mantid/kernel/std_set_int.rst
index f68a7e073afa1cab14ee910aeb0250a76289aceb..408c80e08c4f0ba7486ae8befd3efbf59aec54c3 100644
--- a/docs/source/api/python/mantid/kernel/std_set_int.rst
+++ b/docs/source/api/python/mantid/kernel/std_set_int.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::std_set_int.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.std_set_int
+.. autoclass:: mantid.kernel.std_set_int
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/std_set_str.rst b/docs/source/api/python/mantid/kernel/std_set_str.rst
index 7576e1dc048b301e4e4eae5e8ef615e6e630cfcb..c8a4582ca3caabccb5e0c8fbcfd28c45845880cc 100644
--- a/docs/source/api/python/mantid/kernel/std_set_str.rst
+++ b/docs/source/api/python/mantid/kernel/std_set_str.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::std_set_str.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.std_set_str
+.. autoclass:: mantid.kernel.std_set_str
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/std_vector_InstrumentInfo.rst b/docs/source/api/python/mantid/kernel/std_vector_InstrumentInfo.rst
index bd17c73cde8cf11272d9f4f93109289460deaa3b..e002e45c81bb4228a5858574d3c2c0c84631eb2c 100644
--- a/docs/source/api/python/mantid/kernel/std_vector_InstrumentInfo.rst
+++ b/docs/source/api/python/mantid/kernel/std_vector_InstrumentInfo.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::std_vector_InstrumentI
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.std_vector_InstrumentInfo
+.. autoclass:: mantid.kernel.std_vector_InstrumentInfo
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/std_vector_bool.rst b/docs/source/api/python/mantid/kernel/std_vector_bool.rst
index 615d03321eb5ed1f0ab1ce30313a5b06942a3614..f570a4aa85218df48a16a7911ad6d79245a874fb 100644
--- a/docs/source/api/python/mantid/kernel/std_vector_bool.rst
+++ b/docs/source/api/python/mantid/kernel/std_vector_bool.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::std_vector_bool.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.std_vector_bool
+.. autoclass:: mantid.kernel.std_vector_bool
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/std_vector_dateandtime.rst b/docs/source/api/python/mantid/kernel/std_vector_dateandtime.rst
index b6364ecd0a65adba6e33833ebfe022ba9bbfeae1..e905d04a2c9f5d64837235fe55f341b11900c08b 100644
--- a/docs/source/api/python/mantid/kernel/std_vector_dateandtime.rst
+++ b/docs/source/api/python/mantid/kernel/std_vector_dateandtime.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::std_vector_dateandtime
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.std_vector_dateandtime
+.. autoclass:: mantid.kernel.std_vector_dateandtime
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/std_vector_dbl.rst b/docs/source/api/python/mantid/kernel/std_vector_dbl.rst
index 74fb1f2ec0e1771fce0cfc28082d83b0275be7cb..c392d9f37d85ed1ac9c9f89a44f7dde8aee76fa8 100644
--- a/docs/source/api/python/mantid/kernel/std_vector_dbl.rst
+++ b/docs/source/api/python/mantid/kernel/std_vector_dbl.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::std_vector_dbl.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.std_vector_dbl
+.. autoclass:: mantid.kernel.std_vector_dbl
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/std_vector_facilityinfo.rst b/docs/source/api/python/mantid/kernel/std_vector_facilityinfo.rst
index bb4bc018cdda39cd496b9b1cecc97837bfee7de7..e5ba66bbdbed22a30eef1e613a26a186e6c6d561 100644
--- a/docs/source/api/python/mantid/kernel/std_vector_facilityinfo.rst
+++ b/docs/source/api/python/mantid/kernel/std_vector_facilityinfo.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::std_vector_facilityinf
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.std_vector_facilityinfo
+.. autoclass:: mantid.kernel.std_vector_facilityinfo
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/std_vector_int.rst b/docs/source/api/python/mantid/kernel/std_vector_int.rst
index a42b3ec3c0799b586392a09cbd2a77d39a781fc5..59f3647956c27580532504b010d706736f1f33a1 100644
--- a/docs/source/api/python/mantid/kernel/std_vector_int.rst
+++ b/docs/source/api/python/mantid/kernel/std_vector_int.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::std_vector_int.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.std_vector_int
+.. autoclass:: mantid.kernel.std_vector_int
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/std_vector_long.rst b/docs/source/api/python/mantid/kernel/std_vector_long.rst
index dc3fa07d4f6f14c3a612038733e2e79fc5148f92..a40de96db29e4881cfe1296b563d3bc67b210b4b 100644
--- a/docs/source/api/python/mantid/kernel/std_vector_long.rst
+++ b/docs/source/api/python/mantid/kernel/std_vector_long.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::std_vector_long.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.std_vector_long
+.. autoclass:: mantid.kernel.std_vector_long
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/std_vector_property.rst b/docs/source/api/python/mantid/kernel/std_vector_property.rst
index 3ee0f4036a3de6a12dba8e65f94d9304527859f7..ecdd34b6928e3a870d5d82325740014496f67437 100644
--- a/docs/source/api/python/mantid/kernel/std_vector_property.rst
+++ b/docs/source/api/python/mantid/kernel/std_vector_property.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::std_vector_property.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.std_vector_property
+.. autoclass:: mantid.kernel.std_vector_property
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/std_vector_size_t.rst b/docs/source/api/python/mantid/kernel/std_vector_size_t.rst
index 9a7e74b5d6c8adc0507197bc480047180f306f70..63c7e5486d9522094652100d8245fda6ede9f417 100644
--- a/docs/source/api/python/mantid/kernel/std_vector_size_t.rst
+++ b/docs/source/api/python/mantid/kernel/std_vector_size_t.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::std_vector_size_t.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.std_vector_size_t
+.. autoclass:: mantid.kernel.std_vector_size_t
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/std_vector_str.rst b/docs/source/api/python/mantid/kernel/std_vector_str.rst
index 9e29b160fdbbd53a75a980bda8ff99f70a6d4abb..7189e9626197d0a2696978069dd124333bf31d90 100644
--- a/docs/source/api/python/mantid/kernel/std_vector_str.rst
+++ b/docs/source/api/python/mantid/kernel/std_vector_str.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::std_vector_str.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.std_vector_str
+.. autoclass:: mantid.kernel.std_vector_str
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/kernel/time_duration.rst b/docs/source/api/python/mantid/kernel/time_duration.rst
index 451a5ee18fb70f308163ba6050268392c530dd19..20d4974155e9cd671cc2af614b0b7bd3240f2aa2 100644
--- a/docs/source/api/python/mantid/kernel/time_duration.rst
+++ b/docs/source/api/python/mantid/kernel/time_duration.rst
@@ -7,7 +7,7 @@ This is a Python binding to the C++ class Mantid::Kernel::time_duration.
.. module:`mantid.kernel`
-.. autoclass:: mantid.kernel.time_duration
+.. autoclass:: mantid.kernel.time_duration
:members:
:undoc-members:
:inherited-members:
diff --git a/docs/source/api/python/mantid/plots/index.rst b/docs/source/api/python/mantid/plots/index.rst
index 6ed16c5410b820592d4b738150326231d4f8a16c..e325b4455e0b71fce038e044e0e4bd22fce2a1aa 100644
--- a/docs/source/api/python/mantid/plots/index.rst
+++ b/docs/source/api/python/mantid/plots/index.rst
@@ -6,7 +6,7 @@
The functions in this module are intended to be used with matplotlib's
object oriented abstract program interface (API). matplotlib's
-(stateful) functional interface is discouraged by matplotlib.
+(stateful) functional interface is discouraged by matplotlib.
The object oriented API allow for customization as well.
The plotting of a :class:`mantid.api.MatrixWorkspace` or a
@@ -15,12 +15,12 @@ The use of a ``mantid`` projection allows most matplotlib-like
experience:
.. code-block:: python
-
+
import matplotlib.pyplot as plt
from mantid import plots
-
+
#some code here to get a workspace, and x, y, yerr arrays
-
+
fig, ax = plt.subplots(subplot_kw={'projection':'mantid'})
ax.errorbar(workspace,'rs',specNum=1) #for workspaces
ax.errorbar(x,y,yerr,'bo') #for arrays
@@ -156,13 +156,13 @@ Similarly, showing the actual values with :func:`~mantid.plots.MantidAxes.pcolor
:align: center
:figwidth: image
-A couple of notes about :func:`~mantid.plots.MantidAxes.pcolor`,
-:func:`~mantid.plots.MantidAxes.pcolormesh`,
+A couple of notes about :func:`~mantid.plots.MantidAxes.pcolor`,
+:func:`~mantid.plots.MantidAxes.pcolormesh`,
and :func:`~mantid.plots.MantidAxes.pcolorfast`:
-* If the :class:`mantid.api.MatrixWorkspace` has unequal bins,
+* If the :class:`mantid.api.MatrixWorkspace` has unequal bins,
the polygons/meshes will have sides not aligned
- with the axes. One can override this behavior by using the
+ with the axes. One can override this behavior by using the
**axisaligned** keyword, and setting it to True
* If the :class:`mantid.api.MatrixWorkspace` has different numbers
of bins the above functions will automatically use the
@@ -227,7 +227,7 @@ Available Functions
When using ``mantid`` projection
--------------------------------
-
+
.. autoclass:: mantid.plots.MantidAxes
:members: plot, errorbar, scatter, contour,
contourf, pcolor, pcolorfast, pcolormesh, tripcolor,
@@ -247,7 +247,7 @@ Functions to use when **mantid** projection is not available
:members: plot, errorbar, scatter, contour, contourf, pcolor,
pcolorfast, pcolormesh, tripcolor, tricontour, tricontourf
-
+
Functions to use when **mantid3d** projection is not available
--------------------------------------------------------------
diff --git a/docs/source/concepts/Calibration.rst b/docs/source/concepts/Calibration.rst
index 893628cf5ce78843cd6c2c90009e996d6e857242..232e17364ee6d2893e54406fa6af6d862058105d 100644
--- a/docs/source/concepts/Calibration.rst
+++ b/docs/source/concepts/Calibration.rst
@@ -8,14 +8,14 @@ Calibration
What is Calibration?
--------------------
-
+
Calibration is a process which determines and corrects for differences in the definition of an instrument to reality, generally conducted by performing a measurement of a reference compound under known conditions.
-
+
Supported Types of Calibration
------------------------------
-* :ref:`Powder Diffraction Calibration`
+* :ref:`Powder Diffraction Calibration`
* :ref:`Single Crystal Diffraction Panel Calibration`
* :ref:`Engineering Calibration`
* :ref:`PSD Tube Calibration`
diff --git a/docs/source/concepts/CreateanIDF.rst b/docs/source/concepts/CreateanIDF.rst
index c760c665c7447cfa2f12fa0b1f2b8e97c92c17c5..1c3c86947a20797146fd54269da38e193a2ae373 100644
--- a/docs/source/concepts/CreateanIDF.rst
+++ b/docs/source/concepts/CreateanIDF.rst
@@ -16,8 +16,8 @@ The recommended set of steps to get started is to:
- Use an editor, which is :ref:`XML schema aware <Using_XML_Schema>`
- Use the full :ref:`IDF <InstrumentDefinitionFile>` page for detailed documentation
-The above are suggestive steps for generating an IDF. In addition there have
-been created several scripts for automatic the creation of IDFs. Such scripts
+The above are suggestive steps for generating an IDF. In addition there have
+been created several scripts for automatic the creation of IDFs. Such scripts
can be found `here <https://github.com/mantidproject/mantidgeometry>`__.
Using the Schema
diff --git a/docs/source/concepts/CrystalField.rst b/docs/source/concepts/CrystalField.rst
index fce21b6aef84dda93bd6e303a182befd6e2d0b19..5b70036b2add3d8634af26048144e26113111116 100644
--- a/docs/source/concepts/CrystalField.rst
+++ b/docs/source/concepts/CrystalField.rst
@@ -10,7 +10,7 @@ Crystal Field Theory
Introduction
------------
-This page contains the theory and background to the crystal field calculations.
+This page contains the theory and background to the crystal field calculations.
If you want to know how to make these calculations please see the :ref:`Python interface page <Crystal Field Python Interface>`
or the :ref:`examples page <Crystal_Field_Examples>`.
@@ -20,7 +20,7 @@ The Crystal Field Potential
The crystal field (or in older terminology, *crystalline electric field*)
is the potential acting on a particular magnetic ion :math:`i` at position :math:`\mathbf{r}_i` in a solid or molecule.
-When first proposed by Van Vleck, it was thought to be an electrostatic effect due to the charges
+When first proposed by Van Vleck, it was thought to be an electrostatic effect due to the charges
:math:`q_j` of neighbouring ions, located at :math:`\mathbf{r}_j`, of the magnetic ion (hence the original name).
This leads to an approximation in which the surrounding ions are treated as point charges,
so that the electric potential acting on the magnetic ion is
@@ -39,7 +39,7 @@ and so can be expanded in terms of spherical harmonic functions
where the radial part is
.. math::
- A_l^m = \frac{1}{4\pi\epsilon_0} \left\{ (-1)^m \frac{4\pi}{2l+1} \sum_j \frac{q_j}{r_j^{l+1}} Y_{l,-m}(\mathbf{r}_j) \right\}.
+ A_l^m = \frac{1}{4\pi\epsilon_0} \left\{ (-1)^m \frac{4\pi}{2l+1} \sum_j \frac{q_j}{r_j^{l+1}} Y_{l,-m}(\mathbf{r}_j) \right\}.
:label: alm
The above equations define the *point charge model* `[Hutchings64]`_.
@@ -61,7 +61,7 @@ Crystal Field Energy Levels
---------------------------
The above potential, being an electric interaction, acts only on the orbital part of the electronic wavefunctions.
-Its effect is to lift the degeneracy of the orbital states
+Its effect is to lift the degeneracy of the orbital states
(labelled by the secondary orbital angular momentum quantum number :math:`L_z`)
of the magnetic ion :math:`i` giving rise to a set of energy levels.
@@ -99,14 +99,14 @@ The Hamiltonian is constructed just like the potential in equation :eq:`cfexp`,
but rather than being a sum of the spherical harmonic functions acting on the position coordinate,
it must be a sum over tensor operators which act on the :math:`J_z` basis states.
-These operators could be *spherical tensor operators* :math:`T_q^{(k)}`
+These operators could be *spherical tensor operators* :math:`T_q^{(k)}`
which transform in the same way under rotations as the spherical harmonic functions,
or they could be hermitian combinations of these operators
which transform in the same way as the *tesseral harmonic functions* (also called real spherical harmonic functions)
:math:`Z_{lm}`:
.. math::
- Z_{lm} = \left\{ \begin{array}{ll}
+ Z_{lm} = \left\{ \begin{array}{ll}
\frac{i}{\sqrt{2}} \left[ Y_{lm} - (-1)^m Y_{l,-m} \right] & m<0 \\
Y_{lm} & m=0 \\
\frac{1}{\sqrt{2}} \left[ Y_{l,-m} + (-1)^m Y_{lm} \right] & m>0 \\
@@ -120,7 +120,7 @@ The first attempt to construct such a crystal field Hamiltonian was by Stevens `
for the tesseral harmonic functions in `Cartesian coordinates <http://www.mcphase.de/manual/node123.html>`_,
removed the constant prefactors and replaced the :math:`x`, :math:`y` and :math:`z` coordinates
with the angular momentum operators :math:`\hat{J}_x`, :math:`\hat{J}_y`, :math:`\hat{J}_z` respectively,
-taking care to obey the commutation relations of the angular momentum operators.
+taking care to obey the commutation relations of the angular momentum operators.
These `Stevens operators <http://www.mcphase.de/manual/node124.html>`_ are used in Mantid and are calculated
from the :math:`\hat{J}_x`, :math:`\hat{J}_y`, :math:`\hat{J}_z` operators expressed as a matrix
using the :math:`J_z` basis states.
@@ -169,10 +169,10 @@ Symmetry considerations
-----------------------
The crystal field potential must be invariant under the operations of the point group of the atomic site at which the magnetic ion is positioned.
-The point groups are defined by reflections, rotations, roto-inversions, and inversion.
+The point groups are defined by reflections, rotations, roto-inversions, and inversion.
The multipolar expansion, equation :eq:`cfexp`, means that we just need to determine
which spherical harmonics terms :math:`Y_{lm}` are invariant under each of these operations.
-:math:`Y_{lm}` terms which are not invariant under the operations of the point group of the magnetic ion must thus be zero.
+:math:`Y_{lm}` terms which are not invariant under the operations of the point group of the magnetic ion must thus be zero.
To determine the non-zero :math:`Y_{lm}` terms we need only consider the highest symmetry operation, since this is the most restrictive.
Taking the principle axis as :math:`z`, the :math:`n`-fold rotations :math:`C_n` will change :math:`\phi` by :math:`2\pi/n`.
@@ -189,7 +189,7 @@ This mirroring is actually equivalent to an inversion about the origin,
mapping :math:`x` to :math:`-x`, :math:`y` to :math:`-y` and :math:`z` to :math:`-z`.
In spherical coordinates this means :math:`\cos\theta\rightarrow-\cos\theta=` and :math:`\sin\theta\rightarrow-\sin\theta`.
Thus the presence of a centre of inversion implies that only terms with even powers of :math:`\cos\theta` and :math:`\sin\theta`
-(e.g. terms with even :math:`l`) are allowed.
+(e.g. terms with even :math:`l`) are allowed.
In fact, though, odd :math:`l` terms are always forbidden because the Stevens factor, :math:`\theta_l`, is zero for odd :math:`l` [#]_.
This implies that, as far as the crystal field is concerned, all magnetic ions lie on centres of inversion.
@@ -222,14 +222,14 @@ where the second equality applies in the case of the rare-earths, where :math:`L
where the :math:`x`, :math:`y`, and :math:`z` directions refer to the crystal field coordinates (usually with :math:`z` taken to be
along the axis of highest symmetry), rather than necessarily relating to any crystallographic axes. Thus it may be
necessary to rotate the coordinate systems (or equivalently, the crystal field parameters) for actual calculations for
-magnetic fields applied parallel to particular crystallographic directions.
-The `FOCUS manual <https://epubs.stfc.ac.uk/manifestation/5723/RAL-TR-95-023.pdf>`_ [#]_
+magnetic fields applied parallel to particular crystallographic directions.
+The `FOCUS manual <https://epubs.stfc.ac.uk/manifestation/5723/RAL-TR-95-023.pdf>`_ [#]_
has some details of how these calculations may be accomplished, and further details may be found in reference `[Buckmaster72]`_.
The :math:`\hat{J}_x`, :math:`\hat{J}_y`, :math:`\hat{J}_z` operators may be identified with the :math:`\hat{C}_q^{(k)}` operators for :math:`k=1`
with :math:`x`, :math:`y` and :math:`z` corresponding to :math:`q=1,-1` and 0 respectively [#]_.
-The magnetisation may then be calculated from the expectation value of the magnetic moment operator
+The magnetisation may then be calculated from the expectation value of the magnetic moment operator
:math:`\hat{\mathbf{J}} = \hat{\mathbf{L}} + 2\hat{\mathbf{S}} = (\hat{J}_x, \hat{J}_y, \hat{J}_z)`
.. math::
@@ -259,8 +259,8 @@ Finally, the single-ion neutron scattering transition may also be calculated usi
operators as:
.. math::
- I_{n\rightarrow m} = \left(\frac{g_{\mathrm{n}} r_e}{2}\right)^2
- \frac{\exp\left(\frac{-E_n}{k_B T}\right)}{Z} \frac{2}{3}
+ I_{n\rightarrow m} = \left(\frac{g_{\mathrm{n}} r_e}{2}\right)^2
+ \frac{\exp\left(\frac{-E_n}{k_B T}\right)}{Z} \frac{2}{3}
\sum_{\alpha} \left| \langle \psi_n | \hat{J}_{\alpha} | \psi_m \rangle \right|^2,
:label: neutcf
@@ -332,7 +332,7 @@ Now, it turns out the matrix elements of the tensor operators can expressed, via
product of an angular momentum coupling (Clebsch-Gordan) coefficient, and a *reduced matrix element*,
.. math::
- \langle L,L_z | T_q^{(k)}| L,L'_z \rangle = (-1)^{L-L_z}
+ \langle L,L_z | T_q^{(k)}| L,L'_z \rangle = (-1)^{L-L_z}
\left( \begin{array}{ccc} L & k & L \\ -L_z & q & L'_z \end{array} \right)
\langle L ||t^{(k)}|| L \rangle,
:label: tkq
@@ -358,7 +358,7 @@ Note that the :math:`D_q^k` parameters are complex numbers.
We can also construct the Hermitian operators :math:`\hat{C}_q^{(k)}` analogous to the tesseral harmonic functions:
.. math::
- \hat{C}_q^{(k)} = \left\{ \begin{array}{ll}
+ \hat{C}_q^{(k)} = \left\{ \begin{array}{ll}
\frac{i}{\sqrt{2}} \left[ T_q^{(k)} - (-1)^q T_{-q}^{(k)} \right] & q<0 \\
T_q^{(k)} & q=0 \\
\frac{1}{\sqrt{2}} \left[ T_{-q}^{(k)} + (-1)^q T_q^{(k)} \right] & q>0 \\
@@ -374,7 +374,7 @@ And so construct a "real-valued" Wybourne normalised crystal field Hamiltonian a
where the :math:`L_q^k` parameters are real and related to the :math:`D_q^k` parameters by:
.. math::
- D_q^k = \left\{ \begin{array}{ll}
+ D_q^k = \left\{ \begin{array}{ll}
(L_{|q|}^k + i L_{-|q|}^k) & q < 0 \\
L_0^k & q = 0 \\
(-1)^{|q|} (L_{|q|}^k - i L_{-|q|}^k) & q > 0
@@ -453,9 +453,9 @@ Appendix B: Tables
| :math:`\mathrm{Yb}^{3+}` | 3 | |half| | |7half| | :math:`\frac{8}{7}` | 3.175 | -17.32 | 148.0 |
+--------------------------+---+---------+----------+----------------------+---------+--------+---------+
-Table 1: *Total angular momentum quantum numbers* :math:`L`, :math:`S` and :math:`J`, *Landé* :math:`g_J` *factors,
+Table 1: *Total angular momentum quantum numbers* :math:`L`, :math:`S` and :math:`J`, *Landé* :math:`g_J` *factors,
and Stevens factors* :math:`\theta_k` *for the ground states of the trivalent rare-earth ions*.
-After `[JensenMackintosh91]`_.
+After `[JensenMackintosh91]`_.
The ground state of :math:`\mathrm{Gd}^{3+}` is a pure spin state, on which the crystal field does not operate.
Eu compound often do not adopt the trivalent state, and Pm is radioactive so not much studied.
@@ -529,14 +529,14 @@ Eu compound often do not adopt the trivalent state, and Pm is radioactive so not
| cubic | |TdOOh| | | | | |p| | | | | |p| | |p| | | | | |p| | | |
+------------+-------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-Table 2: *Possible local symmetries and corresponding nonzero CEF parameters.*
-':math:`+`' indicates only :math:`|m|` terms are nonzero.
+Table 2: *Possible local symmetries and corresponding nonzero CEF parameters.*
+':math:`+`' indicates only :math:`|m|` terms are nonzero.
':math:`\pm`' indicates that :math:`-|m|` terms are also non-zero.
In the case when :math:`m>0` and both parameters :math:`B_l^m` and :math:`B_l^{-m}` are nonzero,
one of these :math:`B_l^m` with :math:`m>0` can by made zero by a rotation of the coordinate system.
However, the appropriate orientation of the coordinate system in these cases is not known *a priori*.
It requires the knowledge of the CEF parameters.
-Note, that for cubic symmetry additionally :math:`\mathrm{B}_4^4=5 \mathrm{B}_4^0,` and :math:`\mathrm{B}_6^4 = -21 \mathrm{B}_6^0`.
+Note, that for cubic symmetry additionally :math:`\mathrm{B}_4^4=5 \mathrm{B}_4^0,` and :math:`\mathrm{B}_6^4 = -21 \mathrm{B}_6^0`.
.. _Table 3:
@@ -555,7 +555,7 @@ Note, that for cubic symmetry additionally :math:`\mathrm{B}_4^4=5 \mathrm{B}_4^
Table 3: *Ratios* :math:`\lambda_{lm}` *of the Stevens to the real valued Wybourne normalised parameters.*
After `[NewmanNg00]`_.
-
+
References
----------
diff --git a/docs/source/concepts/ElementalAnalysisUsingNegativeMuons.rst b/docs/source/concepts/ElementalAnalysisUsingNegativeMuons.rst
index c11365e805ca17c43a58a25723a5460977028a6b..e7383bd355eb5f5e02a016967326e77ed4a11dbf 100644
--- a/docs/source/concepts/ElementalAnalysisUsingNegativeMuons.rst
+++ b/docs/source/concepts/ElementalAnalysisUsingNegativeMuons.rst
@@ -6,27 +6,27 @@ Elemental analysis using negative muons
.. contents::
:local:
-
+
Overview
--------
Elemental analysis is a non-destructive, depth selective method of determining the elemental composition of a sample by using negative muons.
This leads to the sample emitting gamma and X-rays that can be detected.
-
+
What happens when a muon is implanted in a sample?
--------------------------------------------------
A Muon is captured by an atom, forming a mounic atom.
Muon cascades down atom to the first energy level :math:`N = 1` (1s) within :math:`~10e-13` seconds, resulting in the emission of muonic x-rays [#HIL1]_.
-Radiative muon capture could occur and result in a the emission of a gamma ray [#MEA]_.
+Radiative muon capture could occur and result in a the emission of a gamma ray [#MEA]_.
.. math:: \mu^- + p \rightarrow \nu_\mu + n + \gamma,
where :math:`\nu_mu` is muon neutrino.
.. figure:: ../images/MuonCascadeProcess.png
- :alt: Muon cascade process from [HIL1].
+ :alt: Muon cascade process from [HIL1].
:scale: 100%
-Controlling implantation depth of muons
+Controlling implantation depth of muons
---------------------------------------
The implantation depth depends on the density of the target material and is proportional to the momentum of the incident muons.
At ISIS, the momentum of the muons can be tuned from :math:`17 \textit{MeV/c}` to :math:`120 \textit{MeV/c}` [#MAT]_.
@@ -35,7 +35,7 @@ For most metals the maximum penetration depth is a few centimetres, with a resol
Advantages over other methods
-----------------------------
-Another method for determining the elemental composition of a material is X-ray fluorescene, which uses electrons to create X-rays.
+Another method for determining the elemental composition of a material is X-ray fluorescene, which uses electrons to create X-rays.
The mass of a muon is over :math:`200` times greater than the mass of an electron.
This allows muon elemental analysis to probe energies that are an order of magnitude higher X-ray fluorescenes.
Unlike X-ray fluorescene, muon elemental analysis is non destructive and can detect low atomic numbers.
@@ -45,10 +45,10 @@ Muons are also able to distinguish between different isotopes of the same elemen
References
----------
-.. [#HIL1] Hillier, A.D. et al (in press). Depth Dependent Bulk Elemental Analysis using Negative Muons, D’Amico ,S. , Venuti ,V.,
+.. [#HIL1] Hillier, A.D. et al (in press). Depth Dependent Bulk Elemental Analysis using Negative Muons, D’Amico ,S. , Venuti ,V.,
Handbook of cultural heritage , Springer.
-.. [#MEA] Measday, D. F. (2001). The nuclear physics of muon capture. Physics Reports, 354(4-5), 243-409.
-.. [#MAT] Matsuzaki, T. et al (2001). The RIKEN-RAL pulsed muon facility. Nuclear Instruments and Methods in Physics Research
- Section A: Accelerators, Spectrometers, Detectors and Associated Equipment, 465(2-3), 365-383.
-.. [#HIL3] Hillier , A.D. et al (2019).Muons at ISIS., Philos. Trans. R. Soc A Math. Phys. Eng. Sci., Vol. 377, pp. 1-7.
+.. [#MEA] Measday, D. F. (2001). The nuclear physics of muon capture. Physics Reports, 354(4-5), 243-409.
+.. [#MAT] Matsuzaki, T. et al (2001). The RIKEN-RAL pulsed muon facility. Nuclear Instruments and Methods in Physics Research
+ Section A: Accelerators, Spectrometers, Detectors and Associated Equipment, 465(2-3), 365-383.
+.. [#HIL3] Hillier , A.D. et al (2019).Muons at ISIS., Philos. Trans. R. Soc A Math. Phys. Eng. Sci., Vol. 377, pp. 1-7.
diff --git a/docs/source/concepts/EventWorkspace.rst b/docs/source/concepts/EventWorkspace.rst
index 35d4d5e44fb2587492792955cd71e23b4d0ee931..d4aef002872e00132eb94b28848b80807770ae42 100644
--- a/docs/source/concepts/EventWorkspace.rst
+++ b/docs/source/concepts/EventWorkspace.rst
@@ -10,7 +10,7 @@ Event Workspace
What is it for?
______________________
-Event Workspaces are specialised for time-of-flight neutron scattering. Event Workspaces are designed for sparse data storage of neutron events. Individual detector observations, including information about when that observation was made are stored as discrete items inside the workspace. The ability to keep more detailed information gives a number of advantages over converting directly to a compressed form, such as allowing more powerful filtering operations to be used.
+Event Workspaces are specialised for time-of-flight neutron scattering. Event Workspaces are designed for sparse data storage of neutron events. Individual detector observations, including information about when that observation was made are stored as discrete items inside the workspace. The ability to keep more detailed information gives a number of advantages over converting directly to a compressed form, such as allowing more powerful filtering operations to be used.
Summary for Users
-----------------------
diff --git a/docs/source/concepts/FABADA.rst b/docs/source/concepts/FABADA.rst
index 5da194bddb3ca513051eeb08f9ea9cd26fcbe1e9..64e3f05671339f3db462db49907d5c95da726979 100644
--- a/docs/source/concepts/FABADA.rst
+++ b/docs/source/concepts/FABADA.rst
@@ -76,11 +76,11 @@ Usage
ws_data = Load(Filename='irs26176_graphite002_red.nxs')
ws_res = Load(Filename='irs26173_graphite002_res.nxs')
-
+
function_str = 'composite=Convolution,FixResolution=tue,NumDeriv=false;name=Resolution,Workspace=ws_res,WorkspaceIndex=0;(composite=CompositeFunction,NumDeriv=true;name=Lorentzian,Amplitude=1,PeakCentre=0.01,FWHM=0.5;name=Lorentzian,Amplitude=1,PeakCentre=0.01,FWHM=0.5)'
minimizer_str = "FABADA,Chain Length=1000000,Steps between values=10,Convergence Criteria=0.01,PDF=pdf,Chains=chain,Converged chain=conv,Cost Function Table=CostFunction,Parameter Erros =Errors"
-
- Fit(Function = function_str,InputWorkspace=ws_data,WorkspaceIndex=3,StartX=-0.25,EndX=0.25,CreateOutput=True,Output = 'result',OutputCompositeMembers=True,MaxIterations=2000000, Minimizer=minimizer_str)
+
+ Fit(Function = function_str,InputWorkspace=ws_data,WorkspaceIndex=3,StartX=-0.25,EndX=0.25,CreateOutput=True,Output = 'result',OutputCompositeMembers=True,MaxIterations=2000000, Minimizer=minimizer_str)
.. categories:: Concepts
diff --git a/docs/source/concepts/FitConstraint.rst b/docs/source/concepts/FitConstraint.rst
index a55daed86baa704cf3b564190a0db894bd01938a..656357916f1c34d4f3aa479b5e43b1e19a400a4d 100644
--- a/docs/source/concepts/FitConstraint.rst
+++ b/docs/source/concepts/FitConstraint.rst
@@ -34,7 +34,7 @@ we then add the following penalty function to :math:`y_i^{cal}` if
.. math:: p_i = C(x0_{min}-x0)
-where :math:`C` is a constant (default 1000). The penalty function when
+where :math:`C` is a constant (default 1000). The penalty function when
:math:`x0 > x0_{max}` takes the form:
.. math:: p_i = C(x0-x0_{max})
@@ -45,7 +45,7 @@ If more than one constraint is defined, then for each violated
constraint a penalty of the type defined above is added to the
calculated fitting function.
-If the penalty C is not the default value of 1000, then the
+If the penalty C is not the default value of 1000, then the
constraint penalty value will be included whenever the function
is converted to a string. For example:
diff --git a/docs/source/concepts/FitFunctionsInPython.rst b/docs/source/concepts/FitFunctionsInPython.rst
index 6ba7ef2b30e8bff89806910a1582ded4f996ceca..8b4985c9cd7d207ab5bbaee8894a103cb1c7f042 100644
--- a/docs/source/concepts/FitFunctionsInPython.rst
+++ b/docs/source/concepts/FitFunctionsInPython.rst
@@ -17,7 +17,7 @@ will make ``g`` into a Gaussian function with default values and
.. code:: python
g = Gaussian(Height=1, Sigma=0.1)
-
+
will make ``g`` into a Gaussian function with ``Height`` set to 1, ``Sigma`` set to 0.1 and ``PeakCentre`` set to default value.
One can also make function with attributes such as
@@ -25,25 +25,25 @@ One can also make function with attributes such as
.. code:: python
p = Polynomial(n=3, A0=1, A1=2, A2=4, A3=3)
-
+
One can get and set function parameters and attributes, by array operations, for example:
.. code:: python
gSigma = g["Sigma"]
g["Height"] = 1.5
-
+
One can also get and set function parameters and attributes, by dot operations, for example:
.. code:: python
gSigma = g.Sigma
g.Height = 1.5
-
+
Composite Functions
-------------------
-Composite functions can be created by means of the plus operation and
-individual functions can be accessed by array index operations.
+Composite functions can be created by means of the plus operation and
+individual functions can be accessed by array index operations.
For example:
.. code:: python
@@ -61,30 +61,30 @@ Similarly product functions can be constructed using the multiplication operator
p = ExpDecay() * Gaussian(Height=1,Sigma=0.2)
-One can get and set the parameters of a composite function, by array operations,
+One can get and set the parameters of a composite function, by array operations,
but not by dot operations because the parameter name already contains a dot, for example:
.. code:: python
f1Sigma = spectrum["f1.Sigma"]
spectrum["f1.Height"] = 1.5
-
+
One can add a function by the ``+-`` operator or remove be the ``del`` function.
.. code:: python
spectrum += Lorentzian(PeakCentre=3)
del spectrum[1]
-
+
Also available is the ``len`` function and iteration over the member functions:
.. code:: python
n_peaks = len(spectrum)
- for func in spectrum:
- print(func)
-
-The plus and times operators are associative and
+ for func in spectrum:
+ print(func)
+
+The plus and times operators are associative and
so may not preserve a composite function within a composite function as such,
but replace it with a list of its member functions.
Instead you may use:
@@ -93,7 +93,7 @@ Instead you may use:
spectrum = CompositeFunctionWrapper(LinearBackground(), Gaussian(PeakCentre=1), Gaussian(PeakCentre=2))
P = ProductFunctionWrapper(ExpDecay(), Gaussian(Height=1,Sigma=0.2))
-
+
Multi-Domain Functions
----------------------
Multi-Domain functions can be constructed like this:
@@ -118,46 +118,46 @@ Both fixes and ties can be removed by ``untie``:
.. code:: python
func.untie('f3.Sigma')
-
+
To tie all parameters of the same local name in a composite function, one can use ``TieAll``:
.. code:: python
func.tieAll('Sigma')
-
+
All members of the composite function must have this parameter (in this case ``Sigma``).
Similarly with fixing:
.. code:: python
spectrum1.fixAll('FWHM')
-
+
Also parameters of a function can be fixed with ``fixAllParameters`` and unfixed with ``untieAllParameters``.
.. code:: python
c.fixAllParameters()
- ...
+ ...
c.untieAllParameters()
Setting Constraints
--------------------
+-------------------
One can set and remove constraints as follows:
.. code:: python
- g.constrain("Sigma < 2.0, Height > 7.0")
+ g.constrain("Sigma < 2.0, Height > 7.0")
...
g.unconstrain("Sigma")
g.unconstrain("Height")
-
- comp.constrain("f1.Sigma < 2, f0.Height > 7")
+
+ comp.constrain("f1.Sigma < 2, f0.Height > 7")
...
comp.unconstrain("f1.Sigma")
- comp.unconstrain("f0.Height")
+ comp.unconstrain("f0.Height")
-One can all constrain a given parameter in all members of a composite function that have this parameter
+One can all constrain a given parameter in all members of a composite function that have this parameter
and also remove such constraints.
.. code:: python
@@ -165,7 +165,7 @@ and also remove such constraints.
comp.constrainAll("Sigma < 1.8")
...
comp.unconstrainAll("Sigma")
-
+
Evaluation
----------
One can evaluate functions:
@@ -175,14 +175,14 @@ One can evaluate functions:
p = Polynomial(n=2, A0=0, A1=0.5, A2=0.5)
print p(1) # expect 1.0
- print p(2) # expect 3.0
+ print p(2) # expect 3.0
print p(3) # expect 6.0
print p([0,1,2,3]) # expect [ 0. 1. 3. 6.]
ws = CreateWorkspace(DataX=[0,1,2,3,4,5,6,7], DataY=[5,5,5,5,5,5,5])
print p(ws).readY(1) # expect [ 0.375 1.875 4.375 7.875 12.375 17.875 24.375]
-
+
One can use numpy arrays:
.. code:: python
@@ -202,7 +202,7 @@ Also one can put parameters into the function when evaluating.
p = Polynomial(n=2)
print p([0,1,2,3], 0.0, 0.5, 0.5) #expect [ 0. 1. 3. 6.]
-This enables one to fit the functions with ``scipy.optimize.curve_fit``.
+This enables one to fit the functions with ``scipy.optimize.curve_fit``.
Errors
------
@@ -234,13 +234,13 @@ This method can be called in any of the following manners:
f.plot(startX=xmin, endX=xmax) # for 20 x-values between xmin and xmax
f.plot(startX=xmin, endX=xmax, nSteps=10) # for 10 x-values between xmin and xmax
f.plot(workspace=ws, startX=xmin, endX=xmax) # for x-values of ws between xmin & xmax
- f.plot(workspace=ws, name='Fred') # for plot & its workspace to be called 'Fred'
+ f.plot(workspace=ws, name='Fred') # for plot & its workspace to be called 'Fred'
-If you use ``xValues``, then the list of x values must be in numerical order.
+If you use ``xValues``, then the list of x values must be in numerical order.
This is not checked and if they are not in order the plot may fail to display properly.
If you want to display multiple plots of the same function, then use
-``name`` to give each plot a unique name. The default value of ``name``
-is the name of the function.
+``name`` to give each plot a unique name. The default value of ``name``
+is the name of the function.
.. categories:: Concepts
diff --git a/docs/source/concepts/FittingMinimizers.rst b/docs/source/concepts/FittingMinimizers.rst
index 34ad59fc496c0e391d30944cac0274149f6413ff..ee538f3de84d7fef562a7fba9d6c9060027ce7be 100644
--- a/docs/source/concepts/FittingMinimizers.rst
+++ b/docs/source/concepts/FittingMinimizers.rst
@@ -11,7 +11,7 @@ Below are listed the current recommendations for which minimizers to use with Ma
The above recommendations are based on the results presented in sections below.
-We are expanding the set of fitting problems we test against, which may, for example,
+We are expanding the set of fitting problems we test against, which may, for example,
provide enough evidence to recommend different minimizers for different subsets of neutron
fitting problems in the future. And, we are constantly looking for new example, in
particular, where a user has found a fitting difficult or slow.
@@ -73,7 +73,7 @@ function to drive the iterative process towards a local minimum.
BFGS and the Levenberg-Marquardt algorithms belong to the second-order
class of algorithms, in the sense that they use second-order
-information of the cost function (second-order partial derivatives of
+information of the cost function (second-order partial derivatives of
a Hessian matrix). Some algorithms like BFGS approximate the Hessian by the
gradient values of successive iterations. The Levenberg-Marquard
algorithm is a modified Gauss-Newton that introduces an adaptive term
@@ -130,7 +130,7 @@ the model fitted: :math:`\chi_{1}^{2} = \sum_{i} (y_i - f_i)^2` (see
:ref:`CalculateChiSquared <algm-CalculateChiSquared>` for full details
and different variants). Run time is measured as the time it takes to
execute the :ref:`Fit <algm-Fit>` algorithm, i.e. the time it takes to
-fit one model with one set of initial values of the model parameters against
+fit one model with one set of initial values of the model parameters against
one dataset
.. There would be two alternative for the errors:
@@ -150,7 +150,7 @@ following information:
- Dataset in the form of any number of pairs :math:`x_i`, :math:`y_i` with optional :math:`y_i` error estimates
- Function to fit, with parameters
- Initial values (starting point) of the function parameters
-- Optional: reference best values for the parameters (some may refer to these as certified values), i.e. target parameter values for the minimizers
+- Optional: reference best values for the parameters (some may refer to these as certified values), i.e. target parameter values for the minimizers
The current problems have been obtained from the following sources:
@@ -229,7 +229,7 @@ and on the same system:
using `GSL <https://www.gnu.org/software/gsl/>`__ version 1.16.
References:
-
+
.. [Kelley1999] Kelley C.T. (1999). Iterative Methods for Optimization.
SIAM series in Applied Mathematics. Frontiers in Applied
Mathematics, vol. 18. ISBN: 978-0-898714-33-3.
diff --git a/docs/source/concepts/Instrument.rst b/docs/source/concepts/Instrument.rst
index 348f57b21b6b375b7b7048abb32bacecb4553c28..b0fd4c98b79727fe39c1bca145954688489d47fb 100644
--- a/docs/source/concepts/Instrument.rst
+++ b/docs/source/concepts/Instrument.rst
@@ -152,7 +152,7 @@ Instruments, or any component within them (bank, detector, chopper, slit etc) ca
print(" The type of NumberParam in bank 1: " + bank1.getParameterType("NumberParam"))
print(" The type of NumberParam in bank 2: " + bank2.getParameterType("NumberParam"))
-Output:
+Output:
.. testoutput:: InstrumentParameters
diff --git a/docs/source/concepts/InstrumentDefinitionFile.rst b/docs/source/concepts/InstrumentDefinitionFile.rst
index 0fb22ef4d741c0b6379e4fbcf1519a86688de6b0..dc347cd38a0b41e4f2b85dfb9b9f6a1015a375b3 100644
--- a/docs/source/concepts/InstrumentDefinitionFile.rst
+++ b/docs/source/concepts/InstrumentDefinitionFile.rst
@@ -397,14 +397,14 @@ There is a shortcut way to create 3D arrays of detector pixels. These pixels rep
<location x="0" y="0" z="0.2" name="bank2">
</location>
</component>
-
- <type name="block" is="GridDetector" type="voxel"
+
+ <type name="block" is="GridDetector" type="voxel"
xpixels="4" xstart="-0.04" xstep="+0.02"
- ypixels="48" ystart="-0.48" ystep="+0.02"
+ ypixels="48" ystart="-0.48" ystep="+0.02"
zpixels="16" zstart="-0.08" zstep="+0.01">
<properties/>
- </type>
-
+ </type>
+
<!-- Pixel for Detectors-->
<type name="voxel" is="detector">
<cuboid id="shape">
@@ -416,7 +416,7 @@ There is a shortcut way to create 3D arrays of detector pixels. These pixels rep
<algebra val="shape" />
</type>
-- The “block†type defined above has the special “is†tag of “GridDetectorâ€. The same type definition
+- The “block†type defined above has the special “is†tag of “GridDetectorâ€. The same type definition
then needs these attributes specified:
- type: point to another type defining your pixel shape and size.
@@ -429,22 +429,22 @@ There is a shortcut way to create 3D arrays of detector pixels. These pixels rep
- zpixels: number of pixels in Z
- zstart: z-position of the 0-th pixel (in length units, normally meters)
- zstep: step size between pixels in the z (usually beam) direction (in length units, normally meters)
-- Detectors of the type specified (“pixel†in the example) will be replicated at the X Y and Z coordinates
+- Detectors of the type specified (“pixel†in the example) will be replicated at the X Y and Z coordinates
given. The usual rotation and translation of the panel will rotate the pixels as needed.
-- Each instance of a “block†needs to set these attributes, at the <component> tag, in order to specify the
+- Each instance of a “block†needs to set these attributes, at the <component> tag, in order to specify the
Pixel IDs of the 2D array.
-
+
- idstart: detector ID of the first pixel
- - idfillorder: a string which determines the ordering of the axes. For example "zxy": (0,0,0)=1;
- (0,0,1)=1, (0, 0, 2)=2 and so on. Default is idfillorder=â€xyzâ€. Other characters are not allowed and
+ - idfillorder: a string which determines the ordering of the axes. For example "zxy": (0,0,0)=1;
+ (0,0,1)=1, (0, 0, 2)=2 and so on. Default is idfillorder=â€xyzâ€. Other characters are not allowed and
the string must contain all three axes.
- - idstepbyrow: amount to increase the ID number on each row (2nd order). e.g, if idfillorder="zyx",and set
- idstepbyrow="100", and have 10 Z pixels, you would get: (0,0,0)=0; (0,0,1)=1; ... (0,0,9)=9;
+ - idstepbyrow: amount to increase the ID number on each row (2nd order). e.g, if idfillorder="zyx",and set
+ idstepbyrow="100", and have 10 Z pixels, you would get: (0,0,0)=0; (0,0,1)=1; ... (0,0,9)=9;
(0,1,0)=100;(0,1,1)=101; etc. The last order is always calculated automatically.
- idstep. Default to 1. Set the ID increment within a row (1st order).
- DO NOT also specify an “idlist†attribute for rectangular detectors, as it will not be used.
- Advantages of using a GridDetector tag:
-
+
- Convenient way of defining voxel-based instruments.
- Special handling/rendering of each voxel layer (z plane) as textures in the instrument view.
- Smaller IDF and faster instrument loading times.
@@ -546,7 +546,7 @@ an example of how to do it:
Creating Structured (Irregular Geometry) Detectors
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-In the previous example, we saw that Rectangular Detectors provide a simple way
+In the previous example, we saw that Rectangular Detectors provide a simple way
of producing detectors with regular topology and geometry. The StructuredDetector
provides a way of producing detectors with regular topology and irregular geometry. It
can be thought of as a warped RectangularDetector:
@@ -601,13 +601,13 @@ can be thought of as a warped RectangularDetector:
- xpixels: number of pixels in X.
- ypixels: number of pixels in Y.
-- The StrucuredDetector type contains special <vertex> tags enclosed by this type.
+- The StrucuredDetector type contains special <vertex> tags enclosed by this type.
There are some useful points to note about this type of definition:
- All vertices for a single detector panel must be defined.
- Detector panels can be duplicated and repositioned using <component> and <location> tags.
- Vertices appear in a particular winding order increasing in x then y then z e.g
- (1, 0, 0) (2, 0, 0) / (1, 1, 0) (2, 1, 0)/ (1, 2, 0) (2, 2, 0) etc. Z
+ (1, 0, 0) (2, 0, 0) / (1, 1, 0) (2, 1, 0)/ (1, 2, 0) (2, 2, 0) etc. Z
is assumed to be fixed.
- The total number of vertices are strictly (xpixels + 1) * (ypixels + 1)
@@ -960,7 +960,7 @@ The above one line of XML is shorthand notation for
If name is specified, e.g. as name="det" in the first example, then as seen the
<location> elements are given the 'name' plus a counter, where by default this counter starts from zero. This counter can optionally be changed by using
attribute name-count-start, e.g. setting name-count-start="1" in the above
-example would have named the 10 <location> elements det1, det2, ..., det10. Additionally, using the name-count-increment attribute, e.g setting
+example would have named the 10 <location> elements det1, det2, ..., det10. Additionally, using the name-count-increment attribute, e.g setting
name-count-increment="2" would have named the 10 <location> elements dat1, det3, ..., det21. By default, this increment is one.
When one <locations> tag was used in ISIS LET_Definition.xml the number of
diff --git a/docs/source/concepts/InstrumentParameterFile.rst b/docs/source/concepts/InstrumentParameterFile.rst
index 3a9b8f2d5842272e7e3cc3820e70864e21a7df13..0cbe8e33af19c8263d61bf99e7a2f16f4fe89386 100644
--- a/docs/source/concepts/InstrumentParameterFile.rst
+++ b/docs/source/concepts/InstrumentParameterFile.rst
@@ -1,8 +1,8 @@
.. _InstrumentParameterFile:
.. role:: xml(literal)
- :class: highlight
-
+ :class: highlight
+
Instrument Parameter File
=========================
@@ -31,13 +31,13 @@ The below example shows some of the elements featured in IN10_silicon_111_Parame
<?xml version="1.0" encoding="UTF-8" ?>
<parameter-file instrument="IN10" date="2010-07-15 00:00:00">
-
+
<component-link name="IN10">
<parameter name="analysis-type" type="string">
<value val="spectroscopy" />
</parameter>
</component-link>
-
+
<component-link name="silicon">
<parameter name="Efixed">
<value val="2.0" valid-to="2011-12-31T23:59:59"/>
@@ -45,7 +45,7 @@ The below example shows some of the elements featured in IN10_silicon_111_Parame
<value val="3.0" valid-from="2013-01-01T00:00:00"/>
</parameter>
</component-link>
-
+
</parameter-file>
Naming and Using a Parameter File
diff --git a/docs/source/concepts/KafkaLiveStreams.rst b/docs/source/concepts/KafkaLiveStreams.rst
index 521b9be2654a6fe37dda5d2aeb22f23a2b3f7491..94e58d362697a0a8daa444f88c2d6577d5cb6452 100644
--- a/docs/source/concepts/KafkaLiveStreams.rst
+++ b/docs/source/concepts/KafkaLiveStreams.rst
@@ -4,17 +4,17 @@ Listening on Kafka Live Streams
.. contents:: Table of Contents
:local:
-
+
Kafka Listeners
---------------
-The basic use of all listeners in Mantid is described in the documentation for :ref:`StartLiveData <algm-StartLiveData>`. Mantid provides two listener types for live streaming
+The basic use of all listeners in Mantid is described in the documentation for :ref:`StartLiveData <algm-StartLiveData>`. Mantid provides two listener types for live streaming
data using the Apache Kafka distributed streaming plaform. These listeners are used within the :ref:`StartLiveData <algm-StartLiveData>` algorithm internally. They cannot be invoked separately.
KafkaEventListener
##################
-This listener is used for streaming live event data. Without using pre or post processing, this results in the creation of an :ref:`EventWorkspace <EventWorkspace>`. The listener address in `StartLiveData` should be set to the address of the kafka
-broker from which data will be streamed. The Kafka topic names for sample environment, run info etc. are all standardized and pre-configured and offset against the instrument name which is set by the
+This listener is used for streaming live event data. Without using pre or post processing, this results in the creation of an :ref:`EventWorkspace <EventWorkspace>`. The listener address in `StartLiveData` should be set to the address of the kafka
+broker from which data will be streamed. The Kafka topic names for sample environment, run info etc. are all standardized and pre-configured and offset against the instrument name which is set by the
:ref:`StartLiveData <algm-StartLiveData>` *Instrument* field. Users are not required to manually enter topic names. As with all event streams, if the `AccumulationMethod` is set to *Append* there is a danger of running out of memory.
This following python script shows how this listener is used:
@@ -22,7 +22,7 @@ This following python script shows how this listener is used:
.. code-block:: python
# broker address can take the form hostname:port or ipaddress:port
- StartLiveData(FromNow=False, FromStartOfRun=True, UpdateEvery=2, Instrument='SANS2D',
+ StartLiveData(FromNow=False, FromStartOfRun=True, UpdateEvery=2, Instrument='SANS2D',
Listener='KafkaEventListener', Address='kafkabroker:address', AccumulationMethod='Replace',
RunTransitionBehavior='Restart', OutputWorkspace='testout')
@@ -31,7 +31,7 @@ KafkaHistoListener
This listener is used for streaming histogram data. This will result in the creation of a :ref:`Workspace2D <Workspace2D>`. As with the `KafkaEventListener`, the listener address in `StartLiveData` should be set to the address of the kafka
broker. Please note that for this type of listener, events are accumulated for the instrument before streaming. Every new packet contains the historical accumulation of events so there is no neeed to manually keep track of
-this by summing events. This will produce incorrect information. Topic names for sample environment, run info etc are all standardized, pre-configured and offset against the instrument name which is set by the
+this by summing events. This will produce incorrect information. Topic names for sample environment, run info etc are all standardized, pre-configured and offset against the instrument name which is set by the
:ref:`StartLiveData <algm-StartLiveData>` *Instrument* field.
This following python script shows how this listener is used:
@@ -39,7 +39,7 @@ This following python script shows how this listener is used:
.. code-block:: python
# broker address can take the form hostname:port or ipaddress:port
- StartLiveData(FromNow=False, FromStartOfRun=True, UpdateEvery=1, Instrument='SANS2D',
+ StartLiveData(FromNow=False, FromStartOfRun=True, UpdateEvery=1, Instrument='SANS2D',
Listener='KafkaHistoListener', Address='kafkabroker:address', AccumulationMethod='Replace',
RunTransitionBehavior='Stop', OutputWorkspace='testout')
diff --git a/docs/source/concepts/LETSampleIDF.rst b/docs/source/concepts/LETSampleIDF.rst
index acaad1b19d3916941f93ee18611680e39c98437a..c0d758091827a4700f0e954cd6fe922b3e116418 100644
--- a/docs/source/concepts/LETSampleIDF.rst
+++ b/docs/source/concepts/LETSampleIDF.rst
@@ -2,16 +2,16 @@
.. role:: xml(literal)
:class: highlight
-
+
IDF ISIS LET annotated
=========================
-This page annotates the direct inelastic instrument LET, with the purpose of (hopefully) quickly learn the basis of creating a similar IDF.
+This page annotates the direct inelastic instrument LET, with the purpose of (hopefully) quickly learn the basis of creating a similar IDF.
Instrument view of LET
----------------------
-LET consists of doors (in the speech of LET scientists) where each door is made up of a number of tupes along the y-axis (green line in picture below), where each tube is made up of a sequence pixels (detectors).
+LET consists of doors (in the speech of LET scientists) where each door is made up of a number of tupes along the y-axis (green line in picture below), where each tube is made up of a sequence pixels (detectors).
The view of the instrument below is in the 'Full 3D' mode.
@@ -26,15 +26,15 @@ An annotated version of the ISIS LET IDF
.. code-block:: xml
<!-- Specify name of instrument and date from when this IDF is valid -->
- <instrument xmlns="http://www.mantidproject.org/IDF/1.0"
+ <instrument xmlns="http://www.mantidproject.org/IDF/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 Schema/IDFSchema.xsd"
- name="LET"
+ name="LET"
valid-from ="1900-01-31 23:59:59"
valid-to ="2100-01-31 23:59:59"
last-modified="2012-03-13 00:00:00">
-
- <!-- Specify various optional defaults -->
+
+ <!-- Specify various optional defaults -->
<defaults>
<length unit="meter"/>
<angle unit="degree"/>
@@ -42,25 +42,25 @@ An annotated version of the ISIS LET IDF
<along-beam axis="z"/>
<pointing-up axis="y"/>
<handedness val="right"/>
- <origin val="beam" />
+ <origin val="beam" />
</reference-frame>
<default-view view="cylindrical_y"/>
<!-- The option below will by default orientate the
z-axis of any component to point from (0,0,0) towards the component. -->
<components-are-facing x="0.0" y="0.0" z="0.0" />
</defaults>
-
-
- <!-- Specify monitor components. Monitors collect data hence
+
+
+ <!-- Specify monitor components. Monitors collect data hence
the idlist="monitors", which specify the name of a list of detector/monitor IDs.
For ISIS data this provides the link between the data and the components
collecting the data. Even for data not associated with unique IDs,
- unique ID numbers of your choice are still required, for subsequent
+ unique ID numbers of your choice are still required, for subsequent
use by Mantid analysis -->
<component type="monitors" idlist="monitors">
<location/>
</component>
-
+
<!-- Specify what a type with name="monitors" is. This type happens to be a container/grouping
of the monitors of this instrument. This grouping is here entirely optional. Only difference
it makes is that in the Mantid instrument view tree these will be listed under one node, and
@@ -78,12 +78,12 @@ An annotated version of the ISIS LET IDF
<location r="1.088" t="180.0" p="0.0" name="monitor8" />
</component>
</type>
-
+
<!-- Define the monitor detector IDs. There are 8 of these on LET -->
<idlist idname="monitors">
<id start="11" end="81" step="10"/>
</idlist>
-
+
<!-- Define the type monitor, which is given a physical shape.
More specifically here a cylindrical shape. See http://www.mantidproject.org/HowToDefineGeometricShape
for all the options for defining a physical shape -->
@@ -96,35 +96,35 @@ An annotated version of the ISIS LET IDF
</cylinder>
<algebra val="some-shape" />
</type>
-
-
+
+
<!-- ISIS is a neutron spallation source. Therefore an important
piece of information is the position the source relative to
- the sample, which is needed to calculate neutron flightpaths.
- The source currently also serves as a point along the beam, and
- the source-to-sample direction is used to determine the beam
+ the sample, which is needed to calculate neutron flightpaths.
+ The source currently also serves as a point along the beam, and
+ the source-to-sample direction is used to determine the beam
direction in a number of parts of the Mantid code. -->
<component type="undulator">
- <location z="-25.0"> <!-- Specify location of this component -->
- <facing val="none"/> <!-- The <facing> tag here overwrites the default <components-are-facing> set above -->
- </location>
+ <location z="-25.0"> <!-- Specify location of this component -->
+ <facing val="none"/> <!-- The <facing> tag here overwrites the default <components-are-facing> set above -->
+ </location>
</component>
- <!-- Specify the type with name "undulator", which 'is' marked as being the Source.
+ <!-- Specify the type with name "undulator", which 'is' marked as being the Source.
Optionally you may define a geometric shape for the Source. In some cases done
with the purpose to get it to show up in the Mantid Instrument view.
See http://www.mantidproject.org/HowToDefineGeometricShape for more on geometric shapes -->
<type name="undulator" is="Source">
<cylinder id="some-shape">
<centre-of-bottom-base r="0.0" t="0.0" p="0.0" />
- <axis x="0.0" y="0.0" z="1.0" />
+ <axis x="0.0" y="0.0" z="1.0" />
<radius val="0.01" />
<height val="0.03" />
- </cylinder>
+ </cylinder>
<algebra val="some-shape" />
</type>
-
+
<!-- Specify the position of the sample and here a shape for
- this sample also -->
+ this sample also -->
<component type="nickel-holder">
<location> <facing val="none"/> </location>
</component>
@@ -135,12 +135,12 @@ An annotated version of the ISIS LET IDF
</sphere>
<algebra val="some-shape" />
</type>
-
+
<!-- Specify the LET doors structure. Here the instrument scientist has
- decided to define components of types: door01, ..., door12, where
- each of these are placeholders for the same type LETdoor. The effect
+ decided to define components of types: door01, ..., door12, where
+ each of these are placeholders for the same type LETdoor. The effect
of this is that you will have the node structure door01->LETdoor->tube1 etc.
-
+
An alternative would have been to instead of the xml code
<component type="door01" idlist="door01">
<location />
@@ -150,13 +150,13 @@ An annotated version of the ISIS LET IDF
<location x="-1.8805" z="2.9519"> <facing x="0" y="0" z="0"/>
</component>
</type>
-
+
have
-
+
<component type="LETdoor" idlist="door01" name="door01">
<location x="-1.8805" z="2.9519"> <facing x="0" y="0" z="0"/>
</component>
-
+
which would have given the node structure door01->tube1 etc. Both choices are
equally valid. -->
<component type="door01" idlist="door01"><location /></component>
@@ -171,16 +171,16 @@ An annotated version of the ISIS LET IDF
<component type="door10" idlist="door10"><location /></component>
<component type="door11" idlist="door11"><location /></component>
<component type="door12" idlist="door12"><location /></component>
-
+
<type name="door01">
<component type="LETdoor">
<!-- Note here the instrument scientist has chosen to put in <facing x="0" y="0" z="0"/>
This element in fact here has no effect since the default
- option set at the top <components-are-facing x="0.0" y="0.0" z="0.0" />
+ option set at the top <components-are-facing x="0.0" y="0.0" z="0.0" />
will already face any component to x="0.0" y="0.0" z="0.0" -->
<location x="-1.8805" z="2.9519"> <facing x="0" y="0" z="0"/> </location>
</component>
- </type>
+ </type>
<type name="door02">
<component type="LETdoor">
<location x=" -1.0525 " z=" 3.3380 "> <facing x="0" y="0" z="0"/> </location>
@@ -236,7 +236,7 @@ An annotated version of the ISIS LET IDF
<location x=" 2.5805 " z=" -2.3646 "> <facing x="0" y="0" z="0"/> </location>
</component>
</type>
-
+
<type name="LETdoor">
<component type="LETtube" outline="yes">
<location x=" -0.393024 " z=" -0.221369E-01" name="tube1" />
@@ -273,10 +273,10 @@ An annotated version of the ISIS LET IDF
<location x=" 0.393024 " z=" -0.221369E-01" name="tube32" />
</component>
</type>
-
+
<!-- Here the type for a tube is defined. It using the shorthand notation
- <locations> to define 1024 pixels at positions along the y-axis.
-
+ <locations> to define 1024 pixels at positions along the y-axis.
+
Note also the 'outline' attribute is used. The attribute is to overcome
a technical difficulty when displaying and rotating a lot of
shapes in Mantid Instrument Viewer. For more information on this see www.mantidproject.org/IDF -->
@@ -285,8 +285,8 @@ An annotated version of the ISIS LET IDF
<locations y="-2.00304" y-end="2.00304" n-elements="1024" />
</component>
</type>
-
-
+
+
<type name="pixel" is="detector">
<cylinder id="cyl-approx">
<centre-of-bottom-base r="0.0" t="0.0" p="0.0" />
@@ -296,8 +296,8 @@ An annotated version of the ISIS LET IDF
</cylinder>
<algebra val="cyl-approx" />
</type>
-
-
+
+
<!-- DETECTOR ID LISTS -->
<idlist idname="door01">
<id start="1110001" end="1111024" />
@@ -708,7 +708,7 @@ An annotated version of the ISIS LET IDF
<id start="12480001" end="12481024" />
</idlist>
</instrument>
-
+
.. categories:: Concepts
\ No newline at end of file
diff --git a/docs/source/concepts/Lattice.rst b/docs/source/concepts/Lattice.rst
index 355af21531eafe323a88efffda86f2c0a1597cdf..7239216778e60626f7b5f4800895e1b76fd22d38 100644
--- a/docs/source/concepts/Lattice.rst
+++ b/docs/source/concepts/Lattice.rst
@@ -15,12 +15,12 @@ The physics of a system studied by neutron scattering is described by
the conservation of energy and momentum. In the laboratory frame:
.. math::
-
+
Q_l= \hbar \mathbf{k}_i^{} - \hbar \mathbf{k}_f
.. math::
-
+
\Delta E_l= \frac{\hbar^2}{2m} (k_i^2 - k_f^2)
Note that the left side in the above equations refer to what is
@@ -37,7 +37,7 @@ For such a lattice, the physics will be described in terms of reciprocal
lattice parameters by
.. math::
-
+
Q= 2 \pi\left(h \mathbf{a}^* + k \mathbf{b}^* +l \mathbf{c}^* \right) = \left(\begin{array}{c}
h \\
k \\
@@ -65,7 +65,7 @@ Busing and H. A. Levy, Angle calculations for 3- and 4-circle X-ray and
neutron diffractometers - Acta Cryst. (1967). 22, 457-464):
.. math::
-
+
B = \left( \begin{array}{ccc}
a^* & b^*\cos(\gamma^*) & c^*\cos(\beta^*) \\
0 & b^*\sin(\gamma^*) & -c^*\sin(\beta^*)\cos(\alpha) \\
@@ -94,10 +94,10 @@ Other useful equations:
ac\cos(\beta) & bc\cos(\alpha) & cc \end{array} \right)
The distance in reciprocal space to the :math:`\left(h,k,l\right)` plane
-is given by
+is given by
.. math::
-
+
d^* =\left| B \left(\begin{array}{c}
h \\
k \\
@@ -114,7 +114,7 @@ Unit cells
----------
The :class:`~mantid.geometry.UnitCell` class provides the functions to access direct and
-reciprocal lattices.
+reciprocal lattices.
Oriented lattices
-----------------
@@ -133,7 +133,7 @@ direction. For an orthogonal lattice with :math:`\mathbf{a}^*` along
matrix has the form:
.. math::
-
+
U = \left( \begin{array}{ccc}
0 & 1 & 0 \\
0 & 0 & 1 \\
diff --git a/docs/source/concepts/MDHistoWorkspace.rst b/docs/source/concepts/MDHistoWorkspace.rst
index 5c01615d2d3e5466dec87bd07a6175454f53c9b6..2e945b35a55f0519682ad43f8e1032bf781c2237 100644
--- a/docs/source/concepts/MDHistoWorkspace.rst
+++ b/docs/source/concepts/MDHistoWorkspace.rst
@@ -153,8 +153,8 @@ Accessing the Data
ws=CreateMDHistoWorkspace(Dimensionality=2,Extents='-3,3,-10,10', \
SignalInput=range(0,100),ErrorInput=range(0,100),\
NumberOfBins='10,10',Names='Dim1,Dim2',Units='MomentumTransfer,EnergyTransfer')
-
- # To get the signal and error at a prticular position
+
+ # To get the signal and error at a prticular position
index = ws.getLinearIndex(5,5)
print(ws.signalAt(index))
print(ws.errorSquaredAt(index))
@@ -194,7 +194,7 @@ The basic arithmetic operators are available from python. For example:
A=CreateMDHistoWorkspace(Dimensionality=2,Extents='-3,3,-10,10', \
SignalInput=range(0,100),ErrorInput=range(0,100),\
NumberOfBins='10,10',Names='Dim1,Dim2',Units='MomentumTransfer,EnergyTransfer')
- B = A.clone()
+ B = A.clone()
# Creating a new workspace
C = A + B
@@ -241,7 +241,7 @@ For example:
A=CreateMDHistoWorkspace(Dimensionality=2,Extents='-3,3,-10,10', \
SignalInput=range(0,100),ErrorInput=range(0,100),\
NumberOfBins='10,10',Names='Dim1,Dim2',Units='MomentumTransfer,EnergyTransfer')
- B = A.clone()
+ B = A.clone()
# Create boolean workspaces by comparisons
C = A > B
@@ -259,7 +259,7 @@ For example:
Using Boolean Masks
###################
-
+
The :ref:`SetMDUsingMask <algm-SetMDUsingMask>` algorithm allows you to modify
the values in a MDHistoWorkspace using a mask created using the boolean
operations above. See the :ref:`algorithm wiki page <algm-SetMDUsingMask>` for
diff --git a/docs/source/concepts/MDNorm.rst b/docs/source/concepts/MDNorm.rst
index c94e56a378cf358630104350c6245ec46cd508fa..ea71b38cbcb2c6cfcde340e0450505743650695d 100644
--- a/docs/source/concepts/MDNorm.rst
+++ b/docs/source/concepts/MDNorm.rst
@@ -7,8 +7,8 @@ Introduction to normalization
+++++++++++++++++++++++++++++
In any experiment, a measurement consists of a raw quantity of interest and
-a statistical significance of the measurement itself.
-For neutron diffraction, the differential scattering cross section at some
+a statistical significance of the measurement itself.
+For neutron diffraction, the differential scattering cross section at some
point :math:`\mathbf{Q}` in the reciprocal space, measured with a single
detector with a solid angle :math:`d \Omega`, is given by:
@@ -16,25 +16,25 @@ detector with a solid angle :math:`d \Omega`, is given by:
:label: CrossSectionSingDet
\frac{d\sigma}{d\Omega}=\frac{N}{\Phi \times d\Omega}
-
-where :math:`N` is the number of scattered neutrons in a small volume
+
+where :math:`N` is the number of scattered neutrons in a small volume
:math:`d \mathbf{Q}` around :math:`\mathbf{Q}`, and :math:`\Phi` is
the time integrated incident flux that contribute to the scattering in the given
-volume. :math:`N` is the raw quantity, while :math:`\Phi \times d \Omega`
+volume. :math:`N` is the raw quantity, while :math:`\Phi \times d \Omega`
is the statistical significance, or norm.
-If there are multiple detectors, or multiple experiments contributing to the
+If there are multiple detectors, or multiple experiments contributing to the
scattering in the :math:`d \mathbf{Q}` volume, one needs to add together the raw
data, add together the norms, and then divide
.. math::
:label: CrossSectionMultiDet
-
+
\frac{d\sigma}{d\Omega}=\frac{\sum_i N_i}{\sum_i \Phi_i \times d\Omega_i}
-
-The summation index :math:`i` represents every detector and sample orientation
-or repeated measurement that contribute to the scattering in the desired region
-of the reciprocal space.
+
+The summation index :math:`i` represents every detector and sample orientation
+or repeated measurement that contribute to the scattering in the desired region
+of the reciprocal space.
In a similar fashion, for inelastic scattering, the double
differential cross section must be written as:
@@ -45,11 +45,11 @@ differential cross section must be written as:
What this means is that, in the triple axes type
of measurements for example, where we have a single detector (solid
-angle :math:`d \Omega_i` is a constant), we should not
+angle :math:`d \Omega_i` is a constant), we should not
normalize data by monitor counts and then add different experiments together. The monitor
count is a proxy for the incident flux. We should instead
add raw data together, add monitors together, and only then divide.
-
+
.. important:
To correctly account for the statistical significance of the measurement
@@ -57,10 +57,10 @@ add raw data together, add monitors together, and only then divide.
Detector trajectories in reciprocal space for single crystal experiments
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
+
For direct geometry inelastic scattering, for any given experiment, all the incident
-flux :math:`\Phi_i` contributes to the scattering, and it is just a number.
-For diffraction and indirect geometry inelastic experiments one has to
+flux :math:`\Phi_i` contributes to the scattering, and it is just a number.
+For diffraction and indirect geometry inelastic experiments one has to
account only for the flux that contribute to the scattering in the :math:`d \mathbf{Q}`
region, which is detector and momentum dependent. Similarly, :math:`dE_i` is the length
along energy transfer axis of the detector trajectory inside the :math:`d \mathbf{Q}`
@@ -70,8 +70,8 @@ We assume that the regions :math:`d \mathbf{Q}` are given by a regular gridding
of the data in reciprocal space.
For a scattering event in a particular detector,
-the momentum transfer in the laboratory frame is related to the momentum transfer
-in the sample frame by the rotation of the sample goniometer. This is further related to
+the momentum transfer in the laboratory frame is related to the momentum transfer
+in the sample frame by the rotation of the sample goniometer. This is further related to
the crystallographic :math:`HKL` frame by the :math:`UB` matrix. In Mantid notation
this can be written as
@@ -81,33 +81,33 @@ this can be written as
\left(\begin{array}{r}
-k_F \sin(\theta) \cos(\phi)\\
-k_F \sin(\theta) \sin(\phi)\\
- k_I - k_F \cos(\theta)
- \end{array}\right) =
+ k_I - k_F \cos(\theta)
+ \end{array}\right) =
R \left(\begin{array}{c}
Q^{sample}_x \\
Q^{sample}_y \\
- Q^{sample}_z
+ Q^{sample}_z
\end{array}\right) =
- 2 \pi R \cdot U \cdot B
+ 2 \pi R \cdot U \cdot B
\left(\begin{array}{c}
H \\
K \\
- L
+ L
\end{array}\right)
-
+
where :math:`k_I` is the momentum of the incident neutron and :math:`k_F` is the one
of the scattered neutron. R is the rotation matrix of the goniometer. For diffraction case,
-:math:`k_I = k_F =k`. For direct geometry inelastic :math:`k_I` is fixed in
+:math:`k_I = k_F =k`. For direct geometry inelastic :math:`k_I` is fixed in
a particular experiment, while for indirect geometry inelastic :math:`k_F` is fixed for
the detector. From equation :eq:`MasterEquation` one can see that the trajectories in the reciprocal
-space are simply straight lines, parametrized by :math:`k` for diffraction,
+space are simply straight lines, parametrized by :math:`k` for diffraction,
:math:`k_I` for direct geometry, or :math:`k_F` for indirect geometry.
-If we calculate what the :math:`H, K, L` coordinates are for two points, say at
+If we calculate what the :math:`H, K, L` coordinates are for two points, say at
:math:`k_{min}` and :math:`k_{max}`, we can then write:
.. math::
:label: proportionality
-
+
\frac{H-H_{min}}{H_{max}-H_{min}}=\frac{K-K_{min}}{K_{max}-K_{min}}=
\frac{L-L_{min}}{L_{max}-L_{min}}=\frac{k-k_{min}}{k_{max}-k_{min}}
@@ -116,11 +116,11 @@ the trajectory with a plane at :math:`H=H_i`, we can just plug in :math:`H_i`
in the above equation and get the corresponding :math:`K_i, L_i, k_i`.
Any trajectory can miss a particular box in :math:`HKL` space, can be along one of the faces
-(say if :math:`H_{max}=H_{min}` then all :math:`H` points have the same value),
+(say if :math:`H_{max}=H_{min}` then all :math:`H` points have the same value),
or it can intersect the box in exactly two points. If we know the momentum
-corresponding to the intersections, say :math:`k_1` and :math:`k_2`, all we need is to
-integrate the incident flux between these two values, and then multiply with the solid
-angle of the detector, in order to obtain the statistical weight of this detector's
+corresponding to the intersections, say :math:`k_1` and :math:`k_2`, all we need is to
+integrate the incident flux between these two values, and then multiply with the solid
+angle of the detector, in order to obtain the statistical weight of this detector's
contribution to this particular region in the :math:`HKL` space.
A similar equation to :eq:`proportionality` can be obtained for inelastic scattering, by replacing
@@ -131,33 +131,33 @@ direction.
It is important to note that even if we calculate the intersections
of the trajectory with a particular box the norm might still be zero,
-since we could have no incident neutron flux corresponding to that
+since we could have no incident neutron flux corresponding to that
box in :math:`HKL` space.
.. important:
Always keep track of the regions you exclude from the measurement
(masking, cropping original data) when calculating normalization.
-
+
The way to account for excluded data is algorithm dependent. See
the documentation for each particular implementation.
Symmetrization
++++++++++++++
-To improve statistics in a certain region, one can use data from
+To improve statistics in a certain region, one can use data from
different regions of the reciprocal space that are related by the
symmetry of the physics in the material that is being studied.
A simple way to correctly estimate the statistical weight of the
-symmetrized data is to apply the symmetry operation on the detector
-trajectories (apply to :math:`H, K, L`
-at :math:`k_{min}` and :math:`k_{max}`) and recalculate the normalization.
-
+symmetrized data is to apply the symmetry operation on the detector
+trajectories (apply to :math:`H, K, L`
+at :math:`k_{min}` and :math:`k_{max}`) and recalculate the normalization.
+
Current implementation
++++++++++++++++++++++
-As of release 3.3, the normalization can be calculated for single crystal
-diffraction (:ref:`MDNormSCD <algm-MDNormSCD>`)
-and single crystal direct geometry inelastic scattering
+As of release 3.3, the normalization can be calculated for single crystal
+diffraction (:ref:`MDNormSCD <algm-MDNormSCD>`)
+and single crystal direct geometry inelastic scattering
(:ref:`MDNormDirectSC <algm-MDNormDirectSC>`).
References
diff --git a/docs/source/concepts/MatrixWorkspace.rst b/docs/source/concepts/MatrixWorkspace.rst
index 15c4f31583e7cad639dbd9109b9bc248f0a144e8..018e1e6714252d7261e7e450c772f57e53d25869 100644
--- a/docs/source/concepts/MatrixWorkspace.rst
+++ b/docs/source/concepts/MatrixWorkspace.rst
@@ -11,12 +11,12 @@ Matrix Workspace
A Matrix Workspace is a generic name for a family which contains measured (or derived) data (Y) with associated errors (E) and an axis (X) giving information about where the the measurement was made. The Matrix Workspace forms a 2D structure, more details on this will be provided below. This is the most common structure for storing data in Mantid. This covers several more detailed workspace types including:
- :ref:`Workspace2D <Workspace2D>` - A workspace for holding 2D, acuumulated data in memory, this is the most commonly used to store histograms.
-- :ref:`EventWorkspace <EventWorkspace>` - A workspace that retains the individual neutron event data.
+- :ref:`EventWorkspace <EventWorkspace>` - A workspace that retains the individual neutron event data.
What information is in a Matrix Workspace
------------------------------------------
-All Matrix Workspaces contain one or more rows of data. A single row is formed of a set of arrays (Y, E, X). For example, the output of a single detector in a white-beam measuring wavelength would form a single row. In this scenario The x-axis (or "horizontal axis") has units of length for wavelength, and Y would be the counts at each wavelength. The rows may have no correlation to each other. However, they are usually marked and sorted by some other attribute, such as detector number, or scattering angle. We call this row axis the "vertical axis". Axis have :ref:`Units <Unit Factory>`.
+All Matrix Workspaces contain one or more rows of data. A single row is formed of a set of arrays (Y, E, X). For example, the output of a single detector in a white-beam measuring wavelength would form a single row. In this scenario The x-axis (or "horizontal axis") has units of length for wavelength, and Y would be the counts at each wavelength. The rows may have no correlation to each other. However, they are usually marked and sorted by some other attribute, such as detector number, or scattering angle. We call this row axis the "vertical axis". Axis have :ref:`Units <Unit Factory>`.
Also they may contain:
@@ -237,7 +237,7 @@ Output:
for idx in range(0, ws.getNumberHistograms()):
tempValue = idx*3+25 # some made up value
newAxis.setValue(idx, tempValue)
-
+
# Replace axis 1 with the new axis
ws.replaceAxis(1, newAxis)
@@ -315,7 +315,7 @@ Matrix Workspace Operations
# To rebin the workspace
ws = ws.rebin(Params = 200)
- # or
+ # or
ws = Rebin(ws, Params = 200)
# Mask detectors or spectra (or use the MaskDetectors algorithm
@@ -329,7 +329,7 @@ Matrix Workspace Operations
DeleteWorkspace(wsClone)
# Do not access the python variable again as you will get a RuntimeError
# e.g. RuntimeError: Variable invalidated, data has been deleted.
-
+
.. testoutput:: MatrixWorkspaceOperations
:hide:
@@ -417,6 +417,6 @@ It is also possible to replace one of the input workspaces using one of +=,-=,*=
.. include:: WorkspaceNavigation.txt
-
+
.. categories:: Concepts
diff --git a/docs/source/concepts/ORNL_SANS_Reduction.rst b/docs/source/concepts/ORNL_SANS_Reduction.rst
index 4335d3b63dc9842f0e55c77e5a95dc32370f1c11..acfae052c0f3835de26949164a300b82aae531c9 100644
--- a/docs/source/concepts/ORNL_SANS_Reduction.rst
+++ b/docs/source/concepts/ORNL_SANS_Reduction.rst
@@ -2,13 +2,13 @@
.. role:: xml(literal)
:class: highlight
-
+
Reduction for ORNL SANS
=======================
This document explains how to use Mantid to perform reduction of ORNL SANS data.
-Information about the underlying Mantid algorithms involved can be found in the
+Information about the underlying Mantid algorithms involved can be found in the
:ref:`SANSReduction <algm-SANSReduction>` algorithm documentation.
For HFIR reduction specifically, you can also see the :ref:`HFIRSANSReduction <algm-HFIRSANSReduction>` algorithm documentation.
@@ -127,8 +127,8 @@ Options for finding the beam center
``BeamMonitorNormalization(reference_flux_file)``
[**EQSANS only**] Specifies that we want to normalize by the beam monitor, using the specified reference flux file.
-
-
+
+
.. _`Normalization options`:
Normalization options
@@ -157,7 +157,7 @@ Absolute Normalization
Tells the reducer to use the direct beam method to compute the absolute scale factor. The direct_beam parameter is a valid file path to the direct beam data file. attenuator_trans is the attenuator transmission. The sample_thickness should be given in cm. If apply_sensitivity=True, the sensitivity correction will be applied to the direct beam data before the absolute scale factor is computed.
The absolute cross-section in 1/cm is computed after all corrections including the transmission correction have been applied to the sample data. It is given by:
-
+
:math:`d\Sigma/d\Omega = \frac{I(Q)}{KD}`
where *D* is the sample thickness in *cm* and *K* is given by
@@ -199,7 +199,7 @@ Pixel masking
Masks the given detector IDs.
``MaskDetectorSide(side_to_mask=None)``
- Masks a detector plane. Choices are 'Front', 'Back', and 'None'.
+ Masks a detector plane. Choices are 'Front', 'Back', and 'None'.
``MaskComponent(component_name)``
Masks the given component_name. See the instrument IDF for the correct component name. Useful for BIOSANS to mask the 'wing_detector'.
@@ -254,13 +254,13 @@ Solid angle correction
:math:`\sigma_{i'(x,y)} = \frac{\sigma_{I(x,y)}}{|\cos^3(2\theta)|}`
If ``detector_tubes`` is selected, the correction is calculated according to a tube geometry. The cosine term above then becomes:
-
+
:math:`\cos^3(2\theta) \rightarrow \cos^2(2\theta) \cos(\alpha)`
where :math:`\alpha`: is the angle between the sample-to-pixel vector and its projection on the X-Z plane.
``detector_wing=True`` is used only for BioSANS wing detector.
-
+
.. figure:: /images/sans_solid_angle_correction.png
:figwidth: 10 cm
:align: right
@@ -290,7 +290,7 @@ Transmission correction
:math:`T=\frac{\sum_{i; \ d(i,j)<R} \sum_j{\frac{I_{sample}(i,j)}{T_{sample}}}}{\sum_{i; \ d(i,j)<R} \sum_j{\frac{I_{beam}(i,j)}{T_{beam}}}}`
where :math:`I_{sample}` and :math:`I_{beam}` are the pixel counts for the sample data set and the direct beam data set, respectively. The sums for each data set runs only over the pixels within a distance ``R=beam_radium`` of the beam center. :math:`T_{sample}` and :math:`T_{sample}` are the counting times for each of the two data sets. If the user chose to normalize the data using the beam monitor when setting up the reduction process, the beam monitor will be used to normalize the sample and direct beam data sets instead of the timer.
-
+
If ``use_sample_dc`` is set to True, the dark current data that was chosen to be subtracted from the sample data will also be subtracted from the flood data.
Once the transmission is calculated, it is applied to the input data set in the same way as described for ``SetTransmission()``.
@@ -317,7 +317,7 @@ Transmission correction
``SetTransmissionBeamCenter(x, y)``
Sets the beam center position to be used when applying the transmission correction. The beam center position of the sample data is otherwise used.
-
+
``TransmissionDirectBeamCenter(datafile)``
Specifies a direct beam data file to use to determine a beam center to use when applying the transmission correction. The beam center position of the sample data is otherwise used.
@@ -334,7 +334,7 @@ Background subtraction
``NoBckTransmission()``
Specifies that we do not want a transmission correction for the background.
-
+
``SetBckTransmission(trans, error, theta_dependent=True)``
Sets the background transmission.
@@ -352,7 +352,7 @@ Background subtraction
``SetBckTransmissionBeamCenter(x, y)``
Similar to ``SetTransmissionBeamCenter``, sets the beam center position to be used when applying the transmission correction. The beam center position of the background data is otherwise used.
-
+
``BckTransmissionDirectBeamCenter(datafile)``
Similar to ``TransmissionDirectBeamCenter``, specifies a direct beam data file to use to determine a beam center to use when applying the transmission correction. The beam center position of the background data is otherwise used.
@@ -404,15 +404,15 @@ Wedge calculation is done as part of the azimuthal averaging algorithm. The imag
:figwidth: 10 cm
:align: right
:alt: Wedge definition.
-
+
``SetWedges(number_of_wedges=2, wedge_angle=30.0, wedge_offset=0.0)``
Specifies I(q) wedges to compute.
-
+
- ``number_of_wedges``: number of wedges to calculate
- ``wedge_angle``: opening angle of each wedge, in degrees
- ``wedge_offset``: angular offset relative to the x-axis, defining the first wedge.
-
-
+
+
.. _`Data stitching`:
Data Stitching
@@ -429,7 +429,7 @@ In the process of scaling two data sets, all the points of the lower Q set with
``Stitch(data_list=[], q_min=None, q_max=None, output_workspace=None, scale=None, save_output=False)``
Stitches a set of SANS data sets
-
+
- ``data_list``: List of workspaces to stitch.
- ``q_min``: Minimum Q-value of the overlap between two consecutive data sets. The q_min argument must be an array when stitching more than two data sets. The length of the array should be 1 less than the number of data sets.
- ``q_max``: Maximum Q-value of the overlap between two consecutive data sets (must be an array for more than two data sets). The q_max argument must be an array when stitching more than two data sets. The length of the array should be 1 less than the number of data sets.
@@ -465,10 +465,10 @@ General commands
``ResetWavelength()``
Resets the wavelength to the value found in the data file.
-
+
``DivideByThickness(thickness=1.0)``
Specifies a thickness to normalize the output I(q) by, in cm.
-
+
``PerformFlightPathCorrection(do_correction=True)``
Specifies that we want to perform the flight path correction.
diff --git a/docs/source/concepts/PeaksWorkspace.rst b/docs/source/concepts/PeaksWorkspace.rst
index 1683ad32db0d5222e1453fa7abcf3466d391bc3c..d1dc4c11fd22848b7a9e78d0919152e2d73f2a0e 100644
--- a/docs/source/concepts/PeaksWorkspace.rst
+++ b/docs/source/concepts/PeaksWorkspace.rst
@@ -7,7 +7,7 @@ The PeaksWorkspace is a special Workspace that holds a list of single crystal Pe
Creating a PeaksWorkspace
--------------------------
-
+
* :ref:`FindPeaksMD <algm-FindPeaksMD>` will find peaks in reciprocal space in a :ref:`MDWorkspace <MDWorkspace>`.
* :ref:`FindSXPeaks <algm-FindSXPeaks>` will find peaks in detector space.
* :ref:`PredictPeaks <algm-PredictPeaks>` will predict peak positions in a workspace given a UB matrix.
@@ -20,7 +20,7 @@ Viewing a PeaksWorkspace
* Double-click a PeaksWorkspace to see the full list of data of each Peak object.
* In MantidPlot, you can drag/drop a PeaksWorkspace from the list of workspaces onto the `Instrument View <http://www.mantidproject.org/MantidPlot:_Instrument_View>`__ . This will overlay the peaks onto the detector face.
-* `PeaksViewer <http://www.mantidproject.org/PeaksViewer>`__ in the `SliceViewer <http://www.mantidproject.org/SliceViewer>`__
+* `PeaksViewer <http://www.mantidproject.org/PeaksViewer>`__ in the `SliceViewer <http://www.mantidproject.org/SliceViewer>`__
The Peak Object
--------------------------
@@ -84,7 +84,7 @@ PeaksWorkspace Python Interface
pws = mtd['name_of_peaks_workspace']
pws.getNumberPeaks()
p = pws.getPeak(12)
- pws.removePeak(34)
+ pws.removePeak(34)
Peak Python Interface
~~~~~~~~~~~~~~~~~~~~~
@@ -111,15 +111,15 @@ Once you have a handle on a peak "p" you have several methods to query/modify it
hkl = p.getHKL()
p.setHKL(-5, 4, 3)
-
+
q = p.getQSampleFrame()
q = p.getQLabFrame()
detid = p.getDetectorID()
-
+
p.setIntensity(1000.0)
p.setSigmaIntensity(31.6)
counts = p.getIntensity()
-
+
wl = p.getWavelength()
tof = p.getTOF()
d = p.getDSpacing()
diff --git a/docs/source/concepts/Properties.rst b/docs/source/concepts/Properties.rst
index 6f5a6ba0f9d036084ff2f2f0dfe68c11cd614f56..9edc8ff5c120f51cb9510882798fe3ddeee5e6a1 100644
--- a/docs/source/concepts/Properties.rst
+++ b/docs/source/concepts/Properties.rst
@@ -189,7 +189,7 @@ In addition to the above, if used, Workspace properties also have a
built in validator that requires that input workspaces exist and are of
the correct type and that output workspaces have a name set.
-For more details on using validators, see the PropertyAlgorithm
+For more details on using validators, see the PropertyAlgorithm
example or the full documentation for the individual validators (linked
above).
diff --git a/docs/source/concepts/PythonNotebook.rst b/docs/source/concepts/PythonNotebook.rst
index 0d25e69d73bb5c39f9a48f357d2d636f91b10f68..e3affa5446489be655d2444fec8e814e1f3c13d2 100644
--- a/docs/source/concepts/PythonNotebook.rst
+++ b/docs/source/concepts/PythonNotebook.rst
@@ -30,7 +30,7 @@ Launch Jupyter Notebook:
C:\MantidInstall\bin\mantidpython.bat notebook
-MacOS
+MacOS
-----
Open Terminal.
diff --git a/docs/source/concepts/SANS2DSampleIDF.rst b/docs/source/concepts/SANS2DSampleIDF.rst
index 0982fccd04039c82e6dba0f0583da98e6e0d2e9d..c6d08db4938ee1b76cd6031f69e438c26e447e67 100644
--- a/docs/source/concepts/SANS2DSampleIDF.rst
+++ b/docs/source/concepts/SANS2DSampleIDF.rst
@@ -1,6 +1,6 @@
.. _SANS2D_Sample_IDF:
-
+
.. role:: xml(literal)
:class: highlight
@@ -34,16 +34,16 @@ A detailed annotated version of the full ISIS SANS2D IDF
.. code-block:: xml
<!-- Specify name of instrument and date from when this IDF is valid -->
- <instrument xmlns="http://www.mantidproject.org/IDF/1.0"
+ <instrument xmlns="http://www.mantidproject.org/IDF/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 Schema/IDFSchema.xsd"
- name="SANS2D"
+ name="SANS2D"
valid-from="1900-01-31 23:59:59">
-
+
<!-- Specify various optional defaults -->
<defaults>
<length unit="meter"/>
- <angle unit="degree"/>
+ <angle unit="degree"/>
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
@@ -51,42 +51,42 @@ A detailed annotated version of the full ISIS SANS2D IDF
</reference-frame>
<default-view axis-view="z-"/>
</defaults>
-
-
+
+
<!-- ISIS is a neutron spallation source. Therefore an important
piece of information is the position the source relative to
- the sample, which is needed to calculate neutron flightpaths.
- The source currently also serves as a point along the beam, and
- the source-to-sample direction is used to determine the beam
+ the sample, which is needed to calculate neutron flightpaths.
+ The source currently also serves as a point along the beam, and
+ the source-to-sample direction is used to determine the beam
direction in a number of parts of the Mantid code. -->
<component type="source">
<location /> <!-- Specify location of this component. Specifying nothing means use defaults are (x=0,y=0,z=0) -->
</component>
- <type name="source" is="Source" /> <!-- Specify the type with name "source", which also 'is' marked as the Source -->
-
- <!-- Specify position of the sample. SANS2D scientists here
+ <type name="source" is="Source" /> <!-- Specify the type with name "source", which also 'is' marked as the Source -->
+
+ <!-- Specify position of the sample. SANS2D scientists here
chose to specify this at (x=0,y=0,z=19.281) in their preferred coordinates
system. Another common choice is setting the SamplePos at (0,0,0) -->
<component type="some-sample-holder">
<location z="19.281"/>
</component>
- <type name="some-sample-holder" is="SamplePos" />
-
- <!-- Specify monitor components. Monitors collect data hence
+ <type name="some-sample-holder" is="SamplePos" />
+
+ <!-- Specify monitor components. Monitors collect data hence
the idlist="monitors", which specify the name of a list of detector/monitor IDs.
For ISIS data this provides the link between the data and the components
collecting the data. Even for data not associated with unique IDs,
- unique ID numbers of your choice are still required, for subsequent
+ unique ID numbers of your choice are still required, for subsequent
use by Mantid analysis -->
<component type="monitors" idlist="monitors">
<location />
</component>
-
+
<!-- Define the monitor detector IDs. There are 8 of these on SANS2D -->
<idlist idname="monitors">
- <id start="1" end="8" />
- </idlist>
-
+ <id start="1" end="8" />
+ </idlist>
+
<!-- Specify what a type with name="monitors" is. This type happens to be a container/grouping
of the monitors of this instrument. This grouping is here entirely optional. Only difference
it makes is that in the Mantid instrument view tree these will be listed under one node, and
@@ -102,29 +102,29 @@ A detailed annotated version of the full ISIS SANS2D IDF
</component>
<component type="monitor-tbd">
<location z="30.0" name="monitor4"/>
- </component>
+ </component>
<!-- These monitors are defined in the data, but in fact do not exist on
the instrument at present. So these are just located at dummy locations -->
- <component type="no shape monitor">
+ <component type="no shape monitor">
+ <location z="0" name="placeholder monitor"/>
<location z="0" name="placeholder monitor"/>
<location z="0" name="placeholder monitor"/>
<location z="0" name="placeholder monitor"/>
- <location z="0" name="placeholder monitor"/>
- </component>
+ </component>
</type>
-
+
<!-- Define one of the monitor types. This monitor is given a physical shape.
More specifically here a cylindrical shape. See http://www.mantidproject.org/HowToDefineGeometricShape
for all the options for defining a physical shape -->
<type name="monitor-tbd" is="monitor">
<cylinder id="some-shape">
<centre-of-bottom-base r="0.0" t="0.0" p="0.0" />
- <axis x="0.0" y="0.0" z="1.0" />
+ <axis x="0.0" y="0.0" z="1.0" />
<radius val="0.01" />
<height val="0.03" />
- </cylinder>
+ </cylinder>
</type>
-
+
<!-- Another monitor type -->
<type name="Moderator-Monitor3" is="monitor">
<percent-transparency val="99.9" />
@@ -135,32 +135,32 @@ A detailed annotated version of the full ISIS SANS2D IDF
<right-front-bottom-point x="0.0125" y="0.0125" z="0.0" />
</cuboid>
<algebra val="shape" />
- </type>
-
+ </type>
+
<!-- Define a no shape monitor type -->
- <type name="no shape monitor" is="monitor" />
-
-
+ <type name="no shape monitor" is="monitor" />
+
+
<!-- Specify the SANS2D front detector bank, which is a square detector bank of 192 x 192 pixels
Because this detector bank is described using an optional shortcut notation then an 'idlist' is
not used to specify the detector IDs. Instead the tags idstart, idfillbyfirst, idstep and idstepbyrow
which in this particular case means the ID are assigned as shown in the instrument view picture on this page -->
<component type="detector-bank" idstart="2000000" idfillbyfirst="y" idstep="1000" idstepbyrow="1">
<location x="1.1" z="23.281" name="front-detector"/>
- </component>
-
- <!-- Specify the SANS2D rear detector, which is of the same type as the front detector bank -->
+ </component>
+
+ <!-- Specify the SANS2D rear detector, which is of the same type as the front detector bank -->
<component type="detector-bank" idstart="1000000" idfillbyfirst="y" idstep="1000" idstepbyrow="1">
<location z="23.281" name="rear-detector"/>
</component>
-
+
<!-- Specify what a detector bank type is, which is a square array of 192 x 192 pixels, and here
a shortcut notation is used do define such a bank using is="RectangularDetector" -->
- <type name="detector-bank" is="RectangularDetector" type="pixel"
+ <type name="detector-bank" is="RectangularDetector" type="pixel"
xpixels="192" xstart="-0.48705" xstep="+0.0051"
ypixels="192" ystart="-0.48705" ystep="+0.0051" >
- </type>
-
+ </type>
+
<!-- Specify a pixel type -->
<type name="pixel" is="detector">
<cuboid id="shape">
@@ -169,9 +169,9 @@ A detailed annotated version of the full ISIS SANS2D IDF
<left-back-bottom-point x="-0.005104167" y="-0.005104167" z="0.0" />
<right-front-bottom-point x="0.005104167" y="0.005104167" z="0.0" />
</cuboid>
- <algebra val="shape" />
- </type>
-
+ <algebra val="shape" />
+ </type>
+
</instrument>
diff --git a/docs/source/concepts/Sample.rst b/docs/source/concepts/Sample.rst
index 4867af414fff31cf8942aea84fc1ec823e4ddd24..7a7014a9631a0a6c00aaf5882df1ec7be0bf9104 100644
--- a/docs/source/concepts/Sample.rst
+++ b/docs/source/concepts/Sample.rst
@@ -10,7 +10,7 @@ Sample
What is the Sample object?
--------------------------
-
+
The sample object holds details of the samples in an experiment.
While most of the time this will refer to a single sample, it can also describe a collection of samples.
Specifically this holds information about a samples:
@@ -70,7 +70,7 @@ Sample Properties
Material Name V
Total scattering X-Section: 5.1
Data lattice parameters are: 2.0 3.0 4.0 90.0 90.0 90.0
-
+
Multiple Samples
################
@@ -82,7 +82,7 @@ The ``Sample()`` method actually returns a collection, however if you do not spe
ws = CreateSampleWorkspace("Histogram",NumBanks=1,BankPixelWidth=1)
s = ws.sample()
- # Is the same as
+ # Is the same as
s = ws.sample()[0]
# You can ask how many samples there are with
diff --git a/docs/source/concepts/SampleEnvironment.rst b/docs/source/concepts/SampleEnvironment.rst
index 944c917cf0d8c782015b7949f911a58e00494e5d..cfb18021ef04423acf37f6b5fdc82d0d00d79496 100644
--- a/docs/source/concepts/SampleEnvironment.rst
+++ b/docs/source/concepts/SampleEnvironment.rst
@@ -66,7 +66,7 @@ must be chosen by the user at the time the environment is attached to a
workspace with the ``Environment`` option on the
:ref:`SetSample <algm-SetSample>` algorithm.
-The container and sample geometry can alternatively be defined using a mesh description by
+The container and sample geometry can alternatively be defined using a mesh description by
specifying an .stl file as follows.
.. code-block:: xml
@@ -86,7 +86,7 @@ specifying an .stl file as follows.
</containers>
</components>
</environmentspec>
-
+
Mantid will try the following approaches to find the path to the stl file (in order):
- If a full path is supplied in the filename attribute then it will be used
@@ -198,7 +198,7 @@ The non-container components can also be defined using mesh geometry by specifyi
</component>
</components>
</environmentspec>
-
+
The shape defined in the stl file can be transformed and\or rotated in order to assemble it correctly with
the other environment components. This is achieved by specifying a translation or rotation tag in the xml.
The translation tag has an attribute vector which is a comma separated list of x, y, z coordinates.
diff --git a/docs/source/concepts/TableWorkspaces.rst b/docs/source/concepts/TableWorkspaces.rst
index b0e2cb6030b7b5022fd07cedabd1731f9ae01edc..ff15e542ea886d0c38461f41dc08f1f10a374b10 100644
--- a/docs/source/concepts/TableWorkspaces.rst
+++ b/docs/source/concepts/TableWorkspaces.rst
@@ -67,7 +67,7 @@ Most of the time Table workspaces are the output of certain algorithms, but you
detIDList = range(1,4)
detPosList = [ V3D(9.0,0.0,0.0), V3D(10.0,3.0,0.0), V3D(12.0,3.0,6.0)]
for j in range(len(detIDList)):
- nextRow = { 'Detector ID': detIDList[j],
+ nextRow = { 'Detector ID': detIDList[j],
'Detector Name': "Detector {0}".format(detIDList[j]),
'Detector Position': detPosList[j],
'Value': 10,
@@ -85,15 +85,15 @@ Table Workspace Properties
tableWS = CreateEmptyTableWorkspace()
# Add some columns
- tableWS.addColumn(type="int",name="Detector ID")
- tableWS.addColumn(type="str",name="Detector Name")
+ tableWS.addColumn(type="int",name="Detector ID")
+ tableWS.addColumn(type="str",name="Detector Name")
tableWS.addColumn(type="V3D",name="Detector Position")
# Populate the columns for three detectors
detIDList = range(1,4)
detPosList = [ V3D(9.0,0.0,0.0), V3D(10.0,3.0,0.0), V3D(12.0,3.0,6.0)]
for j in range(len(detIDList)):
- nextRow = { 'Detector ID': detIDList[j],
+ nextRow = { 'Detector ID': detIDList[j],
'Detector Name': "Detector {0}".format(detIDList[j]),
'Detector Position': detPosList[j] }
tableWS.addRow ( nextRow )
@@ -113,7 +113,7 @@ Table Workspace Properties
# Add Rows
tableWS.addRow( [2, "new Detector 1", V3D(2,2,2)])
# or using a dictionary
- nextRow = { 'Detector ID': 5,
+ nextRow = { 'Detector ID': 5,
'Detector Name': "new Detector 2",
'Detector Position': V3D(5,5,5) }
tableWS.addRow ( nextRow )
@@ -164,7 +164,7 @@ Pickling Workspaces
A TableWorkspace may be `pickled <https://docs.python.org/2/library/pickle.html/>` and de-pickled in python. Users should prefer using cPickle over pickle, and make sure that the protocol option is set to the HIGHEST_PROTOCOL to ensure that the serialization/deserialization process is as fast as possible.
-.. code-block:: python
+.. code-block:: python
import cPickle as pickle
pickled = pickle.dumps(ws2d, pickle.HIGHEST_PROTOCOL)
@@ -230,7 +230,7 @@ Cells with the same index form a row. TableRow class represents a row.
Use getRow(int) or getFirstRow() to access existing rows. For example:
.. code-block:: c++
-
+
std::string key;
double value;
TableRow row = table->getFirstRow();
diff --git a/docs/source/concepts/UsingXMLSchema.rst b/docs/source/concepts/UsingXMLSchema.rst
index bab531897bbb9a07518f5ad3275e7193e3f3330d..90ad7ffbd25ea83d40e98af4f6883a9656e4077f 100644
--- a/docs/source/concepts/UsingXMLSchema.rst
+++ b/docs/source/concepts/UsingXMLSchema.rst
@@ -3,10 +3,10 @@
Using XML Schemas
=================
-This page gives instructions on how to configure various editing programs for
-writing XML with schema validation. This helps by finding errors in
-XML structure, and displaying the list of elements and attributes allowed at
-any point in the XML file. This will be useful for anyone creating an
+This page gives instructions on how to configure various editing programs for
+writing XML with schema validation. This helps by finding errors in
+XML structure, and displaying the list of elements and attributes allowed at
+any point in the XML file. This will be useful for anyone creating an
Instrument Definition file (IDF) or Parameters file, or editing the Facilities file
XML Editors with Schema Validation tools
@@ -21,10 +21,10 @@ Examples of editors that include schema validation tools:
- `Stylusstudio <http://www.stylusstudio.com/open_xsd_validation.html>`__
Where an XML includes a link to an XML schema then simply open the XML file in
-say Visual Studio and the editor will give you feedback if you for example are
-missing attributes of an XML element that the Schema thinks should be there.
+say Visual Studio and the editor will give you feedback if you for example are
+missing attributes of an XML element that the Schema thinks should be there.
For example all :ref:`IDFs <InstrumentDefinitionFile>` shipped with Mantid
-contain a link to the IDF Schema.
+contain a link to the IDF Schema.
.. categories:: Concepts
diff --git a/docs/source/concepts/WorkingWithWorspaces.rst b/docs/source/concepts/WorkingWithWorspaces.rst
index 6c94ae245182ad875003a3b877dda75c1918ed88..78d7e7bfe8729bf5fdae14fae7ebced44464b893 100644
--- a/docs/source/concepts/WorkingWithWorspaces.rst
+++ b/docs/source/concepts/WorkingWithWorspaces.rst
@@ -102,7 +102,7 @@ Output:
InputWorkspace = myWS
OutputWorkspace = myWS
Params = 200
-
+
The full documentation for workspace history can be found at the :class:`~mantid.api.WorkspaceHistory` api.
.. categories:: Concepts
diff --git a/docs/source/concepts/Workspace.rst b/docs/source/concepts/Workspace.rst
index d8240494a5b0655f96f58ade2df11e305261facc..9127f499eea4a3c1dd305a42936223f8c94d33bb 100644
--- a/docs/source/concepts/Workspace.rst
+++ b/docs/source/concepts/Workspace.rst
@@ -10,11 +10,11 @@ Workspace
What are Workspaces?
--------------------
-Workspaces store data that :ref:`algorithms <algorithm>` operate on. Workspaces are usually stored in-memory. An algorithm can manipulate a workspace in-place or create a new one as an output.
+Workspaces store data that :ref:`algorithms <algorithm>` operate on. Workspaces are usually stored in-memory. An algorithm can manipulate a workspace in-place or create a new one as an output.
Workspace is as loose term that encompases a range of possible data structures. All forms of Workspace provide some common information:
-- The type identifier (id) of the workspace (see below), unique to every type of workspace
+- The type identifier (id) of the workspace (see below), unique to every type of workspace
- The name of the workspace, unique to every instance of a workspace even those of the same type
- The history of :ref:`algorithms <algorithm>` that were run to form and manipulate the workspace to its current state
@@ -39,7 +39,7 @@ Workspaces Types
workspaces. Algorithms given a group as input usually run sequentially on
each member of the group.
-The workspace type id identifies the type of a Workspace instance.
+The workspace type id identifies the type of a Workspace instance.
.. tip:: For C++ or Python development, these values are needed in such functions as the :ref:`Analysis Data Service's <Analysis Data Service>` createWorkspace.
diff --git a/docs/source/concepts/Workspace2D.rst b/docs/source/concepts/Workspace2D.rst
index ecf4b25977796a6c506c0d2353130e993672f0e9..58c48cc2fe6856b812904a6079b0c3b577b6de69 100644
--- a/docs/source/concepts/Workspace2D.rst
+++ b/docs/source/concepts/Workspace2D.rst
@@ -19,7 +19,7 @@ only contains bin information and does not contain the underlying event
data. The :ref:`EventWorkspace <EventWorkspace>` presents itself as a
histogram (with X,Y,E values) but preserves the underlying event data.
-For more information on what a Workspace2D contains, see
+For more information on what a Workspace2D contains, see
:ref:`MatrixWorkspace <MatrixWorkspace>`.
There is also a specialised form of Workspace2D, called a RebinnedOutput
@@ -28,7 +28,7 @@ to the signal Y and error E values for each bin, it also carries the
fractional weight F of the signal in the bin. This is needed to keep
track of the portions of counts from bins in the original grid which has
been put into the new (rebinned) grid. A more detailed explanation is
-given in the description of :ref:`algm-SofQWNormalisedPolygon`.
+given in the description of :ref:`algm-SofQWNormalisedPolygon`.
For correct handling of the fractional weights in rebinning, the user
is recommended to use the :ref:`algm-Rebin2D` algorithm in preference
to :ref:`algm-Integration` or :ref:`algm-SumSpectra` although the other
@@ -76,12 +76,12 @@ A Workspace2D may be `pickled <https://docs.python.org/2/library/pickle.html/>`
- Only Workspace2D objects can be pickled and de-pickled. Other :ref:`MatrixWorkspace <MatrixWorkspace>` subtypes cannot be pickled
- Meta-data such as sample logs are not pickled
- Masking flags are not pickled
-- Scanning Workspace2D objects are not permitted for pickling
+- Scanning Workspace2D objects are not permitted for pickling
- Workspace2D objects are always converted into :ref:`histograms <HistogramData>` formed as bin edges and counts as part of the pickling process.
In addition, users should prefer using cPickle over pickle, and make sure that the protocol option is set to the HIGHEST_PROTOCOL to ensure that the serialization/deserialization process is as fast as possible.
-.. code-block:: python
+.. code-block:: python
import cPickle as pickle
pickled = pickle.dumps(ws2d, pickle.HIGHEST_PROTOCOL)
diff --git a/docs/source/concepts/WorkspaceGroup.rst b/docs/source/concepts/WorkspaceGroup.rst
index 7df57fdbea90304e71b43537d3cec81beb07bc9c..1a16fc7b01b0fb8248e933e0903ebd86e775466d 100644
--- a/docs/source/concepts/WorkspaceGroup.rst
+++ b/docs/source/concepts/WorkspaceGroup.rst
@@ -34,7 +34,7 @@ Workspace groups can be created in a more flexible way in the Python script wind
# Create a group workpace
wsList = [ws1,ws2,ws3]
wsGroup = GroupWorkspaces(wsList)
- # or
+ # or
wsGroup = GroupWorkspaces("ws1,ws2,ws3")
print(wsGroup.getNames())
@@ -227,7 +227,7 @@ otherwise indexing will be confused by each deletion.
ws1 = CreateSampleWorkspace()
ws2 = CreateSampleWorkspace()
wsGroup = GroupWorkspaces("ws1,ws2")
-
+
DeleteWorkspace(wsGroup)
.. include:: WorkspaceNavigation.txt
diff --git a/docs/source/concepts/WorkspaceNavigation.txt b/docs/source/concepts/WorkspaceNavigation.txt
index 213a70a7a9db976f6e58f3cab2c4ac271520f723..000f183f820bb26ab0605cbd2106ce04416047ad 100644
--- a/docs/source/concepts/WorkspaceNavigation.txt
+++ b/docs/source/concepts/WorkspaceNavigation.txt
@@ -5,8 +5,8 @@ Other Information on Workspaces
- :ref:`MatrixWorkspace <MatrixWorkspace>` - A base class that contains
among others:
- - WorkspaceSingleValue - Holds a single number (and X & error value,
- if desired). Mainly used for workspace algebra, e.g. to divide all
+ - WorkspaceSingleValue - Holds a single number (and X & error value,
+ if desired). Mainly used for workspace algebra, e.g. to divide all
bins in a 2D workspace by a single value.
- :ref:`Workspace2D <Workspace2D>` - A workspace for holding two
dimensional data in memory, this is the most commonly used
@@ -19,4 +19,3 @@ Other Information on Workspaces
- :ref:`WorkspaceGroup <WorkspaceGroup>` - A container for a collection of
workspaces. Algorithms given a group as input run sequentially on
each member of the group.
-
\ No newline at end of file
diff --git a/docs/source/concepts/calibration/EngineeringCalibration.rst b/docs/source/concepts/calibration/EngineeringCalibration.rst
index 845c303e87c1a6737a8e24631603ff97c90cb9c2..9d5d50e3618e0ab4007ccce24a27713545bc62c8 100644
--- a/docs/source/concepts/calibration/EngineeringCalibration.rst
+++ b/docs/source/concepts/calibration/EngineeringCalibration.rst
@@ -2,7 +2,7 @@
Engineering Calibration
=======================
-
+
.. contents::
:local:
@@ -30,7 +30,7 @@ It is possible to load an existing calibration (as a CSV file) and to
generate a new calibration file (which becomes the new current
calibration).
-A description of the interface and all of it's controls can be found
+A description of the interface and all of it's controls can be found
:ref:`here <ui engineering calibration>`.
Calibrating the entire instrument
@@ -41,14 +41,14 @@ Calibration of every detector/pixel at the same time is done by :ref:`EnggCalibr
Calibrating individual banks
############################
-:ref:`EnggCalibrate <algm-EnggCalibrate>` allows calibration of individual bank within the instrument, which is useful if only one bank has moved from a previous calibration, or if the calibration failed for a certain area of the instrument.
-
+:ref:`EnggCalibrate <algm-EnggCalibrate>` allows calibration of individual bank within the instrument, which is useful if only one bank has moved from a previous calibration, or if the calibration failed for a certain area of the instrument.
+
Under the hood
##############
-All of these approaches use the algorithm :ref:`EnggFitPeaks <algm-EnggFitPeaks>`, :ref:`FindPeaks <algm-FindPeaks>` and :ref:`EnggVanadiumCorrections <algm-EnggVanadiumCorrections>` to find, and fit the recorded peaks and compare them to the expected values.
+All of these approaches use the algorithm :ref:`EnggFitPeaks <algm-EnggFitPeaks>`, :ref:`FindPeaks <algm-FindPeaks>` and :ref:`EnggVanadiumCorrections <algm-EnggVanadiumCorrections>` to find, and fit the recorded peaks and compare them to the expected values.
-The peak functions (shapes):
+The peak functions (shapes):
* :ref:`BackToBackExponential<func-BackToBackExponential>` (used in EnggFitPeaks, to fit the peaks when accuracy is needed)
* :ref:`Gaussian<func-Gaussian>` (used in FindPeaks when the a quick validation is needed, but fit accuracy is not vital)
diff --git a/docs/source/concepts/calibration/PSDTubeCalibration.rst b/docs/source/concepts/calibration/PSDTubeCalibration.rst
index f19bdf5bf3d46e17693c92d2ec849a68cfaa3ad1..aa2ba9c657740007f5992d1f68c1084a20908582 100644
--- a/docs/source/concepts/calibration/PSDTubeCalibration.rst
+++ b/docs/source/concepts/calibration/PSDTubeCalibration.rst
@@ -3,7 +3,7 @@
PSD Tube Calibration
====================
-Welcome! This is a landing page for documentation relating to the
+Welcome! This is a landing page for documentation relating to the
use of Mantid for Tube Calibration.
diff --git a/docs/source/concepts/calibration/TubeCalibFitParams.rst b/docs/source/concepts/calibration/TubeCalibFitParams.rst
index c74ccbc18e5f159a1adf5094f91707846dca10bc..1b245694939d58fd7884661e83465068a5c35b92 100644
--- a/docs/source/concepts/calibration/TubeCalibFitParams.rst
+++ b/docs/source/concepts/calibration/TubeCalibFitParams.rst
@@ -3,7 +3,7 @@
TubeCalibFitParams
==================
-An object of the python class (defined in tube_calib_fit_param.py) holds the parameters needed for fitting the positions of the peaks formed by the slits or edges. The constructor has the following arguments:
+An object of the python class (defined in tube_calib_fit_param.py) holds the parameters needed for fitting the positions of the peaks formed by the slits or edges. The constructor has the following arguments:
+-----+-----------------+------------+----------+--------------------------------------------------+
|Order|Name |Type |Default |Description |
@@ -19,6 +19,6 @@ An object of the python class (defined in tube_calib_fit_param.py) holds the par
| | | | |is used, else it's peak fitting of slits |
+-----+-----------------+------------+----------+--------------------------------------------------+
-After creation it just needs to be passed to getCalibration of :ref:`Tube_calib`.
+After creation it just needs to be passed to getCalibration of :ref:`Tube_calib`.
-If ThreePointMethod is True, then the other arguments are ignored and Peaks can be an empty array.
+If ThreePointMethod is True, then the other arguments are ignored and Peaks can be an empty array.
diff --git a/docs/source/concepts/calibration/TubeCalibrationExamples.rst b/docs/source/concepts/calibration/TubeCalibrationExamples.rst
index c76b79b1dffa3293fea062eb26e4def9bdd904e0..824951fb40f1fec1e6370a281f6cdd865de3675b 100644
--- a/docs/source/concepts/calibration/TubeCalibrationExamples.rst
+++ b/docs/source/concepts/calibration/TubeCalibrationExamples.rst
@@ -90,15 +90,15 @@ calling the functions as in the following example:
The results are, Uncalibrated MAPS B2 window (lower part) instrument:
-.. image:: ../../images/UncalibratedMAPS.png
+.. image:: ../../images/UncalibratedMAPS.png
:width: 500px
-
+
Calibrated MAPS B2 window:
-.. image:: ../../images/CalibratedMAPS.png
+.. image:: ../../images/CalibratedMAPS.png
:width: 500px
-
+
Running TubeCalibDemoMerlin.py
##############################
@@ -143,7 +143,7 @@ the panels.
The picture below show part of two panels that result from the
calibration (they are rotated):
-.. image:: ../../images/CalibratedWish5Panels.jpg
+.. image:: ../../images/CalibratedWish5Panels.jpg
:width: 800px
.. categories:: Calibration
\ No newline at end of file
diff --git a/docs/source/diagrams/AccumulateMD-v1_wkflw.dot b/docs/source/diagrams/AccumulateMD-v1_wkflw.dot
index 14490a01fb2a872e099ab5140d0293d35018629b..503d5beced552d60c4bbd2af6a43777ed36e2325 100644
--- a/docs/source/diagrams/AccumulateMD-v1_wkflw.dot
+++ b/docs/source/diagrams/AccumulateMD-v1_wkflw.dot
@@ -16,36 +16,36 @@ digraph AccumulateMD {
createMD2 [label="CreateMD v1"]
mergeMD [label="MergeMD v1"]
}
-
+
subgraph decisions {
$decision_style
existYet [label="Do any of these\nDataSources exist yet?"]
createClean [label="Is Clean true?"]
newData [label="Are any of the DataSources not\nalready in InputWorkspace?"]
}
-
+
subgraph values{
$value_style
done1 [label="Done"]
done2 [label="Done"]
-
+
}
-
+
DataSources -> existYet
InputWorkspace -> existYet
Clean -> createClean
-
+
existYet -> createClean [label="Yes"]
existYet -> done1 [label="No"]
-
+
createClean -> newData [label="No"]
createClean -> createMD1 [label="Yes"]
createMD1 -> OutputWorkspace
-
+
newData -> done2 [label="No"]
newData -> createMD2 [label="Yes - Create workspace\nwith new data sources"]
-
+
createMD2 -> mergeMD [label="Merge created workspace with InputWorkspace"]
mergeMD -> OutputWorkspace
diff --git a/docs/source/diagrams/CreateMD-v1_wkflw.dot b/docs/source/diagrams/CreateMD-v1_wkflw.dot
index 1d7748928503ed3307cdd7a87867fb85966bae46..ab582a51e00f9254bf9a57863681134bc2d9dab1 100644
--- a/docs/source/diagrams/CreateMD-v1_wkflw.dot
+++ b/docs/source/diagrams/CreateMD-v1_wkflw.dot
@@ -35,14 +35,14 @@ digraph CreateMD {
Gs -> addSampleLogGs
EFix -> addSampleLogEFix
Psi -> addSampleLogPsi
-
+
Alatt -> setUB
Angdeg -> setUB
u -> setUB
v -> setUB
-
+
EMode -> convertToMD
-
+
EMode -> convertToMDMinMaxGlobal
DataSources -> setUB [label="if workspace"]
diff --git a/docs/source/diagrams/CutMD-v1_wkflw.dot b/docs/source/diagrams/CutMD-v1_wkflw.dot
index 15030efb74868af3fba50fb16bd75fac9cbc6c8d..b87f73434acbdd4c73e8f5b03973f6aa8c6c9249 100644
--- a/docs/source/diagrams/CutMD-v1_wkflw.dot
+++ b/docs/source/diagrams/CutMD-v1_wkflw.dot
@@ -16,30 +16,30 @@ digraph CutMD {
sliceMD [label="SliceMD v1"]
binMD [label="BinMD v1"]
}
-
+
subgraph decisions {
$decision_style
noPixQuestion [label="NoPix?"]
}
-
+
subgraph calculation{
$process_style
scale [label="Scale between rlu and inverse angstroms if required"]
extents [label="Calculate extents of the new workspace"]
-
+
}
- Projection -> scale
+ Projection -> scale
InterpretQDimensionUnits -> scale
NoPix -> noPixQuestion
-
+
InputWorkspace -> scale
scale -> extents
extents -> noPixQuestion
-
+
noPixQuestion -> binMD [label="Yes"]
noPixQuestion -> sliceMD [label="No"]
-
+
sliceMD -> OutputWorkspace
binMD -> OutputWorkspace
diff --git a/docs/source/diagrams/DetectorDiagnostic-v1_wkflw.dot b/docs/source/diagrams/DetectorDiagnostic-v1_wkflw.dot
index 1db23fe93729c7c0db99c79f7eef27fa7af776eb..2d307b1c26fcb21b9d79a2b5e592b4ea74c84d7a 100644
--- a/docs/source/diagrams/DetectorDiagnostic-v1_wkflw.dot
+++ b/docs/source/diagrams/DetectorDiagnostic-v1_wkflw.dot
@@ -59,7 +59,7 @@ digraph ReflectometryReductionOne {
medianDetTest -> checkSample
sampleWorkspace -> checkSample
checkSample -> createPSDBMask [label="Yes"]
- checkSample -> extractMask [label="No"]
+ checkSample -> extractMask [label="No"]
createPSDBMask -> extractMask
extractMask -> outputWorkspace
}
diff --git a/docs/source/diagrams/FlatPlatePaalmanPingsCorrection-v1_wkflw.dot b/docs/source/diagrams/FlatPlatePaalmanPingsCorrection-v1_wkflw.dot
index f6802ddb878b974d5a9fa5fd85cd7dd86cc3088d..b88959b37ae1742d465dde8438ecf2f7d0650c8b 100644
--- a/docs/source/diagrams/FlatPlatePaalmanPingsCorrection-v1_wkflw.dot
+++ b/docs/source/diagrams/FlatPlatePaalmanPingsCorrection-v1_wkflw.dot
@@ -37,7 +37,7 @@ digraph FlatPlatePaalmanPingsCorrection {
GroupWorkspaces
SplineInterpolation
}
-
+
subgraph decisions {
$decision_style
useCan [label="Using can"]
@@ -46,7 +46,7 @@ digraph FlatPlatePaalmanPingsCorrection {
interpolate [label="Interpolate"]
processedAngles [label="Processed all angles"]
}
-
+
subgraph process {
$process_style
detAngles [label="get_angles: Determine detector angles based on sample workspace"]
@@ -103,5 +103,5 @@ digraph FlatPlatePaalmanPingsCorrection {
interpolate -> SplineInterpolation [label="Yes"]
SplineInterpolation -> GroupWorkspaces
interpolate -> GroupWorkspaces [label="No"]
- GroupWorkspaces -> OutputWorkspace
+ GroupWorkspaces -> OutputWorkspace
}
diff --git a/docs/source/diagrams/HB3A-v1_wokflw.dot b/docs/source/diagrams/HB3A-v1_wokflw.dot
index 9af8d2f067d1012b622bd9ea40365e74c0ab85bf..3ca47c3a6a926f20ace8f79952dd98dc1477b74b 100644
--- a/docs/source/diagrams/HB3A-v1_wokflw.dot
+++ b/docs/source/diagrams/HB3A-v1_wokflw.dot
@@ -86,7 +86,7 @@ digraph HB3AReduction {
convert2HKL -> mergeMD
isOutputHKL -> mergeMD [label="No"];
-
+
expScanMD -> integratePeak
peakWS -> integratePeak
maskWS -> integratePeak
diff --git a/docs/source/diagrams/ISISIndirectDiffractionReduction-v1_wkflw.dot b/docs/source/diagrams/ISISIndirectDiffractionReduction-v1_wkflw.dot
index 3f5e9e5870fdbb16ce86ce8a729332bb5728a9e6..84f8b3cedb49ca71781c93dfdd60f5ac0d28c330 100644
--- a/docs/source/diagrams/ISISIndirectDiffractionReduction-v1_wkflw.dot
+++ b/docs/source/diagrams/ISISIndirectDiffractionReduction-v1_wkflw.dot
@@ -53,7 +53,7 @@ digraph ISISIndirectDiffractionReduction {
e_mode [label="Elastic"]
dspacing_unit [label="dSpacing"]
}
-
+
subgraph decision {
$decision_style
has_calib_file [label="Using Calibration File"]
diff --git a/docs/source/diagrams/ISISPowderApplyAbsorbCorr_wkflw.dot b/docs/source/diagrams/ISISPowderApplyAbsorbCorr_wkflw.dot
index a42876fab4b669878a191ebef5ff0b99fb090d65..fafb156fd87e1a27eb79e3f9a6bf75452f1e521c 100644
--- a/docs/source/diagrams/ISISPowderApplyAbsorbCorr_wkflw.dot
+++ b/docs/source/diagrams/ISISPowderApplyAbsorbCorr_wkflw.dot
@@ -58,7 +58,7 @@ digraph isisPowderGenericAlgs{
subgraph ApplyAbsorbCorrGemPolaris{
// *GEM
label_GEM -> if_GEM_isVanadium
-
+
// Is Vanadium
if_GEM_isVanadium -> alg_GEM_maskDetector [label="True"]
alg_GEM_maskDetector -> alg_MayersSampleCorr [label="Use Adv Config"]
diff --git a/docs/source/diagrams/ISISPowderCreateVanadium_wkflw.dot b/docs/source/diagrams/ISISPowderCreateVanadium_wkflw.dot
index 6472c631616406bad5b897ec57bb3fe6ed95f197..af764c2c5b395a6b8d6b59646f90b5fb9ccb1000 100644
--- a/docs/source/diagrams/ISISPowderCreateVanadium_wkflw.dot
+++ b/docs/source/diagrams/ISISPowderCreateVanadium_wkflw.dot
@@ -107,7 +107,7 @@ digraph isisPowderCreateVanadium{
param_vanadiumTOFCropValues -> alg_CropVanTOF
alg_ExtractWsSpectra -> alg_CropVanTOF
alg_CropVanTOF -> proc_InstMaskPeaks
-
+
// Spline the vanadium
param_vanadiumSplineCoefficient -> alg_SplineVanadium
proc_InstMaskPeaks -> alg_SplineVanadium
diff --git a/docs/source/diagrams/ISISPowderSavePearlFmodes_wkflw.dot b/docs/source/diagrams/ISISPowderSavePearlFmodes_wkflw.dot
index 452ef59861026c75725795afe0105d3e48dc2578..4e916ef9b125765eb37b8174e5c0522165ca8fd2 100644
--- a/docs/source/diagrams/ISISPowderSavePearlFmodes_wkflw.dot
+++ b/docs/source/diagrams/ISISPowderSavePearlFmodes_wkflw.dot
@@ -5,7 +5,7 @@ digraph isisPowderCreateVanadium{
// **Labels
// PEARL Focus modes - this helps keeps the graph tidy
label_focusModeAllPearl [label="Focus mode: All"]
- label_focusModeGroupsPearl [label="Focus mode: Groups"]
+ label_focusModeGroupsPearl [label="Focus mode: Groups"]
label_focusModeModsPearl [label="Focus mode: Mods"]
label_focusModeTransPearl [label="Focus mode: Trans"]
@@ -33,10 +33,10 @@ digraph isisPowderCreateVanadium{
subgraph algorithms{
$algorithm_style
- // Focus mode: All
+ // Focus mode: All
alg_MergeRuns_all [label="Merge Runs: Banks 1-9 (inc.)"]
alg_Scale_all [label="Scale: 0.11111111 (1/9)"]
-
+
alg_SaveGss_all [label="Save GSS: TOF\n Appending banks 10-12 (inc.) to merged runs"]
alg_SaveGssSummed_all [label="Save GSS: TOF"]
@@ -62,7 +62,7 @@ digraph isisPowderCreateVanadium{
// Focus mode : TRANS
alg_MergeRuns_trans [label="Merge Runs: Banks 1-9 (inc.)"]
alg_Scale_trans [label="Scale: 0.11111111 (1/9)"]
-
+
alg_SaveGssSummed_trans [label="Save GSS: TOF"]
alg_SaveFocusedXyeDSummed_trans [label="Save Focused XYE: dSpacing"]
@@ -94,7 +94,7 @@ digraph isisPowderCreateVanadium{
// Merge + Scale
label_focusModeAllPearl -> alg_MergeRuns_all
alg_MergeRuns_all -> alg_Scale_all
-
+
// All - Attenuate
alg_Scale_all -> if_attenuatePearl_all
param_attenuatePearl_all -> if_attenuatePearl_all
diff --git a/docs/source/diagrams/IndirectAnnulusAbsorption-v1_wkflw.dot b/docs/source/diagrams/IndirectAnnulusAbsorption-v1_wkflw.dot
index 3cbffe3ee060e797183e2c656a920da89b39fe92..4b34bcd815ffb3770cb0856527de74974f9db63d 100644
--- a/docs/source/diagrams/IndirectAnnulusAbsorption-v1_wkflw.dot
+++ b/docs/source/diagrams/IndirectAnnulusAbsorption-v1_wkflw.dot
@@ -50,7 +50,7 @@ digraph IndirectAnnulusAbsorption {
AddSampleLogMultiple
GroupWorkspaces
}
-
+
subgraph decisions {
$decision_style
canGiven [label="Can Workspace?"]
@@ -80,7 +80,7 @@ digraph IndirectAnnulusAbsorption {
CanWorkspace_Wave -> canScale
canScale -> Scale [label="Not equal to 1"]
CanScale -> Scale
- Scale -> useCorrections
+ Scale -> useCorrections
canScale -> useCorrections [label="Equal to 1"]
useCorrections -> SetSampleMaterial2 [label="Yes"]
CanChemicalFormula -> SetSampleMaterial2
diff --git a/docs/source/diagrams/IndirectAnnulusAbsorption-v2_wkflw.dot b/docs/source/diagrams/IndirectAnnulusAbsorption-v2_wkflw.dot
index 7d7fb4a285a59478840c95db589745b2edb4df4e..0f496a244b170e79d57c61a1afb1c7cca68583b3 100644
--- a/docs/source/diagrams/IndirectAnnulusAbsorption-v2_wkflw.dot
+++ b/docs/source/diagrams/IndirectAnnulusAbsorption-v2_wkflw.dot
@@ -1,7 +1,7 @@
digraph IndirectFlatePlateAbsorption {
label="IndirectFlatePlateAbsorption Flowchart"
$global_style
-
+
subgraph params {
$param_style
SampleWorkspace1 [label="SampleWorkspace"]
@@ -50,7 +50,7 @@ digraph IndirectFlatePlateAbsorption {
GroupWorkspaces
Multiply
}
-
+
subgraph decisions {
$decision_style
canGiven [label="Container Workspace?"]
@@ -60,7 +60,7 @@ digraph IndirectFlatePlateAbsorption {
SampleWorkspace1 -> GetEFixed
GetEFixed -> ConvertUnits1 [label="Convert input workspace to Wavelength"]
ConvertUnits1 -> SetBeam
-BeamHeight -> SetBeam
+BeamHeight -> SetBeam
BeamWidth -> SetBeam
SetBeam -> SetSample
SampleInnerRadius -> SetSample
diff --git a/docs/source/diagrams/IndirectCylinderAbsorption-v1_wkflw.dot b/docs/source/diagrams/IndirectCylinderAbsorption-v1_wkflw.dot
index 4a42d0bd2602f47701d6b568281a1e95470052e4..5fb3e50713146c9c7802e1a3928171964ecc2ba4 100644
--- a/docs/source/diagrams/IndirectCylinderAbsorption-v1_wkflw.dot
+++ b/docs/source/diagrams/IndirectCylinderAbsorption-v1_wkflw.dot
@@ -47,7 +47,7 @@ digraph IndirectCylinderAbsorption {
AddSampleLogMultiple
GroupWorkspaces
}
-
+
subgraph decisions {
$decision_style
canGiven [label="Can Workspace?"]
@@ -76,7 +76,7 @@ digraph IndirectCylinderAbsorption {
CanWorkspace_Wave -> canScale
canScale -> Scale [label="Not equal to 1"]
CanScale -> Scale
- Scale -> useCorrections
+ Scale -> useCorrections
canScale -> useCorrections [label="Equal to 1"]
useCorrections -> SetSampleMaterial2 [label="Yes"]
CanChemicalFormula -> SetSampleMaterial2
diff --git a/docs/source/diagrams/IndirectCylinderAbsorption-v2_wkflw.dot b/docs/source/diagrams/IndirectCylinderAbsorption-v2_wkflw.dot
index 9c17149b52f5f2aea37a409f136cdda1779767a1..ab1a3585b3d39b5f6535625de6c1c7eec0e31170 100644
--- a/docs/source/diagrams/IndirectCylinderAbsorption-v2_wkflw.dot
+++ b/docs/source/diagrams/IndirectCylinderAbsorption-v2_wkflw.dot
@@ -1,7 +1,7 @@
digraph IndirectFlatePlateAbsorption {
label="IndirectFlatePlateAbsorption Flowchart"
$global_style
-
+
subgraph params {
$param_style
SampleWorkspace1 [label="SampleWorkspace"]
@@ -43,7 +43,7 @@ digraph IndirectFlatePlateAbsorption {
GroupWorkspaces
Multiply
}
-
+
subgraph decisions {
$decision_style
canGiven [label="Container Workspace?"]
@@ -53,7 +53,7 @@ digraph IndirectFlatePlateAbsorption {
SampleWorkspace1 -> GetEFixed
GetEFixed -> ConvertUnits1 [label="Convert input workspace to Wavelength"]
ConvertUnits1 -> SetBeam
-BeamHeight -> SetBeam
+BeamHeight -> SetBeam
BeamWidth -> SetBeam
SetBeam -> SetSample
SampleRadius -> SetSample
diff --git a/docs/source/diagrams/IndirectFlatPlateAbsorption-v1_wkflw.dot b/docs/source/diagrams/IndirectFlatPlateAbsorption-v1_wkflw.dot
index 97d95cf8fece2fb71a56500eb583ce6114625d40..72a67b3b8845e7e8f1860ba3a4c04126210c2a4c 100644
--- a/docs/source/diagrams/IndirectFlatPlateAbsorption-v1_wkflw.dot
+++ b/docs/source/diagrams/IndirectFlatPlateAbsorption-v1_wkflw.dot
@@ -50,7 +50,7 @@ digraph IndirectFlatePlateAbsorption {
AddSampleLogMultiple
GroupWorkspaces
}
-
+
subgraph decisions {
$decision_style
canGiven [label="Can Workspace?"]
@@ -81,7 +81,7 @@ digraph IndirectFlatePlateAbsorption {
CanWorkspace_Wave -> canScale
canScale -> Scale [label="Not equal to 1"]
CanScale -> Scale
- Scale -> useCorrections
+ Scale -> useCorrections
canScale -> useCorrections [label="Equal to 1"]
useCorrections -> SetSampleMaterial2 [label="Yes"]
CanChemicalFormula -> SetSampleMaterial2
diff --git a/docs/source/diagrams/IqtFitMultiple-v1_wkflw.dot b/docs/source/diagrams/IqtFitMultiple-v1_wkflw.dot
index 68e44d47278dfd9f44b4f045cc805641dd2ec72d..bc0e75bdc3300f5aa7fc19011f412c2f5078888b 100644
--- a/docs/source/diagrams/IqtFitMultiple-v1_wkflw.dot
+++ b/docs/source/diagrams/IqtFitMultiple-v1_wkflw.dot
@@ -1,7 +1,7 @@
digraph IqtFitMultiple {
label="IqtFitMultiple Flowchart"
$global_style
-
+
subgraph params {
$param_style
InputWorkspace
@@ -33,18 +33,18 @@ digraph IqtFitMultiple {
CopyLogs2 [label="Copy logs"]
ExtractQENSMembers
}
-
+
subgraph decisions {
$decision_style
}
-
+
subgraph process {
$process_style
ConvertToElasticQ
TransposeFitParametersTable
ConvertParametersToWorkspace
}
-
+
InputWorkspace -> CropWorkspace
StartX -> CropWorkspace
EndX -> CropWorkspace
@@ -66,7 +66,7 @@ digraph IqtFitMultiple {
ResultWorkspace -> CopyLogs
InputWorkspace2 -> CopyLogs2
FitGroup -> CopyLogs2
- CopyLogs -> AddSampleLogMultiple
+ CopyLogs -> AddSampleLogMultiple
CopyLogs2 -> AddSampleLogMultiple2
SampleLogs -> AddSampleLogMultiple2
SampleLogs -> AddSampleLogMultiple [label="Additional SampleLogs based on Fit data"]
diff --git a/docs/source/diagrams/MuscatSofQW-v1_wkflw.dot b/docs/source/diagrams/MuscatSofQW-v1_wkflw.dot
index 49adf46aa8d5c7f264e1341023ef01e6553e6fda..e52ba5e795792c3ef0214c1155705872467635e8 100644
--- a/docs/source/diagrams/MuscatSofQW-v1_wkflw.dot
+++ b/docs/source/diagrams/MuscatSofQW-v1_wkflw.dot
@@ -36,7 +36,7 @@ digraph MuscatSofQW {
CreateWorkspace
CopyLogs
}
-
+
subgraph decisions {
$decision_style
isConvFitProg [label="ConvFit Fit Program"]
@@ -51,7 +51,7 @@ digraph MuscatSofQW {
ParameterWorkspace1 -> hasLor
hasLor -> End [label="0 : Must have Lorentzians"]
hasLor -> Lorentzians [label="1 or 2"]
-
+
//initial processing
EnergyMax -> rebinParam
EnergyInc -> rebinParam
@@ -67,7 +67,7 @@ digraph MuscatSofQW {
ParameterWorkspace2 -> qValues
qValues -> SpecMax [label="Length of qValues"]
SpecMax -> CurrentSpec
-
+
//Start of fit loop
CurrentSpec -> ConstructConvFitFunction
Delta -> ConstructConvFitFunction
diff --git a/docs/source/diagrams/OSIRISDiffractionReduction-v1_wkflw.dot b/docs/source/diagrams/OSIRISDiffractionReduction-v1_wkflw.dot
index f63410845274c296b43f550b6acce52fd363fbd8..1819e563cd74e6ad80649bf1d54f64ea470d42e1 100644
--- a/docs/source/diagrams/OSIRISDiffractionReduction-v1_wkflw.dot
+++ b/docs/source/diagrams/OSIRISDiffractionReduction-v1_wkflw.dot
@@ -1,7 +1,7 @@
digraph OSIRISDiffractionReduction {
label="OSIRISDiffractionReduction Flowchart"
$global_style
-
+
subgraph params {
$param_style
CalibrationFile
@@ -41,7 +41,7 @@ digraph OSIRISDiffractionReduction {
MergeRuns
RenameWorkspace
}
-
+
subgraph decisions {
$decision_style
useContainer [label="Container file"]
@@ -49,7 +49,7 @@ digraph OSIRISDiffractionReduction {
processedWks [label="Processed all workspaces in maps"]
runNumbers [label="Number of runs"]
}
-
+
subgraph process {
$process_style
averageWorkspaces [label="Average together any workspaces that have the same DRange"]
@@ -57,7 +57,7 @@ digraph OSIRISDiffractionReduction {
appendResults [label="Add the scalar data to the result workspace."]
}
-
+
SampleRuns -> Load
VanadiumRuns -> Load
SpecMin -> Load
@@ -81,7 +81,7 @@ digraph OSIRISDiffractionReduction {
VanadiumWorkspaces -> VanadiumWorkspaceMap
VanadiumWorkspaceMap -> averageWorkspaces
SampleWorkspaceMap -> averageWorkspaces
- averageWorkspaces -> CurrentWorkspace [label="Extract next workspace from either the vanadium or sample map"]
+ averageWorkspaces -> CurrentWorkspace [label="Extract next workspace from either the vanadium or sample map"]
CurrentWorkspace -> NormaliseByCurrent
NormaliseByCurrent -> AlignDetectors
CalibrationFile -> AlignDetectors
diff --git a/docs/source/diagrams/PEARL-Run_focus-wkflw.dot b/docs/source/diagrams/PEARL-Run_focus-wkflw.dot
index 39469dcc22148950cdbe1e13188826a5cc0b8124..cb83817d91a631bea91ad610a9ed509b0416a197 100644
--- a/docs/source/diagrams/PEARL-Run_focus-wkflw.dot
+++ b/docs/source/diagrams/PEARL-Run_focus-wkflw.dot
@@ -1,63 +1,63 @@
digraph pearlRunFocus {
label="PearlDiffraction pearl_run_focus"
$global_style
-
+
// Global prefix: Focus_run_
-
+
Focus_run_start [label="Start pearl_run_focus"]
Focus_run_start_VanCalib [label="Start with vanadium calibration"]
Focus_run_start_without_VanCalib [label="Start without vanadium calibration"]
-
+
Focus_run_start_FocusModeAll [label="Focus Mode: 'all'"]
Focus_run_start_FocusModeGroups [label="Focus Mode: 'groups'"]
Focus_run_start_FocusModeTrans [label="Focus Mode: 'trans'"]
Focus_run_start_FocusModeMods [label="Focus Mode: 'mods'"]
-
+
subgraph params {
$param_style
-
+
Focus_run_param_atten [label="atten"]
Focus_run_param_current_run_number [label="Cycle number"]
Focus_run_param_vanadium_norm [label="van_norm"]
Focus_run_param_f_mode [label="fmode"]
Focus_run_param_focus_mode [label="focus_mode"]
-
+
//Read steps - suffix:read
Focus_run_global_calFile_read [label="calfile"]
Focus_run_global_ext_read [label="ext"]
Focus_run_global_groupFile_read [label="groupfile"]
-
+
//Vanadium calibration steps - suffix: VanCalib
Focus_run_global_vanFile_VanCalib [label="vanfile"]
-
- //--Use param style for out file names instead of labels--
+
+ //--Use param style for out file names instead of labels--
//Focus Mode:'all' - suffix: FocusModeAll
SaveGSS_out_FocusModeAll [label="GSS file"]
SaveNexus_out_FocusModeAll [label="Nexus file"]
-
+
//Focus Mode:'groups' - suffix: FocusModeGroups
SaveGSS_out_Mode1_FocusModeGroups [label="GSS file"]
SaveGSS_out_Mode2_FocusModeGroups [label="GSS file"]
SaveNexus_out_FocusModeGroups [label="Nexus file"]
SaveGSS_out_range_FocusModeGroups [label="GSS file"]
SaveNexus_out_range_FocusModeGroups [label="Nexus file"]
-
+
//Focus Mode:'trans' - suffix: FocusModeTrans
SaveFocusedXYE_out_TOF_FocusModeTrans [label="PRL<RunNumber>_tof_xye.dat"]
SaveFocusedXYE_out_dSpacing_FocusModeTrans [label="PRL<RunNumber>_d_xye.dat"]
SaveNexus_out_FocusModeTrans [label="Nexus file"]
SaveNexus_two_out_FocusModeTrans [label="Nexus file"]
-
+
//Focus Mode:'mods' - suffix: FocusModeMods
SaveGSS_out_FocusModeMods [label="GSS file"]
SaveNexus_out_FocusModeMods [label="Nexus file"]
-
+
//--Output workspaces--
Focus_run_atten_out_FocusModeTrans [label="Workspace 'PRL<RunNumber>_noatten'"]
Focus_run_final_output [label="Workspace 'PRL<RunNumber>'"]
} // End of params
-
+
subgraph processes {
$process_style
@@ -65,7 +65,7 @@ digraph pearlRunFocus {
Focus_run_get_calib_files_read [label="PEARL_getcalibfiles"]
Focus_run_read [label="PEARL_read"]
Focus_run_atten [label="PEARL_atten"]
-
+
// Subgraphs:
Focus_run_process_VanCalib [label="Start with vanadium calibration"]
Focus_run_process_without_VanCalib [label="Start without vanadium calibration"]
@@ -73,7 +73,7 @@ digraph pearlRunFocus {
Focus_run_process_FocusModeGroups [label="Focus Mode: 'groups'"]
Focus_run_process_FocusModeTrans [label="Focus Mode: 'trans'"]
Focus_run_process_FocusModeMods [label="Focus Mode: 'mods'"]
-
+
// Remove intermediate workspaces steps
Remove_temp_workspace_read [label="Remove intermediate workspaces"]
Remove_temp_workspace_VanCalib [label="Remove intermediate workspaces"]
@@ -81,12 +81,12 @@ digraph pearlRunFocus {
Remove_temp_workspace_FocusModeGroups [label="Remove intermediate workspaces"]
Remove_temp_workspace_FocusModeTrans [label="Remove intermediate workspaces"]
Remove_temp_workspace_FocusModeMods [label="Remove intermediate workspaces"]
-
+
} //End of processes
-
+
subgraph algorithms {
$algorithm_style
-
+
// Read steps - suffix:read
AlignDetectors_read [label="Align Detectors"]
DiffractionFocusing_read [label="Diffraction Focussing"]
@@ -150,14 +150,14 @@ digraph pearlRunFocus {
SaveGSS_FocusModeMods [label="Save GSS File"]
ConvertUnits_dSpacing_FocusModeMods [label="Convert Units to dSpacing"]
SaveNexus_FocusModeMods [label="Save Nexus File"]
-
+
LoadNexus_finalOutput [label="Load Nexus file"]
} //End of algorithms
-
+
subgraph decisions {
$decision_style
-
+
// Debug checks
Focus_run_if_debug_mode_read [label="If debug mode"]
Focus_run_if_debug_mode_VanCalib [label="If debug mode"]
@@ -165,17 +165,17 @@ digraph pearlRunFocus {
Focus_run_if_debug_mode_FocusModeGroups [label="If debug mode"]
Focus_run_if_debug_mode_FocusModeTrans [label="If debug mode"]
Focus_run_if_debug_mode_FocusModeMods [label="If debug mode"]
-
-
+
+
Focus_run_switch_f_mode [label="fmode set to:"]
Focus_run_if_van_norm [label="If van_norm"]
Focus_run_if_focus_mode_FocusModeGroups [label="focus_mode set to:"]
Focus_run_if_atten_FocusModeTrans [label="If atten:"]
-
+
} //End of decisions
-
+
subgraph Focus_run_main_alg {
-
+
// Read step - Suffix:read
Focus_run_start -> Focus_run_get_calib_files_read
Focus_run_get_calib_files_read -> Focus_run_read
@@ -188,13 +188,13 @@ digraph pearlRunFocus {
AlignDetectors_read -> DiffractionFocusing_read
Focus_run_global_groupFile_read -> DiffractionFocusing_read
DiffractionFocusing_read -> Focus_run_if_debug_mode_read
-
+
// Debug mode is on (ie. don't remove temp workspaces)
Focus_run_if_debug_mode_read -> Remove_temp_workspace_read [label="false"]
Remove_temp_workspace_read -> Focus_run_if_van_norm
// Debug mode is off:
Focus_run_if_debug_mode_read -> Focus_run_if_van_norm [label="true"]
-
+
//Vanadium calibration steps if true - Suffix:VanCalibTrue
Focus_run_param_vanadium_norm -> Focus_run_if_van_norm
// If we are using vanadium calibration
@@ -202,50 +202,50 @@ digraph pearlRunFocus {
Focus_run_if_van_norm -> Focus_run_process_without_VanCalib [label="false"]
Focus_run_process_VanCalib -> Focus_run_if_debug_mode_VanCalib
Focus_run_process_without_VanCalib -> Focus_run_if_debug_mode_VanCalib
-
+
// Finished vanadium calibration - debug mode flag test
// Debug mode is off:
Focus_run_if_debug_mode_VanCalib -> Remove_temp_workspace_VanCalib [label="false"]
Remove_temp_workspace_VanCalib -> Focus_run_switch_f_mode
// Debug mode is on (ie. don't remove temp workspaces)
Focus_run_if_debug_mode_VanCalib -> Focus_run_switch_f_mode [label="true"]
-
- // Check the param to determine next behaviour
- Focus_run_param_f_mode -> Focus_run_switch_f_mode
+
+ // Check the param to determine next behaviour
+ Focus_run_param_f_mode -> Focus_run_switch_f_mode
Focus_run_switch_f_mode -> Focus_run_process_FocusModeAll [label="all"]
Focus_run_switch_f_mode -> Focus_run_process_FocusModeGroups [label="groups"]
Focus_run_switch_f_mode -> Focus_run_process_FocusModeTrans [label="trans"]
Focus_run_switch_f_mode -> Focus_run_process_FocusModeMods [label="mods"]
-
+
Focus_run_process_FocusModeAll -> LoadNexus_finalOutput
Focus_run_process_FocusModeGroups -> LoadNexus_finalOutput
Focus_run_process_FocusModeTrans -> LoadNexus_finalOutput
Focus_run_process_FocusModeMods -> LoadNexus_finalOutput
-
+
LoadNexus_finalOutput -> Focus_run_final_output
}
-
+
subgraph Focus_run_with_van_calib{
//Vanadium calibration set to true
Focus_run_global_vanFile_VanCalib -> LoadNexus_VanCalibTrue
- Focus_run_start_VanCalib -> LoadNexus_VanCalibTrue
+ Focus_run_start_VanCalib -> LoadNexus_VanCalibTrue
LoadNexus_VanCalibTrue -> ExtractSingleSpectrum_VanCalibTrue
ExtractSingleSpectrum_VanCalibTrue -> Rebin_Step_One_VanCalibTrue
- Rebin_Step_One_VanCalibTrue -> ConvertUnits_TOF_VanCalibTrue
+ Rebin_Step_One_VanCalibTrue -> ConvertUnits_TOF_VanCalibTrue
ConvertUnits_TOF_VanCalibTrue -> Rebin_Step_Two_VanCalibTrue
Rebin_Step_Two_VanCalibTrue -> Divide_VanCalibTrue
Divide_VanCalibTrue -> CropWorkspace_VanCalibTrue
- CropWorkspace_VanCalibTrue -> Scale_VanCalibTrue
+ CropWorkspace_VanCalibTrue -> Scale_VanCalibTrue
}
-
+
subgraph Focus_run_without_van_calib{
//Vanadium calibration set to false
- Focus_run_start_without_VanCalib -> ExtractSingleSpectrum_VanCalibFalse
+ Focus_run_start_without_VanCalib -> ExtractSingleSpectrum_VanCalibFalse
ExtractSingleSpectrum_VanCalibFalse -> ConvertUnits_TOF_VanCalibFalse
ConvertUnits_TOF_VanCalibFalse -> Rebin_VanCalibFalse
Rebin_VanCalibFalse -> CropWorkspace_VanCalibFalse
}
-
+
subgraph Focus_run_FocusModeAll{
//Focus mode set to 'all' steps - Suffix: FocusModeAll
Focus_run_start_FocusModeAll -> CloneWorkspace_FocusModeAll
@@ -254,20 +254,20 @@ digraph pearlRunFocus {
Plus_FocusModeAll -> Scale_FocusModeAll [label="Sum of all inputs"]
Scale_FocusModeAll -> SaveGSS_FocusModeAll
SaveGSS_FocusModeAll -> SaveGSS_out_FocusModeAll
- SaveGSS_FocusModeAll -> ConvertUnits_dSpacing_FocusModeAll
+ SaveGSS_FocusModeAll -> ConvertUnits_dSpacing_FocusModeAll
ConvertUnits_dSpacing_FocusModeAll -> SaveNexus_FocusModeAll
SaveNexus_FocusModeAll -> SaveNexus_out_FocusModeAll
SaveNexus_FocusModeAll -> Focus_run_if_debug_mode_FocusModeAll
//Finally debug mode test
// Debug mode is off:
- Focus_run_if_debug_mode_FocusModeAll -> Remove_temp_workspace_FocusModeAll [label="false"]
-
+ Focus_run_if_debug_mode_FocusModeAll -> Remove_temp_workspace_FocusModeAll [label="false"]
+
}
-
+
subgraph Focus_run_FocusModeGroups{
//Focus mode set to 'groups' steps - Suffix: FocusModeGroups
Focus_run_start_FocusModeGroups -> CloneWorkspace_FocusModeGroups
- //First workspaces 0-2 - we will 1 based index as that's what Mantid will output
+ //First workspaces 0-2 - we will 1 based index as that's what Mantid will output
CloneWorkspace_FocusModeGroups -> Plus_StepOne_FocusModeGroups [label="Workspaces 1,2,3"]
CloneWorkspace_FocusModeGroups -> Plus_StepTwo_FocusModeGroups [label="Workspaces 4,5,6"]
CloneWorkspace_FocusModeGroups -> Plus_StepThree_FocusModeGroups [label="Workspaces 7,8,9"]
@@ -283,21 +283,21 @@ digraph pearlRunFocus {
Focus_run_param_focus_mode -> Focus_run_if_focus_mode_FocusModeGroups
Focus_run_if_focus_mode_FocusModeGroups -> SaveGSS_out_Mode1_FocusModeGroups [label="'1' Appending to file"]
Focus_run_if_focus_mode_FocusModeGroups -> SaveGSS_out_Mode2_FocusModeGroups [label="'2' Not appending to file"]
-
- SaveGSS_FocusModeGroups -> ConvertUnits_dSpacing_FocusModeGroups
+
+ SaveGSS_FocusModeGroups -> ConvertUnits_dSpacing_FocusModeGroups
ConvertUnits_dSpacing_FocusModeGroups -> SaveNexus_FocusModeGroups
SaveNexus_FocusModeGroups -> SaveNexus_out_FocusModeGroups
SaveNexus_FocusModeGroups -> SaveGSS_Range_FocusModeGroups
SaveGSS_Range_FocusModeGroups -> SaveGSS_out_range_FocusModeGroups [label="Appending to file"]
SaveGSS_Range_FocusModeGroups -> ConvertUnits_second_dSpacing_FocusModeGroups
- ConvertUnits_second_dSpacing_FocusModeGroups -> SaveNexus_Range_FocusModeGroups
+ ConvertUnits_second_dSpacing_FocusModeGroups -> SaveNexus_Range_FocusModeGroups
SaveNexus_Range_FocusModeGroups -> SaveNexus_out_range_FocusModeGroups [label="Appending to file"]
SaveNexus_Range_FocusModeGroups -> Focus_run_if_debug_mode_FocusModeGroups
//Finally debug mode test - Debug mode is off
Focus_run_if_debug_mode_FocusModeGroups -> Remove_temp_workspace_FocusModeGroups [label="false"]
-
+
}
-
+
subgraph Focus_run_FocusModeTrans{
//Focus mode set to 'trans' steps - Suffix: FocusModeTrans
Focus_run_start_FocusModeTrans -> CloneWorkspace_FocusModeTrans
@@ -305,7 +305,7 @@ digraph pearlRunFocus {
Plus_FocusModeTrans -> Plus_FocusModeTrans [label="Workspaces 2-9"]
Plus_FocusModeTrans -> Scale_FocusModeTrans
Scale_FocusModeTrans -> Focus_run_if_atten_FocusModeTrans
- Focus_run_param_atten -> Focus_run_if_atten_FocusModeTrans
+ Focus_run_param_atten -> Focus_run_if_atten_FocusModeTrans
// If atten == true:
Focus_run_if_atten_FocusModeTrans -> ConvertUnits_dSpacing_atten_FocusModeTrans [label="true"]
ConvertUnits_dSpacing_atten_FocusModeTrans -> CloneWorkspace_atten_FocusModeTrans
@@ -313,12 +313,12 @@ digraph pearlRunFocus {
CloneWorkspace_atten_FocusModeTrans -> Focus_run_atten_out_FocusModeTrans
Focus_run_atten -> ConvertUnits_TOF_atten_FocusModeTrans
ConvertUnits_TOF_atten_FocusModeTrans -> SaveGSS_FocusModeTrans
- // Continuing algorithm
+ // Continuing algorithm
Focus_run_if_atten_FocusModeTrans -> SaveGSS_FocusModeTrans [label="else"]
SaveGSS_FocusModeTrans -> SaveFocusedXYE_TOF_FocusModeTrans
SaveFocusedXYE_TOF_FocusModeTrans -> SaveFocusedXYE_out_TOF_FocusModeTrans
SaveFocusedXYE_TOF_FocusModeTrans -> ConvertUnits_dSpacing_FocusModeTrans
- ConvertUnits_dSpacing_FocusModeTrans -> SaveFocusedXYE_dSpacing_FocusModeTrans
+ ConvertUnits_dSpacing_FocusModeTrans -> SaveFocusedXYE_dSpacing_FocusModeTrans
SaveFocusedXYE_dSpacing_FocusModeTrans -> SaveFocusedXYE_out_dSpacing_FocusModeTrans
SaveFocusedXYE_dSpacing_FocusModeTrans -> SaveNexus_FocusModeTrans
SaveNexus_FocusModeTrans -> SaveNexus_out_FocusModeTrans
@@ -327,9 +327,9 @@ digraph pearlRunFocus {
SaveNexus_two_FocusModeTrans -> SaveNexus_two_out_FocusModeTrans [label="Appending to file"]
SaveNexus_two_FocusModeTrans -> Focus_run_if_debug_mode_FocusModeTrans
Focus_run_if_debug_mode_FocusModeTrans -> Remove_temp_workspace_FocusModeTrans [label="false"]
-
+
}
-
+
subgraph Focus_run_FocusModeMods{
//Focus mode set to 'mods' steps - Suffix: FocusModeMods
Focus_run_start_FocusModeMods -> SaveGSS_FocusModeMods
diff --git a/docs/source/diagrams/ProcessIndirectFitParameters-v1_wkflw.dot b/docs/source/diagrams/ProcessIndirectFitParameters-v1_wkflw.dot
index 5b48fdf7ee81b37c09a97b1e0863a4274599e510..c0cd4c264239df10fefb8a73b6d53def462da73f 100644
--- a/docs/source/diagrams/ProcessIndirectFitParameters-v1_wkflw.dot
+++ b/docs/source/diagrams/ProcessIndirectFitParameters-v1_wkflw.dot
@@ -25,12 +25,12 @@ digraph ProcessIndirectFitParameters {
ConvertTableToMatrixWorkspace
RenameWorkspace
}
-
+
subgraph decisions {
$decision_style
processedAllColumns [label="All columns to workspaces"]
}
-
+
subgraph process {
$process_style
searchForParams [label="searchforFitParams: Search for strings that have the given word as their suffix"]
@@ -60,5 +60,5 @@ digraph ProcessIndirectFitParameters {
replaceXAxis -> replaceXUnit
XAxisUnit -> replaceXUnit
replaceXUnit -> OutputWorkspace
-
+
}
diff --git a/docs/source/diagrams/ReflectometryILLPreprocessReflected-v1_wkflw.dot b/docs/source/diagrams/ReflectometryILLPreprocessReflected-v1_wkflw.dot
index caa697ffc1ff38af681355644222ffd6248fbddd..04d98cc16046b6b0392d2bab077efe6299fd0efa 100644
--- a/docs/source/diagrams/ReflectometryILLPreprocessReflected-v1_wkflw.dot
+++ b/docs/source/diagrams/ReflectometryILLPreprocessReflected-v1_wkflw.dot
@@ -33,7 +33,7 @@ digraph ReflectometryILLPreprocess {
angleOption -> san
angleOption -> dan
uan -> load
- san -> load
+ san -> load
dan -> load
run -> load
load -> extractMonitors
diff --git a/docs/source/diagrams/ReflectometryILLSumForeground-v1_wkflw.dot b/docs/source/diagrams/ReflectometryILLSumForeground-v1_wkflw.dot
index 9e35f3cbc48475442436a400300cda68b02ac7f9..d71325c553d3d4ab500b73d037f9fba5cad7a01d 100644
--- a/docs/source/diagrams/ReflectometryILLSumForeground-v1_wkflw.dot
+++ b/docs/source/diagrams/ReflectometryILLSumForeground-v1_wkflw.dot
@@ -21,7 +21,7 @@ digraph ReflectometryILLSumForeground {
crop [label="CropWorkspace"]
extract_spectrum [label="ExtractSingleSpectrum"]
sum_foreground_q [label="Sum foreground spectra\nin Q"]
- sum_foreground_wavelength [label="Sum foreground spectra\nin wavelength"]
+ sum_foreground_wavelength [label="Sum foreground spectra\nin wavelength"]
l_rebin [label="Rebin reflected to direct"]
q_rebin [label="Rebin reflected to direct"]
divide_before [label="Divide"]
diff --git a/docs/source/diagrams/SANSBeamFluxCorrection-v1_wkflw.dot b/docs/source/diagrams/SANSBeamFluxCorrection-v1_wkflw.dot
index 680226c120c060ca35f6cd483e3385e45356a05f..8162560a672a19663a2dcdff4fcb1951fbded499 100644
--- a/docs/source/diagrams/SANSBeamFluxCorrection-v1_wkflw.dot
+++ b/docs/source/diagrams/SANSBeamFluxCorrection-v1_wkflw.dot
@@ -14,7 +14,7 @@ digraph SANSBeamFluxCorrection {
$decision_style
isEntryName [label="Has Entry Name?"]
}
-
+
subgraph algorithms {
$algorithm_style
convertToHist [label="ConvertToHistogram v1"]
@@ -32,12 +32,12 @@ digraph SANSBeamFluxCorrection {
convertToHist -> rebinToWs
inputWS -> rebinToWs
rebinToWs -> divide2
-
+
inputWS -> rebinToWs2
monitorWS -> rebinToWs2
rebinToWs2 -> divide
inputWS -> divide
divide -> divide2
-
+
divide2 -> outputWS
}
diff --git a/docs/source/diagrams/SNSPowderReduction-v1_focusandsum.dot b/docs/source/diagrams/SNSPowderReduction-v1_focusandsum.dot
index c7cb25ca8a78e8c5041cc0d94b63550947ba0c85..927690fe19c38c50bea0b5f7b76aa317292fd859 100644
--- a/docs/source/diagrams/SNSPowderReduction-v1_focusandsum.dot
+++ b/docs/source/diagrams/SNSPowderReduction-v1_focusandsum.dot
@@ -24,7 +24,7 @@ digraph FocusAndSum {
$decision_style
isLastRunNumber [label="Is Last Run Number?"]
}
-
+
subgraph values {
$value_style
RunNumber [label="Run Number"]
diff --git a/docs/source/diagrams/SNSPowderReduction-v1_focuschunks_workflow.dot b/docs/source/diagrams/SNSPowderReduction-v1_focuschunks_workflow.dot
index d88ca054c08649c79c83941eaec10308c6808967..f9c77801f160ebc9c459836ebd6bc9194e791c33 100644
--- a/docs/source/diagrams/SNSPowderReduction-v1_focuschunks_workflow.dot
+++ b/docs/source/diagrams/SNSPowderReduction-v1_focuschunks_workflow.dot
@@ -60,7 +60,7 @@ digraph FocusChunks {
plusAmongChunks -> allChunksProcessed
allChunksProcessed -> getChunk [label="No"]
-
+
allChunksProcessed -> haveMPI [label="Yes"]
haveMPI -> gatherWorkspace [label="Yes"]
diff --git a/docs/source/diagrams/SNSPowderReduction-v1_loadandsum.dot b/docs/source/diagrams/SNSPowderReduction-v1_loadandsum.dot
index f0af437c46227e1d53bceec2665384c70fb8b259..29a0e7f1f5f35f77d80a301850cbc19d189d683b 100644
--- a/docs/source/diagrams/SNSPowderReduction-v1_loadandsum.dot
+++ b/docs/source/diagrams/SNSPowderReduction-v1_loadandsum.dot
@@ -20,7 +20,7 @@ digraph LoadAndSum {
$decision_style
isLastRunNumber [label="Is Last Run Number?"]
}
-
+
subgraph values {
$value_style
RunNumber [label="Run Number"]
@@ -36,6 +36,6 @@ digraph LoadAndSum {
isLastRunNumber -> getRunNumber [label="No"]
isLastRunNumber -> normaliseByCurrent [label="Yes"]
- normaliseByCurrent -> OutputWorkspace
-
+ normaliseByCurrent -> OutputWorkspace
+
}
diff --git a/docs/source/diagrams/SNSPowderReduction-v1_process_container.dot b/docs/source/diagrams/SNSPowderReduction-v1_process_container.dot
index 300ebfc6a5e0e2c416088bd30e02461ec9f376d5..4a7f643cabfd62564ff268f286e982d004dc19ab 100644
--- a/docs/source/diagrams/SNSPowderReduction-v1_process_container.dot
+++ b/docs/source/diagrams/SNSPowderReduction-v1_process_container.dot
@@ -23,7 +23,7 @@ digraph SNSPowderReductionContainer {
$decision_style
isSum [label="Is Sum True?"]
}
-
+
subgraph values {
$value_style
CanRunWorkspace [label="ContainerRunWorkspace"]
diff --git a/docs/source/diagrams/SNSPowderReduction-v1_workflow.dot b/docs/source/diagrams/SNSPowderReduction-v1_workflow.dot
index 00b926560012b4ad8ef6a518a63057748d35c25f..44c2f8950c7f6f370b55476d346cef1feb772a61 100644
--- a/docs/source/diagrams/SNSPowderReduction-v1_workflow.dot
+++ b/docs/source/diagrams/SNSPowderReduction-v1_workflow.dot
@@ -33,7 +33,7 @@ digraph SNSPowderReduction {
isVanRunDefined [label="Is Vanadium run specified?"]
mustDataPositive [label="Does data have to be positive?"]
}
-
+
subgraph values {
$value_style
diff --git a/docs/source/diagrams/TOSCABankCorrection-v1_wkflw.dot b/docs/source/diagrams/TOSCABankCorrection-v1_wkflw.dot
index 849a1c09d3ea59c6da58b510c0eb2ec249e92ac7..6b899dcc9ea03b8308b2657d6fe54de85417ade4 100644
--- a/docs/source/diagrams/TOSCABankCorrection-v1_wkflw.dot
+++ b/docs/source/diagrams/TOSCABankCorrection-v1_wkflw.dot
@@ -35,14 +35,14 @@ digraph TOSCABankCorrection {
PeakFunction -> FindPeak
PeakPosition -> FindPeak
FindPeak -> SortTableWorkspace [label="Sort peaks by height"]
- SortTableWorkspace -> Peaks
+ SortTableWorkspace -> Peaks
Peaks -> TargetPeakCentre [label="Output"]
ClosePeakTolerance -> Bank1_ScaleFactor
Peaks -> Bank1_ScaleFactor
ClosePeaktolerance -> Bank2_ScaleFactor
- Peaks -> Bank2_ScaleFactor
+ Peaks -> Bank2_ScaleFactor
Croppedworkspace -> ScaleX [label="Workspace containing bank spectra"]
- Bank1_ScaleFactor -> ScaleX
+ Bank1_ScaleFactor -> ScaleX
Bank2_ScaleFactor -> ScaleX
ScaleX -> ScaledWorkspace
ScaledWorkspace -> RebinToWorkspace [label="Rebin to original input binning"]
diff --git a/docs/source/diagrams/VesuvioDiffractionReduction-v1_wkflw.dot b/docs/source/diagrams/VesuvioDiffractionReduction-v1_wkflw.dot
index 21ffb3e54aee9f41c5521f574e119cd82b0c5fc8..e2cd990ece1ce59b19b2be4b0ea76c722afccc5b 100644
--- a/docs/source/diagrams/VesuvioDiffractionReduction-v1_wkflw.dot
+++ b/docs/source/diagrams/VesuvioDiffractionReduction-v1_wkflw.dot
@@ -6,7 +6,7 @@ digraph VesuvioDiffractionReduction {
$process_style
ScaleMonitor [label="Scale data and detectors by monitor intensities"]
}
-
+
subgraph params {
$param_style
InputFiles
@@ -29,12 +29,12 @@ digraph VesuvioDiffractionReduction {
ConvertUnits
GroupSpectra
}
-
+
subgraph decisions {
$decision_style
allProcessed [label="Processed all workspaces?"]
}
-
+
InputFiles -> LoadFiles
SpectraRange -> LoadFiles
SumFiles -> LoadFiles
diff --git a/docs/source/fitting/fitfunctions/AFMLF.rst b/docs/source/fitting/fitfunctions/AFMLF.rst
index f62f654aae210539ba39e1e53944c8102db6e838..bb439d0051fa4129d629d2a7a3fff99a93cdf4a9 100644
--- a/docs/source/fitting/fitfunctions/AFMLF.rst
+++ b/docs/source/fitting/fitfunctions/AFMLF.rst
@@ -13,7 +13,7 @@ A pair of frequencies for aligned Anti-ferrormagnetic magnetism in Longitudinal
.. math:: A(t) = \frac{A_0}{2}((1-a_1)+a_1\cos(\omega_1t+\phi))+(1-a_2)+a_2\cos(\omega_2t+\phi))
-where,
+where,
.. math:: a_1 =\frac{(f_a\sin\theta)^2}{(f_b+f_a\cos\theta)^2+(f_a\sin\theta)^2} ,
@@ -32,7 +32,7 @@ where,
and :math:`\phi` is the phase.
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/AFMZF.rst b/docs/source/fitting/fitfunctions/AFMZF.rst
index a644f69fdeb3fbeb1c0ba45c14ec40955331eabf..eb013351a626112318d66f3f016e3ed59d5706ab 100644
--- a/docs/source/fitting/fitfunctions/AFMZF.rst
+++ b/docs/source/fitting/fitfunctions/AFMZF.rst
@@ -28,7 +28,7 @@ where,
and :math:`\phi` is the phase.
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/BSpline.rst b/docs/source/fitting/fitfunctions/BSpline.rst
index febd998bb3a87efe3321e145107bb5026bcf7513..6ffb1a6f5c0203540ecfd35554a600ad320ed846 100644
--- a/docs/source/fitting/fitfunctions/BSpline.rst
+++ b/docs/source/fitting/fitfunctions/BSpline.rst
@@ -28,16 +28,16 @@ To demonstrate these conditions we can set up a basic BSpline of order 2 with 3
Breakpoints : :math:`x_0, x_1, x_2`
-Our BSpline will be defined as the following:
+Our BSpline will be defined as the following:
.. math::
- B(x) =
+ B(x) =
\begin{cases}
f_1(x)& x_0 \leq x \leq x_1 \\
f_2(x)& x_1 \leq x \leq x_2 \\
\end{cases}
-
+
We can write our :math:`B(x)` function as a series :math:`B(x) = \sum_{i=0}^{n+k-2} A_i f_i(x)`
where :math:`A_i` is the coefficient of the BSpline. This coefficient maps to our fitting parameters found below.
@@ -49,14 +49,14 @@ as the -2 accounts for our 2 exterior breakpoints at :math:`x_0` and :math:`x_n`
To make our BSpline piecewise-smooth we must ensure that these conditions are satisfied:
.. math::
-
+
f_1(x_0) = y_0\\
f_2(x_2) = y_2\\
\frac{df_1}{dx}(x_1) = \frac{df_2}{dx}(x_1)\\
\frac{d^2 f_1}{dx^2}(x_1) = \frac{d^2 f_2}{dx^2}(x_1)\\
This point of smoothness is represented by the red circle in the graph below of our BSpline function :math:`B(x)`
-
+
.. image:: ../../images/BSplineQuadraticExample.jpg
:width: 800px
:align: center
@@ -65,7 +65,7 @@ This point of smoothness is represented by the red circle in the graph below of
BSplines and Interpolation
--------------------------
-BSplines are commonly used when interpolating between points. An interpolation is different to a fit as
+BSplines are commonly used when interpolating between points. An interpolation is different to a fit as
it uses all of the data points to connect a straight line through them. It acts as if all of your data points
are also breakpoints and a smooth spline of order N will connect the points together.
diff --git a/docs/source/fitting/fitfunctions/BackToBackExponential.rst b/docs/source/fitting/fitfunctions/BackToBackExponential.rst
index 4979e6f810fe8e7b56e43f0cf47fab9de77c397e..96d12e062ec7024676dd2f94bdc73ed31ffefc6e 100644
--- a/docs/source/fitting/fitfunctions/BackToBackExponential.rst
+++ b/docs/source/fitting/fitfunctions/BackToBackExponential.rst
@@ -26,12 +26,12 @@ the peak; more specifically it represent the point where the
exponentially modelled neutron pulse goes from being exponentially
rising to exponentially decaying. In general :math:`X0` does not conicide
with the maximum of the peak (it is typically at slightly lower TOF than the
-maximum, by an amount that depends on :math:`A`, :math:`B` and :math:`S`).
+maximum, by an amount that depends on :math:`A`, :math:`B` and :math:`S`).
:math:`I` is the integrated intensity.
For information about how to convert Fullprof back-to-back exponential
parameters into those used for this function see
-`CreateBackToBackParameters <http://www.mantidproject.org/CreateBackToBackParameters>`_.
+`CreateBackToBackParameters <http://www.mantidproject.org/CreateBackToBackParameters>`_.
For information about how to create parameters from a GSAS parameter file see
`CreateBackToBackParametersGSAS <http://www.mantidproject.org/CreateBackToBackParametersGSAS>`_.
diff --git a/docs/source/fitting/fitfunctions/BivariateGaussian.rst b/docs/source/fitting/fitfunctions/BivariateGaussian.rst
index 24b63fbced75f46e428d9a4ce1f9d14572a4982e..2a322ee506c2730c4d3731ab456040ad15629f15 100644
--- a/docs/source/fitting/fitfunctions/BivariateGaussian.rst
+++ b/docs/source/fitting/fitfunctions/BivariateGaussian.rst
@@ -9,15 +9,15 @@ BivariateGaussian
Description
-----------
-This function provides a Bivariate Gaussian distribution by acting as a wrapper to matplotlib.mlab.bivariate_normal.
-It differs from :ref:`func-BivariateNormal` in that it does not require any detector-space-specific input and
+This function provides a Bivariate Gaussian distribution by acting as a wrapper to matplotlib.mlab.bivariate_normal.
+It differs from :ref:`func-BivariateNormal` in that it does not require any detector-space-specific input and
allows for a correlation term.
.. math:: V= \frac{A}{2 \pi \sigma_x \sigma_y \sqrt{1-\rho^2}} \times \exp \bigg[- \frac{1}{2(1-\rho^2)} \bigg( \frac{(x-\mu_x)^2}{\sigma_x^2} + \frac{(y-\mu_y)^2}{\sigma_y^2} - \frac{2 \rho (x-\mu_x) (y-\mu_y)} {\sigma_x \sigma_y} \bigg) \bigg] + bg
.. attributes::
-The attributes **nX** and **nY** store the dimension of the two histogram. This is useful when reconstructing
+The attributes **nX** and **nY** store the dimension of the two histogram. This is useful when reconstructing
a 2D histogram from a fit, which reduces the data 1D.
.. properties::
diff --git a/docs/source/fitting/fitfunctions/CompositePCRmagnet.rst b/docs/source/fitting/fitfunctions/CompositePCRmagnet.rst
index 529b6a7e316c8737c795e9b6c1866b7000a986d3..cb9020c91da814b3a6e2f95e84794a112b2d0c9e 100644
--- a/docs/source/fitting/fitfunctions/CompositePCRmagnet.rst
+++ b/docs/source/fitting/fitfunctions/CompositePCRmagnet.rst
@@ -21,7 +21,7 @@ When :math:`B > 0` ,
where,
-:math:`A_0` is the amplitude,
+:math:`A_0` is the amplitude,
:math:`\sigma` (MHz) is the gaussian relaxation rate,
@@ -30,7 +30,7 @@ where,
and :math:`\Delta` is the relaxation rate of the extra term when :math:`B>0` .
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/CrystalFieldFunction.rst b/docs/source/fitting/fitfunctions/CrystalFieldFunction.rst
index da56bc8bc4b7257b188d9e546c7f9af6520455e6..4780bb3831784324e223553562240ea8a4c87c8d 100644
--- a/docs/source/fitting/fitfunctions/CrystalFieldFunction.rst
+++ b/docs/source/fitting/fitfunctions/CrystalFieldFunction.rst
@@ -27,7 +27,7 @@ Here is an example of how to fit function's parameters to spectra.
# Define two single site multi-spectrum functions to generate some data to fit to
fun1 = "name=CrystalFieldMultiSpectrum,Ion=Ce,Temperatures=(4, 10), FWHMs=2,Background=\"name=LinearBackground,A0=20,A1=-0.11\","\
"ToleranceIntensity=0.001,B20=0.37737,B22=3.9770,B40=-0.031787,B42=-0.11611,B44=-0.12544,f1.f0.A0=10,f1.f0.A1=0.09"
-
+
fun2 = "name=CrystalFieldMultiSpectrum,Ion=Pr, Symmetry=D4h,Temperatures=(4, 10), FWHMs=2,"\
"ToleranceIntensity=0.001,B20=0.4268, B40=0.001031, B44=-0.01996, B60=0.00005, B64=0.001563"
diff --git a/docs/source/fitting/fitfunctions/CrystalFieldHeatCapacity.rst b/docs/source/fitting/fitfunctions/CrystalFieldHeatCapacity.rst
index ff5fafbacd4064b9305f910e30add1b7e50cbaca..847d6f51b3763601d33425846a86e06f13235e67 100644
--- a/docs/source/fitting/fitfunctions/CrystalFieldHeatCapacity.rst
+++ b/docs/source/fitting/fitfunctions/CrystalFieldHeatCapacity.rst
@@ -10,21 +10,21 @@ Description
-----------
This function calculates the magnetic contribution to the heat capacity of a material from the splitting of its electronic energy
-levels by the crystal field. It is a part of crystal field computation in Mantid and under active development.
+levels by the crystal field. It is a part of crystal field computation in Mantid and under active development.
More documentation will follow as the development progresses.
Theory
------
-The heat capacity at constant volume is given by
+The heat capacity at constant volume is given by
-.. math:: C_v = \left. \frac{\partial U}{\partial T} \right|_V = \frac{1}{k_B T^2}
- \frac{\partial}{\partial \beta} \left[ \frac{1}{Z}\frac{\partial Z}{\partial \beta} \right]
+.. math:: C_v = \left. \frac{\partial U}{\partial T} \right|_V = \frac{1}{k_B T^2}
+ \frac{\partial}{\partial \beta} \left[ \frac{1}{Z}\frac{\partial Z}{\partial \beta} \right]
\qquad \qquad \qquad \qquad \qquad \qquad \qquad \\
- = \frac{1}{k_B T^2} \left( \frac{1}{Z}\sum_n E_n^2 \exp(-\beta E_n)
+ = \frac{1}{k_B T^2} \left( \frac{1}{Z}\sum_n E_n^2 \exp(-\beta E_n)
- \left[ \frac{1}{Z}\sum_n E_n \exp(-\beta E_n) \right]^2 \right)
-where :math:`k_B` is Boltzmann's constant, :math:`Z` is the partition sum, and :math:`E_n` is the n-th energy level split by the
+where :math:`k_B` is Boltzmann's constant, :math:`Z` is the partition sum, and :math:`E_n` is the n-th energy level split by the
crystal field. This is obtained by diagonalising the crystal field Hamiltonian.
Example
@@ -43,20 +43,20 @@ The `x`-axis is given in Kelvin, and the heat capacity (`y`-axis) is in Joules p
# Build a reference data set
fun = 'name=CrystalFieldHeatCapacity,Ion=Ce,B20=0.37737,B22=0.039770,B40=-0.031787,B42=-0.11611,B44=-0.12544'
-
+
# This creates a (empty) workspace to use with EvaluateFunction
x = np.linspace(1, 300, 300)
y = x * 0
e = y + 1
ws = CreateWorkspace(x, y, e)
-
+
# The calculated data will be in 'data', WorkspaceIndex=1
EvaluateFunction(fun, ws, OutputWorkspace='data')
-
+
# Change parameters slightly and fit to the reference data
fun = 'name=CrystalFieldHeatCapacity,Ion=Ce,Symmetry=C2v,B20=0.4,B22=0.04,B40=-0.03,B42=-0.1,B44=-0.1,'
fun += 'ties=(B60=0,B62=0,B64=0,B66=0,BmolX=0,BmolY=0,BmolZ=0,BextX=0,BextY=0,BextZ=0)'
-
+
# (set MaxIterations=0 to see the starting point)
Fit(fun, 'data', WorkspaceIndex=1, Output='fit',MaxIterations=100, CostFunction='Unweighted least squares')
# Using Unweighted least squares fit because the data has no errors.
diff --git a/docs/source/fitting/fitfunctions/CrystalFieldMagnetisation.rst b/docs/source/fitting/fitfunctions/CrystalFieldMagnetisation.rst
index 7991e012ce505b35a64a40f85456ecd6318ca8ed..2f33415262e387bdd5220dce8782e365f0c2dbb5 100644
--- a/docs/source/fitting/fitfunctions/CrystalFieldMagnetisation.rst
+++ b/docs/source/fitting/fitfunctions/CrystalFieldMagnetisation.rst
@@ -9,9 +9,9 @@ CrystalFieldMagnetisation
Description
-----------
-This function calculates the crystal field (molar) *magnetic moment* as a function of applied magnetic field in a specified
-direction, in either atomic (:math:`\mu_B/`/ion), SI (Am\ :sup:`2`\ /mol) or cgs (erg/Gauss/mol == emu/mol) units.
-If using cgs units, the magnetic field (:math:`x`-axis) is expected to be in Gauss. If using SI or atomic units, the field
+This function calculates the crystal field (molar) *magnetic moment* as a function of applied magnetic field in a specified
+direction, in either atomic (:math:`\mu_B/`/ion), SI (Am\ :sup:`2`\ /mol) or cgs (erg/Gauss/mol == emu/mol) units.
+If using cgs units, the magnetic field (:math:`x`-axis) is expected to be in Gauss. If using SI or atomic units, the field
should be given in Tesla.
Strictly, to obtain the *magnetisation*, one should divide by the molar volume of the material.
@@ -23,19 +23,19 @@ The function calculates the expectation value of the magnetic moment operator :m
.. math:: M(B) = \frac{1}{Z} \sum_n \langle V_n(H) | g_J \mu_B \mathbf{J} | V_n(H) \rangle \exp(-\beta E_n(H))
-where :math:`B` is the magnetic field in Tesla, :math:`g_J` is the Landé g-factor, :math:`\mu_B` is the Bohr magneton.
-The moment operator is defined as :math:`\mathbf{J} = \hat{J}_x B_x + \hat{J}_y B_y + \hat{J}_z B_z` where
-:math:`\hat{J}_x`, :math:`\hat{J}_y`, and :math:`\hat{J}_z` are the angular momentum operators in Cartesian coordinates,
-with :math:`z` defined to be along the quantisation axis of the crystal field (which is usually defined to be the highest
-symmetry rotation axis). :math:`B_x`, :math:`B_y`, and :math:`B_z` are the components of the unit vector pointing in the
-direction of the applied magnetic field in this coordinate system. :math:`V_n(B)` and :math:`E_n(B)` are the n\ :sup:`th`
+where :math:`B` is the magnetic field in Tesla, :math:`g_J` is the Landé g-factor, :math:`\mu_B` is the Bohr magneton.
+The moment operator is defined as :math:`\mathbf{J} = \hat{J}_x B_x + \hat{J}_y B_y + \hat{J}_z B_z` where
+:math:`\hat{J}_x`, :math:`\hat{J}_y`, and :math:`\hat{J}_z` are the angular momentum operators in Cartesian coordinates,
+with :math:`z` defined to be along the quantisation axis of the crystal field (which is usually defined to be the highest
+symmetry rotation axis). :math:`B_x`, :math:`B_y`, and :math:`B_z` are the components of the unit vector pointing in the
+direction of the applied magnetic field in this coordinate system. :math:`V_n(B)` and :math:`E_n(B)` are the n\ :sup:`th`
eigenvector and eigenvalue (wavefunction and energy) obtained by diagonalising the Hamiltonian:
-.. math:: \mathcal{H} = \mathcal{H}_{\mathrm{cf}} + \mathcal{H}_{\mathrm{Zeeman}} = \sum_{k,q} B_k^q \hat{O}_k^q
+.. math:: \mathcal{H} = \mathcal{H}_{\mathrm{cf}} + \mathcal{H}_{\mathrm{Zeeman}} = \sum_{k,q} B_k^q \hat{O}_k^q
- g_J \mu_B \mathbf{J}\cdot\mathbf{B}
-where in this case the magnetic field :math:`\mathbf{B}` is not normalised. Finally, :math:`\beta = 1/(k_B T)`
-with :math:`k_B` the Boltzmann constant and :math:`T` the temperature, and :math:`Z` is the partition sum
+where in this case the magnetic field :math:`\mathbf{B}` is not normalised. Finally, :math:`\beta = 1/(k_B T)`
+with :math:`k_B` the Boltzmann constant and :math:`T` the temperature, and :math:`Z` is the partition sum
:math:`Z = \sum_n \exp(-\beta E_n(H))`.
Example
@@ -49,24 +49,24 @@ The `x`-axis is given in Tesla, and the magnetisation (`y`-axis) is in bohr magn
.. testcode:: ExampleCrystalFieldMagnetisation
import numpy as np
-
+
# Build a reference data set
fun = 'name=CrystalFieldMagnetisation,Ion=Ce,B20=0.37737,B22=0.039770,B40=-0.031787,B42=-0.11611,B44=-0.12544,'
fun += 'Temperature=10'
-
+
# This creates a (empty) workspace to use with EvaluateFunction
x = np.linspace(0, 30, 300)
y = x * 0
e = y + 1
ws = CreateWorkspace(x, y, e)
-
+
# The calculated data will be in 'data', WorkspaceIndex=1
EvaluateFunction(fun, ws, OutputWorkspace='data')
-
+
# Change parameters slightly and fit to the reference data
fun = 'name=CrystalFieldMagnetisation,Ion=Ce,Symmetry=C2v,Temperature=10,B20=0.4,B22=0.04,B40=-0.03,B42=-0.1,B44=-0.1,'
fun += 'ties=(B60=0,B62=0,B64=0,B66=0,BmolX=0,BmolY=0,BmolZ=0,BextX=0,BextY=0,BextZ=0)'
-
+
# (set MaxIterations=0 to see the starting point)
Fit(fun, 'data', WorkspaceIndex=1, Output='fit',MaxIterations=100, CostFunction='Unweighted least squares')
# Using Unweighted least squares fit because the data has no errors.
@@ -110,7 +110,7 @@ Output (the numbers you see on your machine may vary):
powder;Boolean;false; Whether to calculate the powder averaged magnetisation or not.
Hdir;Vector;(0.,0.,1.); The direction of the applied field w.r.t. the crystal field parameters
Unit;String;'bohr'; The desired units of the output, either: 'bohr' (muB/ion), 'SI' (Am^2/mol) or 'cgs' (erg/G/mol).
-
+
.. properties::
.. categories::
diff --git a/docs/source/fitting/fitfunctions/CrystalFieldMoment.rst b/docs/source/fitting/fitfunctions/CrystalFieldMoment.rst
index 7f7add0446b9ca57de2ed41fda50f2d06da39105..25df59fefa5ee76a030f94133c56de3dc4a8d4be 100644
--- a/docs/source/fitting/fitfunctions/CrystalFieldMoment.rst
+++ b/docs/source/fitting/fitfunctions/CrystalFieldMoment.rst
@@ -10,30 +10,30 @@ Description
-----------
This function calculates the crystal field contribution to the magnetic moment as a function of temperature at a constant
-applied magnetic field in a specified direction, in either atomic (:math:`\mu_B/`/ion), SI (Am\ :sup:`2`\ /mol) or
-cgs (erg/Gauss/mol == emu/mol) units.
+applied magnetic field in a specified direction, in either atomic (:math:`\mu_B/`/ion), SI (Am\ :sup:`2`\ /mol) or
+cgs (erg/Gauss/mol == emu/mol) units.
Theory
------
-The magnetic moment is calculated as the thermal expectation value of the magnetic moment operator
+The magnetic moment is calculated as the thermal expectation value of the magnetic moment operator
:math:`\mathbf{\mu} = g_J \mu_B \mathbf{J}`:
.. math:: M(B) = \frac{1}{Z} \sum_n \langle V_n(H) | g_J \mathbf{J} | V_n(H) \rangle \exp(-\beta E_n(H))
-where :math:`B` is the magnetic field in Tesla, :math:`g_J` is the Landé g-factor, and :math:`\mu_B` is the Bohr magneton.
-The moment operator is defined as :math:`\mathbf{J} = \hat{J}_x B_x + \hat{J}_y B_y + \hat{J}_z B_z` where
-:math:`\hat{J}_x`, :math:`\hat{J}_y`, and :math:`\hat{J}_z` are the angular momentum operators in Cartesian coordinates,
-with :math:`z` defined to be along the quantisation axis of the crystal field (which is usually defined to be the highest
-symmetry rotation axis). :math:`B_x`, :math:`B_y`, and :math:`B_z` are the components of the unit vector pointing in the
-direction of the applied magnetic field in this coordinate system. :math:`V_n(B)` and :math:`E_n(B)` are the n\ :sup:`th`
+where :math:`B` is the magnetic field in Tesla, :math:`g_J` is the Landé g-factor, and :math:`\mu_B` is the Bohr magneton.
+The moment operator is defined as :math:`\mathbf{J} = \hat{J}_x B_x + \hat{J}_y B_y + \hat{J}_z B_z` where
+:math:`\hat{J}_x`, :math:`\hat{J}_y`, and :math:`\hat{J}_z` are the angular momentum operators in Cartesian coordinates,
+with :math:`z` defined to be along the quantisation axis of the crystal field (which is usually defined to be the highest
+symmetry rotation axis). :math:`B_x`, :math:`B_y`, and :math:`B_z` are the components of the unit vector pointing in the
+direction of the applied magnetic field in this coordinate system. :math:`V_n(B)` and :math:`E_n(B)` are the n\ :sup:`th`
eigenvector and eigenvalue (wavefunction and energy) obtained by diagonalising the Hamiltonian:
-.. math:: \mathcal{H} = \mathcal{H}_{\mathrm{cf}} + \mathcal{H}_{\mathrm{Zeeman}} = \sum_{k,q} B_k^q \hat{O}_k^q
+.. math:: \mathcal{H} = \mathcal{H}_{\mathrm{cf}} + \mathcal{H}_{\mathrm{Zeeman}} = \sum_{k,q} B_k^q \hat{O}_k^q
- g_J \mu_B \mathbf{J}\cdot\mathbf{B}
-where in this case the magnetic field :math:`\mathbf{B}` is not normalised. Finally, :math:`\beta = 1/(k_B T)` with
-:math:`k_B` the Boltzmann constant and :math:`T` the temperature, and :math:`Z` is the partition sum
+where in this case the magnetic field :math:`\mathbf{B}` is not normalised. Finally, :math:`\beta = 1/(k_B T)` with
+:math:`k_B` the Boltzmann constant and :math:`T` the temperature, and :math:`Z` is the partition sum
:math:`Z = \sum_n \exp(-\beta E_n(H))`.
Example
@@ -47,25 +47,25 @@ The `x`-axis is the temperature in Kelvin, and the magnetic moment (`y`-axis) is
.. testcode:: ExampleCrystalFieldMoment
import numpy as np
-
+
# Build a reference data set
fun = 'name=CrystalFieldMoment,Ion=Ce,B20=0.37737,B22=0.039770,B40=-0.031787,B42=-0.11611,B44=-0.12544,'
fun += 'Hmag=0.01, Hdir=(1,1,0), Unit=SI,'
-
+
# This creates a (empty) workspace to use with EvaluateFunction
x = np.linspace(1, 300, 300)
y = x * 0
e = y + 1
ws = CreateWorkspace(x, y, e)
-
+
# The calculated data will be in 'data', WorkspaceIndex=1
EvaluateFunction(fun, ws, OutputWorkspace='data')
-
+
# Change parameters slightly and fit to the reference data
fun = 'name=CrystalFieldMoment,Ion=Ce,Symmetry=C2v,B20=0.37,B22=0.04,B40=-0.032,B42=-0.12,B44=-0.13,'
fun += 'Hmag=0.01, Hdir=(1,1,0), Unit=SI,'
fun += 'ties=(B60=0,B62=0,B64=0,B66=0,BmolX=0,BmolY=0,BmolZ=0,BextX=0,BextY=0,BextZ=0)'
-
+
# (set MaxIterations=0 to see the starting point)
Fit(fun, 'data', WorkspaceIndex=1, Output='fit',MaxIterations=100, CostFunction='Unweighted least squares')
# Using Unweighted least squares fit because the data has no errors.
@@ -110,7 +110,7 @@ Output (the numbers you see on your machine may vary):
Hdir;Vector;(0.,0.,1.); The direction of the applied field w.r.t. the crystal field parameters
Unit;String;'bohr'; The desired units of the output, either: 'bohr' (muB/ion), 'SI' (Am^2/mol) or 'cgs' (erg/G/mol).
inverse;Boolean;false; Whether to output 1/M(T) instead of M(T).
-
+
.. properties::
.. categories::
diff --git a/docs/source/fitting/fitfunctions/CrystalFieldMultiSpectrum.rst b/docs/source/fitting/fitfunctions/CrystalFieldMultiSpectrum.rst
index 89b237389085bd36abb6b6b08cf4a7376eb7091d..2ca98810fcf3bd9bfd4ea41c9aee1d5e94795e28 100644
--- a/docs/source/fitting/fitfunctions/CrystalFieldMultiSpectrum.rst
+++ b/docs/source/fitting/fitfunctions/CrystalFieldMultiSpectrum.rst
@@ -13,7 +13,7 @@ This function calculates multiple spectra of a crystal electric field acting upo
in Mantid and under active development. More documentation will follow as the development progresses.
Here is an example of how to fit function's parameters to a spectrum. All parameters disallowed by symmetry are fixed automatically.
-Any other parameters that need fixing has to be tied explicitly. Peak centres (in meV) and intensities (in mb/sr) are also fixed and computed
+Any other parameters that need fixing has to be tied explicitly. Peak centres (in meV) and intensities (in mb/sr) are also fixed and computed
from the field parameters with the :ref:`CrystalFieldPeaks <func-CrystalFieldPeaks>` function. Any other peak parameter can be set using
the "f-index-dot-name" syntax (see :ref:`CompositeFunction <func-CompositeFunction>` for more details).
@@ -33,7 +33,7 @@ the "f-index-dot-name" syntax (see :ref:`CompositeFunction <func-CompositeFuncti
# The calculated data will be in 'data', WorkspaceIndex=1
EvaluateFunction(fun, InputWorkspace=ws, InputWorkspace_1=ws, OutputWorkspace='data')
-
+
# Change parameters slightly and fit to the reference data
fun = 'name=CrystalFieldMultiSpectrum,Ion=Ce,Temperatures=(44, 150),ToleranceIntensity=0.1,Symmetry=C2v,B20=0.37,B22=3.9,B40=-0.03,B42=-0.11,B44=-0.12'
fun += ',f0.f1.FWHM=2,f0.f2.FWHM=2,f0.f3.FWHM=2,f1.f1.FWHM=2,f1.f2.FWHM=2,f1.f3.FWHM=2,f1.f4.FWHM=2'
@@ -44,7 +44,7 @@ the "f-index-dot-name" syntax (see :ref:`CompositeFunction <func-CompositeFuncti
InputWorkspace_1='Workspace_1', WorkspaceIndex_1=1,
Output='fit',MaxIterations=100, CostFunction='Unweighted least squares')
# Using Unweighted least squares fit because the data has no errors.
-
+
.. attributes::
Ion;String;Mandatory;An element name for a rare earth ion. Possible values are: Ce, Pr, Nd, Pm, Sm, Eu, Gd, Tb, Dy, Ho, Er, Tm, Yb.
@@ -56,7 +56,7 @@ the "f-index-dot-name" syntax (see :ref:`CompositeFunction <func-CompositeFuncti
Temperatures;List of doubles;[1.0];Temperatures of each spectrum in Kelvin.
FWHMs;List of double;[0.0];The default full peak widths at half maximum for each spectrum. If not set explicitly via function parameters the peaks will have this width (not fixed).
FixAllPeakParameters;Bool;False;If True fix all parameters of the peak functions. The only parameters that will vary will be the field parameters.
-
+
If the peak functions have any own attributes they can be accessed using the "f-index-dot-name" syntax (see :ref:`CompositeFunction <func-CompositeFunction>` for more details).
diff --git a/docs/source/fitting/fitfunctions/CrystalFieldPeaks.rst b/docs/source/fitting/fitfunctions/CrystalFieldPeaks.rst
index 2b0a6bbd151a53d2bc8bb442adccf0fcb987b913..dd3a1d69dfc54e4b8f37e6856d5b4ead5a51fcb3 100644
--- a/docs/source/fitting/fitfunctions/CrystalFieldPeaks.rst
+++ b/docs/source/fitting/fitfunctions/CrystalFieldPeaks.rst
@@ -12,7 +12,7 @@ Description
This function calculates energies and intensities of transitions between states of a crystal electric field acting upon a rare earth ion. It is a part of crystal field computation
in Mantid and under active development. More documentation will follow as the development progresses.
-Here is an example of how the function can be evaluated from python. The output is a `TableWorkspace` with two columns: the first column with the energies (in meV) and the second one with the intensities (in milibarn per steradian).
+Here is an example of how the function can be evaluated from python. The output is a `TableWorkspace` with two columns: the first column with the energies (in meV) and the second one with the intensities (in milibarn per steradian).
The function doesn't require an input workspace so `None` is passed for `InputWorkspace` property of `EvaluateFunction`.
.. code::
diff --git a/docs/source/fitting/fitfunctions/CrystalFieldSpectrum.rst b/docs/source/fitting/fitfunctions/CrystalFieldSpectrum.rst
index f9a2d1b910f322bbe031d7ce7a534509f618de22..659eb7b43376c61eb3ce02daafde85a5993dfe73 100644
--- a/docs/source/fitting/fitfunctions/CrystalFieldSpectrum.rst
+++ b/docs/source/fitting/fitfunctions/CrystalFieldSpectrum.rst
@@ -35,7 +35,7 @@ The `x`-axis is given in meV, and the intensity (`y`-axis) is in milibarn per st
# The calculated data will be in 'data', WorkspaceIndex=1
EvaluateFunction(fun, ws, OutputWorkspace='data')
-
+
# Change parameters slightly and fit to the reference data
fun = 'name=CrystalFieldSpectrum,Ion=Ce,Symmetry=C2v,Temperature=44,ToleranceIntensity=0.002,B20=0.37,B22=3.9,B40=-0.03,B42=-0.1,B44=-0.12,'
fun += 'f0.FWHM=2.2,f1.FWHM=1.8,f2.FWHM=2.1,'
@@ -44,7 +44,7 @@ The `x`-axis is given in meV, and the intensity (`y`-axis) is in milibarn per st
# (set MaxIterations=0 to see the starting point)
Fit(fun, 'data', WorkspaceIndex=1, Output='fit',MaxIterations=100, CostFunction='Unweighted least squares')
# Using Unweighted least squares fit because the data has no errors.
-
+
.. attributes::
Ion;String;Mandatory;An element name for a rare earth ion. Possible values are: Ce, Pr, Nd, Pm, Sm, Eu, Gd, Tb, Dy, Ho, Er, Tm, Yb.
@@ -54,7 +54,7 @@ The `x`-axis is given in meV, and the intensity (`y`-axis) is in milibarn per st
ToleranceIntensity;Double;:math:`10^{-3}`;Tolerance in intensity. If difference between intensities of two or more transitions is smaller than this value the transitions are considered degenerate.
PeakShape;String;Lorentzian;A name of a function (peak type) to describe the shape of each peak. Currently Lorentzian (default) and Gaussian sre supported.
FWHM;Double;0.0;The default full peak width at half maximum. If not set explicitly via function parameters the peaks will have this width (not fixed).
-
+
If the peak functions have any own attributes they can be accessed using the "f-index-dot-name" syntax (see :ref:`CompositeFunction <func-CompositeFunction>` for more details).
diff --git a/docs/source/fitting/fitfunctions/CrystalFieldSusceptibility.rst b/docs/source/fitting/fitfunctions/CrystalFieldSusceptibility.rst
index f06644e26df6d1765bfdc3857a0e222771559408..2794a8a963413cb6ddb160f0c1f7de383539e521 100644
--- a/docs/source/fitting/fitfunctions/CrystalFieldSusceptibility.rst
+++ b/docs/source/fitting/fitfunctions/CrystalFieldSusceptibility.rst
@@ -9,26 +9,26 @@ CrystalFieldSusceptibility
Description
-----------
-This function calculates the crystal field contribution to the *molar* magnetic susceptibility using the Van Vleck formula.
-The function outputs the results by default in *cgs* units of cm\ :sup:`3`\ /mol == "emu/mol".
+This function calculates the crystal field contribution to the *molar* magnetic susceptibility using the Van Vleck formula.
+The function outputs the results by default in *cgs* units of cm\ :sup:`3`\ /mol == "emu/mol".
There are also options to output the result in SI (m\ :sup:`3`\ /mol) or "atomic" units (\ :math:`\mu_B`/Tesla/ion).
Theory
------
-The magnetic susceptibility can be calculated by treating the magnetic field (Zeeman interaction) as a perturbation on the crystal
+The magnetic susceptibility can be calculated by treating the magnetic field (Zeeman interaction) as a perturbation on the crystal
field energy. To second order, the susceptibility per mole of magnetic ion is given by:
-.. math:: \chi(T) = \frac{N_A}{Z} \sum_n \left[ \frac{| \langle V_n | g_J \mu_B \mathbf{J} | V_n \rangle | ^2}{k_B T}
+.. math:: \chi(T) = \frac{N_A}{Z} \sum_n \left[ \frac{| \langle V_n | g_J \mu_B \mathbf{J} | V_n \rangle | ^2}{k_B T}
- 2 \sum_{m \neq n} \frac{| \langle V_n | g_J \mu_B \mathbf{J} | V_m \rangle | ^2}{E_n - E_m} \right] \exp(-\beta E_n)
-where :math:`N_A` is Avogadro's constant, :math:`k_B` is Boltzmann's constant, :math:`Z` is the partition sum, and
-:math:`V_n` and :math:`E_n` are the n-th wavefunction (eigenvector) and energy level (eigenvalue) of the unperturbed
-crystal field Hamiltonian. :math:`g_J` is the Landé g-factor, :math:`\mu_B` is the Bohr magneton and the moment operator
+where :math:`N_A` is Avogadro's constant, :math:`k_B` is Boltzmann's constant, :math:`Z` is the partition sum, and
+:math:`V_n` and :math:`E_n` are the n-th wavefunction (eigenvector) and energy level (eigenvalue) of the unperturbed
+crystal field Hamiltonian. :math:`g_J` is the Landé g-factor, :math:`\mu_B` is the Bohr magneton and the moment operator
is defined as :math:`\mathbf{J} = \hat{J}_x B_x + \hat{J}_y B_y + \hat{J}_z B_z` where :math:`\hat{J}_x`, :math:`\hat{J}_y`,
-and :math:`\hat{J}_z` are the angular momentum operators in Cartesian coordinates, with :math:`z` defined to
-be along the quantisation axis of the crystal field (which is usually defined to be the highest symmetry rotation axis).
-:math:`B_x`, :math:`B_y`, and :math:`B_z` are the components of the unit vector pointing in the direction of the applied
+and :math:`\hat{J}_z` are the angular momentum operators in Cartesian coordinates, with :math:`z` defined to
+be along the quantisation axis of the crystal field (which is usually defined to be the highest symmetry rotation axis).
+:math:`B_x`, :math:`B_y`, and :math:`B_z` are the components of the unit vector pointing in the direction of the applied
magnetic field in this coordinate system.
Finally, in order to account for the effect of any exchange interactions in the system which will shift the susceptiblity curve
@@ -56,21 +56,21 @@ The `x`-axis is given in Kelvin, and the susceptibility (`y`-axis) is in cgs uni
# Build a reference data set
fun = 'name=CrystalFieldSusceptibility,Ion=Ce,B20=0.37737,B22=0.039770,B40=-0.031787,B42=-0.11611,B44=-0.12544,'
fun += 'Hdir=(1,1,1), Unit=cgs, inverse=1,'
-
+
# This creates a (empty) workspace to use with EvaluateFunction
x = np.linspace(1, 300, 300)
y = x * 0
e = y + 1
ws = CreateWorkspace(x, y, e)
-
+
# The calculated data will be in 'data', WorkspaceIndex=1
EvaluateFunction(fun, ws, OutputWorkspace='data')
-
+
# Change parameters slightly and fit to the reference data
fun = 'name=CrystalFieldSusceptibility,Ion=Ce,Symmetry=C2v,B20=0.4,B22=0.04,B40=-0.03,B42=-0.1,B44=-0.1,'
fun += 'Hdir=(1,1,1), Unit=cgs, inverse=1,'
fun += 'ties=(B60=0,B62=0,B64=0,B66=0,BmolX=0,BmolY=0,BmolZ=0,BextX=0,BextY=0,BextZ=0)'
-
+
# (set MaxIterations=0 to see the starting point)
Fit(fun, 'data', WorkspaceIndex=1, Output='fit',MaxIterations=100, CostFunction='Unweighted least squares')
# Using Unweighted least squares fit because the data has no errors.
diff --git a/docs/source/fitting/fitfunctions/CubicSpline.rst b/docs/source/fitting/fitfunctions/CubicSpline.rst
index a1be8788004e64a629d3b0f2f39e797ba07342fe..b36895ec401a0a17370967c38111f727e904daa0 100644
--- a/docs/source/fitting/fitfunctions/CubicSpline.rst
+++ b/docs/source/fitting/fitfunctions/CubicSpline.rst
@@ -16,7 +16,7 @@ First and second derivatives from the spline can be calculated by using
the derivative1D function.
A CubicSpline is a polynomial function :math:`f(x)` of order 3, defined between an interval :math:`a \leqslant x \leqslant b`.
-When using CubicSplines for interpolation or for fitting, we essentially chain :ref:`BSplines <func-BSpline>`
+When using CubicSplines for interpolation or for fitting, we essentially chain :ref:`BSplines <func-BSpline>`
of order 3 together so that each spline passes through the breakpoints in that interval.
A Cubic Spline is a specific case of :ref:`BSpline <func-BSpline>`
@@ -30,13 +30,13 @@ Example
To demonstrate these conditions we can set up a basic CubicSpline with 3 breakpoints:
-Our CubicSpline will be defined as the following:
+Our CubicSpline will be defined as the following:
Breakpoints : :math:`x_0, x_1, x_2`
.. math::
- C(x) =
+ C(x) =
\begin{cases}
f_1(x)& x_0 \leq x \leq x_1 \\
f_2(x)& x_1 \leq x \leq x_2 \\
@@ -47,7 +47,7 @@ Our piecewise functions can be written as :math:`f_1(x) = c_0x^3 + c_1x^2 + c_2x
To make our CubicSpline piecewise-smooth we must ensure that these conditions are satisfied:
.. math::
-
+
f_1(x_0) = y_0\\
f_2(x_2) = y_2\\
\frac{df_1}{dx}(x_1) = \frac{df_2}{dx}(x_1)\\
@@ -64,7 +64,7 @@ This point of smoothness is represented by the red circle in the graph below of
CubicSplines and Fitting
------------------------
-Fitting using a CubicSpline fit function is different to interpolating with a CubicSpline as it requires the number of breakpoints
+Fitting using a CubicSpline fit function is different to interpolating with a CubicSpline as it requires the number of breakpoints
to be less than the number of data points. This allows the CubicSpline to fit as close as possible to the dataset using a least-squares fit
instead of passing through all data points as with interpolation. The fitted curve will pass through the breakpoints however it may not pass through
all of the data points in the set.
@@ -77,7 +77,7 @@ The original data plot is in black and our fitted CubicSpline with four breakpoi
:align: center
:height: 600px
:alt: fitting example using BSplines
-
+
.. attributes::
@@ -85,7 +85,7 @@ The original data plot is in black and our fitted CubicSpline with four breakpoi
x0;Double;\-;Position of first exterior breakpoint
x1;Double;\-;Position of the interior breakpoint
x2;Double;\-;Position of the last exterior breakpoint
-
+
.. properties::
Even though the number of fitting parameters is set to 3 by default, this number is based off :math:`N + K - 2`.
diff --git a/docs/source/fitting/fitfunctions/DampedBessel.rst b/docs/source/fitting/fitfunctions/DampedBessel.rst
index d3429444ab070a926dbd63ad7127ebc186348065..244bab1a37cbc7a1513de16db70c24472a474f51 100644
--- a/docs/source/fitting/fitfunctions/DampedBessel.rst
+++ b/docs/source/fitting/fitfunctions/DampedBessel.rst
@@ -14,7 +14,7 @@ A bessel function with damped oscillation that could apply to incommensurate mag
.. math:: A(t)= A_0e^{-\lambda_\text{L}t}\left( (1-f_L)e^{-\lambda_\text{T}t}J_0(\omega_\mu t + \phi) + f_L\right)
where,
-
+
:math:`A_0` is the amplitude of asymmetry,
:math:`J_0(x)` is the Bessel function of the first kind,
@@ -28,7 +28,7 @@ where,
and :math:`\phi` is the phase.
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/DiffRotDiscreteCircle.rst b/docs/source/fitting/fitfunctions/DiffRotDiscreteCircle.rst
index 071dca095e194244f7724ce3f5f734200068d0b1..c92eff71e448bcf7c094586d894a5565888d12e9 100644
--- a/docs/source/fitting/fitfunctions/DiffRotDiscreteCircle.rst
+++ b/docs/source/fitting/fitfunctions/DiffRotDiscreteCircle.rst
@@ -28,7 +28,7 @@ transition rate. This, along with the circle radius :math:`r`, conform
the two fundamental fitting parameters of the structure factor
:math:`S(Q,E)`:
-.. math::
+.. math::
S(Q,E) \equiv = \int e^{-iEt/\hbar} I(Q,t) dt = A_0(Q,r) \delta (E) + \frac{1}{\pi} \sum_{l=1}^{N-1} A_l (Q,r) \frac{\hbar \tau_l^{-1}}{(\hbar \tau_l^{-1})^2+E^2}
diff --git a/docs/source/fitting/fitfunctions/DynamicKuboToyabe.rst b/docs/source/fitting/fitfunctions/DynamicKuboToyabe.rst
index 29e0579654adb3929841c4830e76475f004aa632..b21af64bfd075f63c9adfbb64247960abf62d075 100644
--- a/docs/source/fitting/fitfunctions/DynamicKuboToyabe.rst
+++ b/docs/source/fitting/fitfunctions/DynamicKuboToyabe.rst
@@ -16,15 +16,15 @@ by
where :math:`g_z\left(t\right)` is the static KT function, and :math:`\nu` the muon hopping rate.
-| In zero field, :math:`B_0=0`:
+| In zero field, :math:`B_0=0`:
.. math:: g_z\left(t\right) = \mbox{A} \Bigg[ \frac{1}{3} + \frac{2}{3} \left( 1 - {\Delta}^2 {t}^2 \right) e^{-\frac{1}{2}\Delta^2 t^2} \Bigg]
-| In the presence of a longitudinal field, :math:`B_0=\omega_0 /\left(2\pi \gamma_{\mu}\right)>0`:
+| In the presence of a longitudinal field, :math:`B_0=\omega_0 /\left(2\pi \gamma_{\mu}\right)>0`:
.. math:: g_z\left(t\right) = \mbox{A} \Bigg[ 1 - 2\frac{\Delta^2}{\omega_0^2}\Big(1-cos(\omega_0 t)e^{-\frac{1}{2}\Delta^2 t^2}\Big) + 2\frac{\Delta^4}{\omega_0^4}\omega_0\int_0^t \sin(\omega_0\tau)e^{-\frac{1}{2}\Delta^2\tau^2}d\tau \Bigg]
-DynamicKuboToyabe function has one attribute (non-fitting parameter), 'BinWidth', that sets the width of the step size between points for numerical integration. Note that
+DynamicKuboToyabe function has one attribute (non-fitting parameter), 'BinWidth', that sets the width of the step size between points for numerical integration. Note that
small values will lead to long calculation times, while large values will produce less accurate results. The default value is set to 0.05, and it is allowed to vary in the range [0.001,0.1].
.. attributes::
diff --git a/docs/source/fitting/fitfunctions/EndErfc.rst b/docs/source/fitting/fitfunctions/EndErfc.rst
index 9baefc701a522548679663a2d0742bb0c655d730..8dd0070065fe3bc07290c321d8fad6deb6bef40b 100644
--- a/docs/source/fitting/fitfunctions/EndErfc.rst
+++ b/docs/source/fitting/fitfunctions/EndErfc.rst
@@ -14,7 +14,7 @@ This is a fitting function that makes use of the complementary error function fo
The function :math:`f(x)=A \cdot erfc(\frac{B-x}{C}) + D` with the following constraints:
- :math:`D \geq 0`
-- :math:`f(x) = -2A` if :math:`A<0`
+- :math:`f(x) = -2A` if :math:`A<0`
.. attributes::
diff --git a/docs/source/fitting/fitfunctions/FickDiffusion.rst b/docs/source/fitting/fitfunctions/FickDiffusion.rst
index 7a8c53395f29157901d1779ea1b19883d5438e70..79afd2c0ec374daa4c1a4961a52200b1bb26867d 100644
--- a/docs/source/fitting/fitfunctions/FickDiffusion.rst
+++ b/docs/source/fitting/fitfunctions/FickDiffusion.rst
@@ -9,7 +9,7 @@ Fick Diffusion
Description
-----------
-Models the Q dependence of the QENS line width (Gamma (hwhm)), diffusion coefficients (D),
+Models the Q dependence of the QENS line width (Gamma (hwhm)), diffusion coefficients (D),
residence times (tau) and jump lengths (l) to extract the associated long range diffusive
motions of molecules. Fick's law for diffusion has the form:
diff --git a/docs/source/fitting/fitfunctions/GaussBessel.rst b/docs/source/fitting/fitfunctions/GaussBessel.rst
index f9734db3347226b3a915fcd77de090dc258fa4a6..99f4cd4fd3376d3cbff3482bb366cff804ef921f 100644
--- a/docs/source/fitting/fitfunctions/GaussBessel.rst
+++ b/docs/source/fitting/fitfunctions/GaussBessel.rst
@@ -27,7 +27,7 @@ where,
and :math:`\phi` is the phase.
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/HighTFMuonium.rst b/docs/source/fitting/fitfunctions/HighTFMuonium.rst
index 9eb701b531ee025873c1f01651ea666b7522dff0..b42f76c222142c952036e671f468b4df1e1f0f3a 100644
--- a/docs/source/fitting/fitfunctions/HighTFMuonium.rst
+++ b/docs/source/fitting/fitfunctions/HighTFMuonium.rst
@@ -32,7 +32,7 @@ where,
and :math:`\nu` is the frequency (MHz).
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/IkedaCarpenterConvoluted.rst b/docs/source/fitting/fitfunctions/IkedaCarpenterConvoluted.rst
index ac1899c76f3388d5c0ac8a44d187e114d3a72056..427454091d41564f4ffb323c54efbfbbf56ec5c4 100644
--- a/docs/source/fitting/fitfunctions/IkedaCarpenterConvoluted.rst
+++ b/docs/source/fitting/fitfunctions/IkedaCarpenterConvoluted.rst
@@ -11,8 +11,8 @@ Description
This function is an Ikeda-Carpenter function convolved with a tophat function and a Gaussian function. The Ikeda-Carpenter function is given by:
-.. math::
- V = Scale \times \Big\{ (1-R)(\alpha t')^2 e^{-\alpha t'} + 2R\frac{\alpha^2 \beta}{(\alpha-\beta)^3} \times
+.. math::
+ V = Scale \times \Big\{ (1-R)(\alpha t')^2 e^{-\alpha t'} + 2R\frac{\alpha^2 \beta}{(\alpha-\beta)^3} \times
\big[ e^{-\beta t'} - e^{-\alpha t'} (1 + (\alpha - \beta)t' + \frac{1}{2}(\alpha-\beta)^2t'^2) \big] \Big\}
This is convolved with a tophat function (of width **hatWidth**) and a Gaussian function :math:`exp(-k_{conv} t^2)`.
@@ -32,7 +32,7 @@ Here is an example of generating an Ikeda-Carpenter function:
.. code-block:: python
:linenos:
-
+
import numpy as np
import matplotlib.pyplot as plt
fICC = IkedaCarpenterConvoluted()
diff --git a/docs/source/fitting/fitfunctions/Keren.rst b/docs/source/fitting/fitfunctions/Keren.rst
index 1deb6bb077ad637705ba23b19d301cf4060fcb7a..d179c4716649c00f47304b742645e87f7a9812aa 100644
--- a/docs/source/fitting/fitfunctions/Keren.rst
+++ b/docs/source/fitting/fitfunctions/Keren.rst
@@ -21,7 +21,7 @@ where the relaxation rate :math:`\Gamma(t)` is
.. math:: \Gamma(t)t = 2\Delta^2 \frac{\left\{\left(\omega_L^2 + \nu^2\right)\nu t + \left(\omega_L^2-\nu^2\right)\left(1-e^{-\nu t}\cos(\omega_L t)\right) - 2\nu\omega_L e^{-\nu t}\sin(\omega_L t)\right\}}{\left(\omega_L^2 + \nu^2\right)^2}
:math:`A = P_z(0)` is the polarization at time zero, :math:`\nu` is the fluctuation rate
-(inverse correlation time), :math:`\Delta` is the distribution width of the local fields
+(inverse correlation time), :math:`\Delta` is the distribution width of the local fields
and :math:`\omega_L` is the Larmor frequency (longitudinal field times muon gyromagnetic ratio).
.. attributes::
diff --git a/docs/source/fitting/fitfunctions/LowTFMuonium.rst b/docs/source/fitting/fitfunctions/LowTFMuonium.rst
index 7267e5fdcda9bd80ce26754c9823b1e2c43cfe9a..b3b6900fed387cd97de0c38e3233bd214911e300 100644
--- a/docs/source/fitting/fitfunctions/LowTFMuonium.rst
+++ b/docs/source/fitting/fitfunctions/LowTFMuonium.rst
@@ -46,7 +46,7 @@ A (MHz) is the isotropic hyperfine coupling constant,
and :math:`f_\text{cut} = 10^{32}` (MHz).
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/Meier.rst b/docs/source/fitting/fitfunctions/Meier.rst
index a9564eaa0478144688140cadc59e157cb3163ed9..ed79696da5ff49d7d5c7107ae849362df40efe8e 100644
--- a/docs/source/fitting/fitfunctions/Meier.rst
+++ b/docs/source/fitting/fitfunctions/Meier.rst
@@ -18,7 +18,7 @@ Time dependence of the polarization function for a static muon interacting with
.. math:: P_z(t) = \frac{1}{2J+1}\left\{1+\sum^J_{m=-J+1}[\cos^2(2\alpha_m)+\sin^2(2\alpha_m)\cos(\lambda^+_m-\lambda^-_m)t]\right\},
.. math:: P_x(t) = \frac{1}{2J+1}\sum^J_{m=-J} \{ \cos^2\alpha_{m+1}\sin^2\alpha_m\cos(\lambda_{m+1}^+-\lambda_m^+)t +\cos^2\alpha_{m+1}\cos^2\alpha_m\cos(\lambda_{m+1}^+-\lambda_m^-)t +\sin^2\alpha_{m+1}\sin^2\alpha_m\cos(\lambda_{m+1}^--\lambda_m^+)t +\sin^2\alpha_{m+1}\cos^2\alpha_m\cos(\lambda_{m+1}^--\lambda_m^-)t\},
-
+
.. math:: \lambda_m^\pm = \frac{1}{2}[\omega_Q(2m^2-2m+1)+\omega_D\pm W_m],
.. math:: W_m = \{(\omega_D+\omega_Q)^2(2m-1)^2+\omega_D^2[J(J+1)-m(m-1)]\}^\frac{1}{2},
@@ -34,7 +34,7 @@ Time dependence of the polarization function for a static muon interacting with
and :math:`m` is the z-component of the total orbital quantum number.
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/ModOsc.rst b/docs/source/fitting/fitfunctions/ModOsc.rst
index fac6755e47a279dafc68ad49f7a6cbc91e2e25f3..3df394503efd5cd3e59cf6f843a39c6b3b1db80d 100644
--- a/docs/source/fitting/fitfunctions/ModOsc.rst
+++ b/docs/source/fitting/fitfunctions/ModOsc.rst
@@ -15,7 +15,7 @@ Traverse Field sinususodally modulated oscillation. Sinusoidal distribution of p
where,
-:math:`A_0` is the amplitude,
+:math:`A_0` is the amplitude,
:math:`\omega` is the oscillation frequency,
@@ -24,7 +24,7 @@ where,
and :math:`\omega_\text{mod}` (G) is the modulation frequency.
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/MsdGauss.rst b/docs/source/fitting/fitfunctions/MsdGauss.rst
index 0aaf5c38b4e95c48d7351fb8e39d9e7148be2d22..37d225fa29a4317383647aefed3c62f8b239e325 100644
--- a/docs/source/fitting/fitfunctions/MsdGauss.rst
+++ b/docs/source/fitting/fitfunctions/MsdGauss.rst
@@ -11,7 +11,7 @@ Description
The Gaussian model for Mean-squared displacement fitting is defined as:
-.. math::
+.. math::
\mbox{Height} \cdot e^{\left(\frac{-x^2 \cdot MSD}{6}\right)}
@@ -28,7 +28,7 @@ corresponds to half of the MSD in a one-dimensional harmonic system [1].
**References**
-1. Kurkal-Siebert, V. , Daniel, R. , Finney J. , Tehei, M. , Dunn, R. and Smith J. (2006) 'Enzyme hydration,
+1. Kurkal-Siebert, V. , Daniel, R. , Finney J. , Tehei, M. , Dunn, R. and Smith J. (2006) 'Enzyme hydration,
activity and flexibility: A neutron scattering approach', *Journal of Non-Crystalline Solids*, Vol.352(42-49), pp.4387-4393
diff --git a/docs/source/fitting/fitfunctions/MuH.rst b/docs/source/fitting/fitfunctions/MuH.rst
index 3de0b09e51a8f67b7cdaed86a6eae6c4038dc8e0..e757e1a8f130720860c8ad116a484599a5260abf 100644
--- a/docs/source/fitting/fitfunctions/MuH.rst
+++ b/docs/source/fitting/fitfunctions/MuH.rst
@@ -24,7 +24,7 @@ Fitting function for use by Muon scientists defined by:
and :math:`\phi` (rad) is the phase at time :math:`t=0`.
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/MuMinusExpTF.rst b/docs/source/fitting/fitfunctions/MuMinusExpTF.rst
index 29eab79d6d5978fbda68b5d7025a14c1b88d176b..8b7693817517b078cf1c45ef994523113550481a 100644
--- a/docs/source/fitting/fitfunctions/MuMinusExpTF.rst
+++ b/docs/source/fitting/fitfunctions/MuMinusExpTF.rst
@@ -19,7 +19,7 @@ where,
:math:`\tau` is the muon decay life time,
-:math:`A` is the relative amplitude of the oscillatory term,
+:math:`A` is the relative amplitude of the oscillatory term,
:math:`\lambda` (MHz) is the relaxation rateo f the oscillatory term,
@@ -28,7 +28,7 @@ where,
and :math:`\phi` is the phase.
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/PCRmagRedfield.rst b/docs/source/fitting/fitfunctions/PCRmagRedfield.rst
index 11af3600485e83a093515be5e812fecc8dac2b8e..b3cb78e7073c856c31f2ad3f75dfa5b3539e3b52 100644
--- a/docs/source/fitting/fitfunctions/PCRmagRedfield.rst
+++ b/docs/source/fitting/fitfunctions/PCRmagRedfield.rst
@@ -26,7 +26,7 @@ where,
and :math:`\Delta` is the precession frequency.
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/PCRmagnet.rst b/docs/source/fitting/fitfunctions/PCRmagnet.rst
index 7a5cb5c5fc4ddbb2f89da4ff073524fd8873eed0..97f1d05abf3eb8d0744e22ed3abcc90717321a6e 100644
--- a/docs/source/fitting/fitfunctions/PCRmagnet.rst
+++ b/docs/source/fitting/fitfunctions/PCRmagnet.rst
@@ -30,7 +30,7 @@ H0 (G) is the local magnetic field,
and :math:`t_\text{off}` (microsecs) is the time offset.
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/PCRmagnetZFKT.rst b/docs/source/fitting/fitfunctions/PCRmagnetZFKT.rst
index fa13b695a1e40d648b9e85daf64b54c670c9d8ca..3277e41927749a5b6a11cf6ff2ff8973bf21d69c 100644
--- a/docs/source/fitting/fitfunctions/PCRmagnetZFKT.rst
+++ b/docs/source/fitting/fitfunctions/PCRmagnetZFKT.rst
@@ -20,7 +20,7 @@ where,
:math:`t'=t-t_\text{off}` ,
-:math:`A_0` is the amplitude,
+:math:`A_0` is the amplitude,
:math:`\Delta` (MHz) is the relaxation rate,
@@ -31,7 +31,7 @@ H0 (G) is the local magnetic field,
and :math:`t_\text{off}` (microsecs) is the time offset.
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/PCRmagnetfnorm.rst b/docs/source/fitting/fitfunctions/PCRmagnetfnorm.rst
index a22feea307602d69d89f90ade8fedd1e65bd80c3..48d0c87dab752967d6952bfcbedfbc2937a03245 100644
--- a/docs/source/fitting/fitfunctions/PCRmagnetfnorm.rst
+++ b/docs/source/fitting/fitfunctions/PCRmagnetfnorm.rst
@@ -30,7 +30,7 @@ H0 (G) is the local magnetic field,
and :math:`t_\text{off}` (microsecs) is the time offset.
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/Polynomial.rst b/docs/source/fitting/fitfunctions/Polynomial.rst
index 45756c56794f031fd74bd2ba1b4d27d0c3866be3..776af454013c4d3edc1d3a40c2abfffbef2f4622 100644
--- a/docs/source/fitting/fitfunctions/Polynomial.rst
+++ b/docs/source/fitting/fitfunctions/Polynomial.rst
@@ -26,7 +26,7 @@ Usage
x = np.linspace(0, 10, 100)
y = np.exp(-4*(x-4)**2) -0.01*(x-5)**2 + 0.3
ws = CreateWorkspace(x, y)
-
+
# do a fit with the polynomial fit function
Fit("name=Polynomial,n=2", ws, Exclude=[2, 6], Output='out')
diff --git a/docs/source/fitting/fitfunctions/RFresonance.rst b/docs/source/fitting/fitfunctions/RFresonance.rst
index 3f59bb8d0d3efc44fd785431634550e81da1d6be..a35909f14aa0c1daca715be669cd224733743cf2 100644
--- a/docs/source/fitting/fitfunctions/RFresonance.rst
+++ b/docs/source/fitting/fitfunctions/RFresonance.rst
@@ -28,7 +28,7 @@ with
and :math:`\Delta` (MHz) is the decay rate.
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/SCDPanelErrors.rst b/docs/source/fitting/fitfunctions/SCDPanelErrors.rst
index 825a57806b4411e2a18c4ac4c74384f57a132754..f8cd5e7e3337ff41e5db3911c515390eac948fde 100644
--- a/docs/source/fitting/fitfunctions/SCDPanelErrors.rst
+++ b/docs/source/fitting/fitfunctions/SCDPanelErrors.rst
@@ -55,10 +55,10 @@ follows:
RotateCenters;Boolean;;If false Rotations are only about the center of the banks.
SampleOffsets;Boolean;;A sample being off from the center of the goniometer can result in larger errors.
-- PeakWorkspaceName - This peak must be indexed by a UB matrix
+- PeakWorkspaceName - This peak must be indexed by a UB matrix
whose lattice parametersare CLOSE to the above lattice parameters
- BankNames - Names separated by "/" or a "!" if the next
- bank is in a different group. Bank names from the same group
+ bank is in a different group. Bank names from the same group
belong together("Requirement" for use with the Fit algorithm)
.. properties::
diff --git a/docs/source/fitting/fitfunctions/SpinGlass.rst b/docs/source/fitting/fitfunctions/SpinGlass.rst
index dad651f92ea5d2726d37b923fa94b3512cbec66a..d30da62b24c9f8de9916f3802d86769184ab53d0 100644
--- a/docs/source/fitting/fitfunctions/SpinGlass.rst
+++ b/docs/source/fitting/fitfunctions/SpinGlass.rst
@@ -28,7 +28,7 @@ and :math:`a` is the half-width half maximum of the local field Lorentzian Distr
Note that :math:`0<q<1` and :math:`\gamma>0`
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/StandardSC.rst b/docs/source/fitting/fitfunctions/StandardSC.rst
index cb858c75700b76d60c27011e6627c676471106ff..da3b79d52283b5dfa6af6cf1d025bb04a0f1c7ef 100644
--- a/docs/source/fitting/fitfunctions/StandardSC.rst
+++ b/docs/source/fitting/fitfunctions/StandardSC.rst
@@ -31,12 +31,12 @@ The relationship between :math:`\omega` and magnetic field B is given by:
.. math:: \omega = 2 \pi \nu = \gamma_\mu \text{B}
-where,
+where,
:math:`\gamma_\mu` is the gyromagnetic ratio of muon.
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/StaticLorentzianKT.rst b/docs/source/fitting/fitfunctions/StaticLorentzianKT.rst
index c9879c72c968a881a644bba805f3d704eaf4b82a..134009da7a22c4f91fd43f3419180c387ee9a643 100644
--- a/docs/source/fitting/fitfunctions/StaticLorentzianKT.rst
+++ b/docs/source/fitting/fitfunctions/StaticLorentzianKT.rst
@@ -28,7 +28,7 @@ where,
and :math:`a (\mu s^{-1})` is the half-width at half maximum of the Lorentzian distribution.
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/StretchedKT.rst b/docs/source/fitting/fitfunctions/StretchedKT.rst
index 600fcadaeb9932c8b18cda665360904bb200bc18..29ab539b057d99249a95344ea6fa3de628b1e451 100644
--- a/docs/source/fitting/fitfunctions/StretchedKT.rst
+++ b/docs/source/fitting/fitfunctions/StretchedKT.rst
@@ -19,14 +19,14 @@ where,
:math:`A_0` is the amplitude,
-:math:`\beta` is the stretching exponential and it ranges from 1 (neglible nuclear field) and 2 (strong nuclear field).
+:math:`\beta` is the stretching exponential and it ranges from 1 (neglible nuclear field) and 2 (strong nuclear field).
.. attributes::
.. properties::
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/TFMuonium.rst b/docs/source/fitting/fitfunctions/TFMuonium.rst
index eedc7c148d870fa9bc79f081ef1680c2dea522bd..f171c6bfdc0e445797867887a106c90b1776ea9a 100644
--- a/docs/source/fitting/fitfunctions/TFMuonium.rst
+++ b/docs/source/fitting/fitfunctions/TFMuonium.rst
@@ -44,7 +44,7 @@ A (MHz) is the isotropic hyperfine coupling constant,
and :math:`f_\text{cut} = 10^{32}`.
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/TabulatedFunction.rst b/docs/source/fitting/fitfunctions/TabulatedFunction.rst
index 47db966fe8cf367085611c49a9cb084faacf3ac9..d70f6b733b5540e1798c554bebbf71e8234fd6e5 100644
--- a/docs/source/fitting/fitfunctions/TabulatedFunction.rst
+++ b/docs/source/fitting/fitfunctions/TabulatedFunction.rst
@@ -16,7 +16,7 @@ returns zero for points outside the tabulated values.
The files can be either ascii text files or nexus files. The ascii files must contain two column
of real numbers separated by spaces. The first column are the x-values and the second one is for y.
-If a nexus file is used its first spectrum provides the data for the function. The same is true for
+If a nexus file is used its first spectrum provides the data for the function. The same is true for
a workspace which must be a MatrixWorkspace.
.. attributes::
@@ -34,12 +34,12 @@ Usage
from __future__ import print_function
ws1=LoadNexus('tabulatedFunctionExample.nxs')
-
- # Clone the workspace by rescaling and shift
+
+ # Clone the workspace by rescaling and shift
ws2=CloneWorkspace(ws1)
ws2=Scale(ws2, Factor=1.34, Operation='Multiply')
ws2=ScaleX(ws2, Factor=0.002, Operation='Add')
-
+
# Call the Fit algorithm and perform the fit
myFunc='name=TabulatedFunction,Workspace=ws1,WorkspaceIndex=0,Scaling=1.0,Shift=0.0'
fit_output = Fit(Function=myFunc, InputWorkspace=ws2, Output='fit')
diff --git a/docs/source/fitting/fitfunctions/Voigt.rst b/docs/source/fitting/fitfunctions/Voigt.rst
index 572bc75d2b5512f704469732dac1aff82f482b9c..491d54ce15a8a4795a6d1b8f6197336fb7358819 100644
--- a/docs/source/fitting/fitfunctions/Voigt.rst
+++ b/docs/source/fitting/fitfunctions/Voigt.rst
@@ -25,7 +25,7 @@ approximations to the Voigt function exist making it palatable for
fitting in a least-squares algorithm. The approximation used here is
described in
-- A.B. McLean, C.E.J. Mitchell, and D.M. Swanston. *Implementation of an Efficient Analytical Approximation to the Voigt Function for Photoemission Lineshape Analysis.* Journal of Electron Spectroscopy and Related Phenomena **69.2** (1994): 125–132
+- A.B. McLean, C.E.J. Mitchell, and D.M. Swanston. *Implementation of an Efficient Analytical Approximation to the Voigt Function for Photoemission Lineshape Analysis.* Journal of Electron Spectroscopy and Related Phenomena **69.2** (1994): 125–132
`doi:10.1016/0368-2048(94)02189-7 <http://dx.doi.org/10.1016/0368-2048(94)02189-7>`__
The approximation uses a combination of 4 Lorentzians in two variables
diff --git a/docs/source/fitting/fitfunctions/ZFMuonium.rst b/docs/source/fitting/fitfunctions/ZFMuonium.rst
index d89da411aaf13a6629f816177fe6213e02f8fb95..43d3b963e458386889e2b1c580bda1c5627fe8f2 100644
--- a/docs/source/fitting/fitfunctions/ZFMuonium.rst
+++ b/docs/source/fitting/fitfunctions/ZFMuonium.rst
@@ -38,7 +38,7 @@ FreqD (MHz) is the anisotropic hyperfine coupling constant,
and :math:`\phi` (rad) is the phase at time :math:`t=0` .
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/ZFdipole.rst b/docs/source/fitting/fitfunctions/ZFdipole.rst
index 223721d2c6dfb82ad2d441c49530c98749adc3a0..c1dc24ca1295efc6a0e5e1c89ae7aadd0c0e7e18 100644
--- a/docs/source/fitting/fitfunctions/ZFdipole.rst
+++ b/docs/source/fitting/fitfunctions/ZFdipole.rst
@@ -17,12 +17,12 @@ where,
:math:`\lambda` (MHz) is the relaxation rate,
-:math:`A_0` is the amplitude,
+:math:`A_0` is the amplitude,
and :math:`B_\text{D}` (G) is the dipolar field.
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/ZFelectronDipole.rst b/docs/source/fitting/fitfunctions/ZFelectronDipole.rst
index f32bac1d7f5453b0e845814ada98b4528bd65ede..2363ce73ffc0613289e39ef45d8606da95d0a0e0 100644
--- a/docs/source/fitting/fitfunctions/ZFelectronDipole.rst
+++ b/docs/source/fitting/fitfunctions/ZFelectronDipole.rst
@@ -17,7 +17,7 @@ ZF PCR signal from interaction with a single dipole.
where,
-:math:`A_0` is the amplitude,
+:math:`A_0` is the amplitude,
:math:`\lambda` (MHz) is the relaxation rate,
@@ -30,7 +30,7 @@ where,
and :math:`\mu_n` is the proton moment.
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitfunctions/ZFprotonDipole.rst b/docs/source/fitting/fitfunctions/ZFprotonDipole.rst
index 910e42226bcbd630224ce30e8169d24a4396825e..6d6171cbb5d5291781c7efcd1d4cd54c53eac967 100644
--- a/docs/source/fitting/fitfunctions/ZFprotonDipole.rst
+++ b/docs/source/fitting/fitfunctions/ZFprotonDipole.rst
@@ -17,7 +17,7 @@ ZF PCR signal from interaction with a single dipole.
where,
-:math:`A_0` is the amplitude,
+:math:`A_0` is the amplitude,
:math:`\lambda` (MHz) is the relaxation rate,
@@ -30,7 +30,7 @@ where,
and :math:`\mu_n` is the proton moment.
.. plot::
-
+
from mantid.simpleapi import FunctionWrapper
import matplotlib.pyplot as plt
import numpy as np
diff --git a/docs/source/fitting/fitminimizers/BFGS.rst b/docs/source/fitting/fitminimizers/BFGS.rst
index 8f3dfa13c801fc7203e119183dcddc4d25dce215..2179c155df84a426a0b197e650b3f6418fa7315d 100644
--- a/docs/source/fitting/fitminimizers/BFGS.rst
+++ b/docs/source/fitting/fitminimizers/BFGS.rst
@@ -4,13 +4,13 @@ BFGS (Broyden-Fletcher-Goldfarb-Shanno) minimizer
=================================================
This minimizer is
-explained at `Wikipedia <https://en.wikipedia.org/wiki/Broyden–Fletcher–Goldfarb–Shanno_algorithm>`__
+explained at `Wikipedia <https://en.wikipedia.org/wiki/Broyden–Fletcher–Goldfarb–Shanno_algorithm>`__
It is listed in :ref:`a comparison of fitting minimizers <FittingMinimizers Minimizer Comparison>`.
-It makes use of the
+It makes use of the
`GSL (GNU Scientific Library) library
-<https://www.gnu.org/software/gsl/>`__, specifically the
+<https://www.gnu.org/software/gsl/>`__, specifically the
`GSL routines for least-squares fitting
<https://www.gnu.org/software/gsl/manual/html_node/Least_002dSquares-Fitting.html#Least_002dSquares-Fitting>`__.
diff --git a/docs/source/fitting/fitminimizers/DampedGaussNewton.rst b/docs/source/fitting/fitminimizers/DampedGaussNewton.rst
index a7496566710b6275c6d4b881232cfb1548ed8b19..177508823abd01aaee82055ba2714520185612f8 100644
--- a/docs/source/fitting/fitminimizers/DampedGaussNewton.rst
+++ b/docs/source/fitting/fitminimizers/DampedGaussNewton.rst
@@ -4,14 +4,14 @@ Damped Gauss-Newton minimizer
=============================
This minimizer is
-explained at `Wikipedia <https://en.wikipedia.org/wiki/Gauss–Newton_algorithm#Improved_versions>`__
+explained at `Wikipedia <https://en.wikipedia.org/wiki/Gauss–Newton_algorithm#Improved_versions>`__
and has damping.
It is listed in :ref:`a comparison of fitting minimizers <FittingMinimizers Minimizer Comparison>`.
-It makes use of the
+It makes use of the
`GSL (GNU Scientific Library) library
-<https://www.gnu.org/software/gsl/>`__, specifically the
+<https://www.gnu.org/software/gsl/>`__, specifically the
`GSL routines for least-squares fitting
<https://www.gnu.org/software/gsl/manual/html_node/Least_002dSquares-Fitting.html#Least_002dSquares-Fitting>`__.
diff --git a/docs/source/fitting/fitminimizers/FletcherReeves.rst b/docs/source/fitting/fitminimizers/FletcherReeves.rst
index 00e4ed9c771bd94f0e71bb9b4c6c78c03c637077..19b6a9275bc57f89f7e1f7043c72e2cc3411bff2 100644
--- a/docs/source/fitting/fitminimizers/FletcherReeves.rst
+++ b/docs/source/fitting/fitminimizers/FletcherReeves.rst
@@ -3,14 +3,14 @@
Conjugate Gradient Minimizer (Fletcher-Reeves imp.)
===================================================
-This minimizer an implementation of the nonlinear conjugate gradient method
-explained at `Wikipedia <https://en.wikipedia.org/wiki/Nonlinear_conjugate_gradient_method>`__
+This minimizer an implementation of the nonlinear conjugate gradient method
+explained at `Wikipedia <https://en.wikipedia.org/wiki/Nonlinear_conjugate_gradient_method>`__
It is listed in :ref:`a comparison of fitting minimizers <FittingMinimizers Minimizer Comparison>`.
-It makes use of the
+It makes use of the
`GSL (GNU Scientific Library) library
-<https://www.gnu.org/software/gsl/>`__, specifically the
+<https://www.gnu.org/software/gsl/>`__, specifically the
`GSL routines for least-squares fitting
<https://www.gnu.org/software/gsl/manual/html_node/Least_002dSquares-Fitting.html#Least_002dSquares-Fitting>`__.
diff --git a/docs/source/fitting/fitminimizers/GradientDescent.rst b/docs/source/fitting/fitminimizers/GradientDescent.rst
index 3fc5639e7a3d903887f7fb3e69656375ff6a73eb..1213e1bd2b1f3bdbf57f260825f5cf07eadf4e5d 100644
--- a/docs/source/fitting/fitminimizers/GradientDescent.rst
+++ b/docs/source/fitting/fitminimizers/GradientDescent.rst
@@ -6,9 +6,9 @@ Steepest Descent Minimizer
This minimizer is explained at - `Wikipedia <https://en.wikipedia.org/wiki/Gradient_descent>`__ as the gradient descent method.
It is listed in :ref:`a comparison of fitting minimizers <FittingMinimizers Minimizer Comparison>`.
-It makes use of the
+It makes use of the
`GSL (GNU Scientific Library) library
-<https://www.gnu.org/software/gsl/>`__, specifically the
+<https://www.gnu.org/software/gsl/>`__, specifically the
`GSL routines for least-squares fitting
<https://www.gnu.org/software/gsl/manual/html_node/Least_002dSquares-Fitting.html#Least_002dSquares-Fitting>`__.
diff --git a/docs/source/fitting/fitminimizers/LevenbergMarquardt.rst b/docs/source/fitting/fitminimizers/LevenbergMarquardt.rst
index da8885fe31f0458683f0f916498522f57b650d5d..c42b11df0e3520689bfe33b7c539d6d4ca11768b 100644
--- a/docs/source/fitting/fitminimizers/LevenbergMarquardt.rst
+++ b/docs/source/fitting/fitminimizers/LevenbergMarquardt.rst
@@ -3,12 +3,12 @@
Levenberg-Marquardt Minimizer
=============================
-This minimizer is explained at - `Wikipedia <https://en.wikipedia.org/wiki/Levenberg-Marquardt_algorithm>`__
+This minimizer is explained at - `Wikipedia <https://en.wikipedia.org/wiki/Levenberg-Marquardt_algorithm>`__
It is the default minimizer and is listed in :ref:`a comparison of fitting minimizers <FittingMinimizers Minimizer Comparison>`.
-It makes use of the
+It makes use of the
`GSL (GNU Scientific Library) library
-<https://www.gnu.org/software/gsl/>`__, specifically the
+<https://www.gnu.org/software/gsl/>`__, specifically the
`GSL routines for least-squares fitting
<https://www.gnu.org/software/gsl/manual/html_node/Least_002dSquares-Fitting.html#Least_002dSquares-Fitting>`__.
diff --git a/docs/source/fitting/fitminimizers/LevenbergMarquardtMD.rst b/docs/source/fitting/fitminimizers/LevenbergMarquardtMD.rst
index bdb40c68b5758f6cb2c8222a0cf14d9592ec43f4..c97129c729f83ab4a295023e30bc13a710b91f6f 100644
--- a/docs/source/fitting/fitminimizers/LevenbergMarquardtMD.rst
+++ b/docs/source/fitting/fitminimizers/LevenbergMarquardtMD.rst
@@ -3,8 +3,8 @@
Levenberg-Marquardt MD Minimizer
================================
-This minimizer is the same as the :ref:`Levenberg-Marquardt minimizer <LevenbergMarquardt>` as explained
-in - `Wikipedia <https://en.wikipedia.org/wiki/Levenberg-Marquardt_algorithm>`__ , but is intended for
+This minimizer is the same as the :ref:`Levenberg-Marquardt minimizer <LevenbergMarquardt>` as explained
+in - `Wikipedia <https://en.wikipedia.org/wiki/Levenberg-Marquardt_algorithm>`__ , but is intended for
:ref:`MD workspaces <MDWorkspace>`
or for a large number of data points.
It divides its work into chunks to achieve a greater efficiency for a large number of data points than
@@ -12,9 +12,9 @@ can be obtained from the default Levenberg-Marquardt minimizer.
It is listed in :ref:`a comparison of fitting minimizers <FittingMinimizers Minimizer Comparison>`.
-It makes use of the
+It makes use of the
`GSL (GNU Scientific Library) library
-<https://www.gnu.org/software/gsl/>`__, specifically the
+<https://www.gnu.org/software/gsl/>`__, specifically the
`GSL routines for least-squares fitting
<https://www.gnu.org/software/gsl/manual/html_node/Least_002dSquares-Fitting.html#Least_002dSquares-Fitting>`__.
diff --git a/docs/source/fitting/fitminimizers/PolakRibiere.rst b/docs/source/fitting/fitminimizers/PolakRibiere.rst
index 6acc3e0f7e6b2f7776c88a17c183f6fa7cd2371c..6de7914aa573e2765983f0dd567f4d468103b506 100644
--- a/docs/source/fitting/fitminimizers/PolakRibiere.rst
+++ b/docs/source/fitting/fitminimizers/PolakRibiere.rst
@@ -3,14 +3,14 @@
Conjugate Gradient Minimizer (Polak-Ribiere imp.)
=================================================
-This minimizer an implementation of the nonlinear conjugate gradient method
+This minimizer an implementation of the nonlinear conjugate gradient method
explained at `Wikipedia <https://en.wikipedia.org/wiki/Nonlinear_conjugate_gradient_method>`__ .
It is listed in :ref:`a comparison of fitting minimizers <FittingMinimizers Minimizer Comparison>`.
-It makes use of the
+It makes use of the
`GSL (GNU Scientific Library) library
-<https://www.gnu.org/software/gsl/>`__, specifically the
+<https://www.gnu.org/software/gsl/>`__, specifically the
`GSL routines for least-squares fitting
<https://www.gnu.org/software/gsl/manual/html_node/Least_002dSquares-Fitting.html#Least_002dSquares-Fitting>`__.
diff --git a/docs/source/fitting/fitminimizers/Simplex.rst b/docs/source/fitting/fitminimizers/Simplex.rst
index 9586214c45e01beb0b6ccf2cbd640b9e75578a44..1b646a917e38e040099362dd371985c5f0c9dffb 100644
--- a/docs/source/fitting/fitminimizers/Simplex.rst
+++ b/docs/source/fitting/fitminimizers/Simplex.rst
@@ -6,9 +6,9 @@ Simplex Minimizer
This minimizer is explained at - `Wikipedia <https://en.wikipedia.org/wiki/Nelder%E2%80%93Mead_method>`__ as the Nelder-Mead method.
It is listed in :ref:`a comparison of fitting minimizers <FittingMinimizers Minimizer Comparison>`.
-It makes use of the
+It makes use of the
`GSL (GNU Scientific Library) library
-<https://www.gnu.org/software/gsl/>`__, specifically the
+<https://www.gnu.org/software/gsl/>`__, specifically the
`GSL routines for least-squares fitting
<https://www.gnu.org/software/gsl/manual/html_node/Least_002dSquares-Fitting.html#Least_002dSquares-Fitting>`__.
diff --git a/docs/source/fitting/fitminimizers/TrustRegion.rst b/docs/source/fitting/fitminimizers/TrustRegion.rst
index a174d7399a0988f88aaf44d8f26c2afc624f1afb..1bb6ea82e0b3b664a921b4614168b40a13c1f474 100644
--- a/docs/source/fitting/fitminimizers/TrustRegion.rst
+++ b/docs/source/fitting/fitminimizers/TrustRegion.rst
@@ -3,11 +3,11 @@
Trust Region Minimizer
======================
-This minimizer is a hybrid
-`Gauss-Newton <https://en.wikipedia.org/wiki/Gauss%E2%80%93Newton_algorithm>`__/`Quasi-Newton <https://en.wikipedia.org/wiki/Quasi-Newton_method>`__
+This minimizer is a hybrid
+`Gauss-Newton <https://en.wikipedia.org/wiki/Gauss%E2%80%93Newton_algorithm>`__/`Quasi-Newton <https://en.wikipedia.org/wiki/Quasi-Newton_method>`__
method, that makes use of a `trust region <https://en.wikipedia.org/wiki/Trust_region>`__.
-It is a reimplementation of part of `RALFit_nonlinear least squares solver <https://github.com/ralna/RALFit>`__.
+It is a reimplementation of part of `RALFit_nonlinear least squares solver <https://github.com/ralna/RALFit>`__.
It is listed in :ref:`a comparison of fitting minimizers <FittingMinimizers Minimizer Comparison>`.
diff --git a/docs/source/fitting/index.rst b/docs/source/fitting/index.rst
index 902c6a15990e4836301d0992735ecb8a0df0bf30..4599ea7611d9ba026d1722cd86a1ca707775368d 100644
--- a/docs/source/fitting/index.rst
+++ b/docs/source/fitting/index.rst
@@ -4,16 +4,16 @@
Fitting Overview
================
-This is technical documentation relating to fitting capabilities in Mantid. The fitting
-process is separated into two choices; the function and the minimizer. The function is
-how you think the data should be represented, the minimizer takes the combination of
+This is technical documentation relating to fitting capabilities in Mantid. The fitting
+process is separated into two choices; the function and the minimizer. The function is
+how you think the data should be represented, the minimizer takes the combination of
data and function and finds the best fit.
-*Fitting functions* describes the different functions available, with a list of the parameters
+*Fitting functions* describes the different functions available, with a list of the parameters
for setting up the function, as well as some examples of how to use different functions.
-*Fitting minimizers* gives links to detailed descriptions of the various minimizers available in
-Mantid. Choosing the right minimizer is an art as much as a science, a discussion of choosing
+*Fitting minimizers* gives links to detailed descriptions of the various minimizers available in
+Mantid. Choosing the right minimizer is an art as much as a science, a discussion of choosing
the right minimizer is provided :ref:`here <FittingMinimizers>`.
.. toctree::
diff --git a/docs/source/interfaces/diffraction/HFIR Single Crystal Reduction.rst b/docs/source/interfaces/diffraction/HFIR Single Crystal Reduction.rst
index 7be522dab4f1dae275391d22bb1bce062d2602d6..cc0b50d78cea0399973b5e27d4d15493dc6d0af3 100644
--- a/docs/source/interfaces/diffraction/HFIR Single Crystal Reduction.rst
+++ b/docs/source/interfaces/diffraction/HFIR Single Crystal Reduction.rst
@@ -95,11 +95,11 @@ Here is a typical use case to calculate UB matrix after initial setup.
1. User specifies *Experiment* and pushes button *Set*
2. Users may do a new survey or load a survey result file in tab *Survey*;
3. User enters tab *View Raw Data* and inputs scan number and list all the measuring points (Pt.)
-4. User views all the measurements
+4. User views all the measurements
* User finds out the measurement with the strongest reflection and push button use
* Alternatively, user can use the survey result to find out the Pt. with the maximum counts of the scan
-
+
5. GUI shifts to tab *Calculate UB* automatically
6. User pushes button *Find Peak* with checking *Load HKL from file*
7. GUI finds the peak center and load HKL
@@ -109,11 +109,11 @@ Here is a typical use case to calculate UB matrix after initial setup.
11. GUI calculates UB matrix and show the result
12. User may push *Index peak* to use the calculated UB matrix to index peaks in the table to check UB matrix;
13. User may refine the UB matrix and thus lattice parameters
-
+
a. user adds more peaks to the UB peak table;
b. user selects at least 3 non-degenerate peaks;
c. user clicks button *Refine*;
- d. application refines UB matrix and outputs the refined UB matrix, refined lattice parameters and their error.
+ d. application refines UB matrix and outputs the refined UB matrix, refined lattice parameters and their error.
Workflow to merge measurements in scan
@@ -293,16 +293,16 @@ fitted with a Gaussian plus flat background.
.. math:: C = A\times e^{-(x - x_0)^2/(2s^2)} - B
-where
+where
* *x* is the (moving) motor position
* *C* is the normalized counts in ROI when the moving motor is at *x*
The integrated peak intensity and its error will be calculated as
-.. math:: I = \sum_i^{<pt>} (C_i - B) \times \Delta X
+.. math:: I = \sum_i^{<pt>} (C_i - B) \times \Delta X
where
- * :math:`C_i` is the normalized detector counts in ROI of measurement *i*
+ * :math:`C_i` is the normalized detector counts in ROI of measurement *i*
* :math:`\Delta X` is the motor step
* :math:`B_i` is the estimated background
* the set of measurements *<pt>* is defined by the motor positions in the range of :math:`x_0 \pm \frac{N}{2}FWHM`.
@@ -318,15 +318,15 @@ The error can be calculated as
Integration algorithm 3: calculate intensity from fitted model
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-It is assumed that for a well measured diffraction peak, in 3D,
-the counts in ROI of each measurement from the edge of the peak to the other edge of peak
-against the moving motor's positions should be represented by a Gaussian function with
+It is assumed that for a well measured diffraction peak, in 3D,
+the counts in ROI of each measurement from the edge of the peak to the other edge of peak
+against the moving motor's positions should be represented by a Gaussian function with
flat background
.. math:: C = A\times e^{-(x - x_0)^2/(2s^2)} - B
Then the peak intensity should be the integral of the Gaussian from :math:`-\inf` to :math:`+\inf`,
-i.e.,
+i.e.,
.. math:: I = A\times s\times\sqrt{2\pi}
diff --git a/docs/source/interfaces/direct/ALF View.rst b/docs/source/interfaces/direct/ALF View.rst
index 0a9988e29cdc7904912f1d182bbadec715ee2f02..89bf881313fa497cf3cc968f9a769a6cd1ed0ffb 100644
--- a/docs/source/interfaces/direct/ALF View.rst
+++ b/docs/source/interfaces/direct/ALF View.rst
@@ -24,22 +24,22 @@ The loading section is used to load a single data set. This can be achieved by e
Instrument View
---------------
-There is a custom version of the `Instrument View <http://www.mantidproject.org/MantidPlot:_Instrument_View>`__, which only contains the render and pick tabs.
-In the pick tab chose the :code:`select whole tube` option. Left clicking on the instrument will create a menu, which will have an additional option :code:`Export Tube`.
-This option will export the currently selected data to the mini-plot on the right hand side of the GUI.
-Once a tube has been exported another option will appear in the left click menu called `Add Tube To Average`.
+There is a custom version of the `Instrument View <http://www.mantidproject.org/MantidPlot:_Instrument_View>`__, which only contains the render and pick tabs.
+In the pick tab chose the :code:`select whole tube` option. Left clicking on the instrument will create a menu, which will have an additional option :code:`Export Tube`.
+This option will export the currently selected data to the mini-plot on the right hand side of the GUI.
+Once a tube has been exported another option will appear in the left click menu called `Add Tube To Average`.
This option will create an average of all the tubes that have been exported.
The average will reset when the data changes.
Analysis Pane
-------------
-At the top of the right hand pane is a mini-plot.
+At the top of the right hand pane is a mini-plot.
This shows the exported data.
Underneath is a basic fitting tool, by default it has a `FlatBackground` and `Gaussian` loaded.
The fitting functions can be edited like the rest of Mantid.
The fit button will perform a fit and add the result to the mini-plot (in red).
-At the bottom of the right is the fitting range.
+At the bottom of the right is the fitting range.
Feedback & Comments
-------------------
diff --git a/docs/source/interfaces/direct/DGS Planner.rst b/docs/source/interfaces/direct/DGS Planner.rst
index 6284f44196a7f2fdceb8967e6b9667e4ca4e6c5a..20edd0fd4ea4c48e03e6a714492305a622817f56 100644
--- a/docs/source/interfaces/direct/DGS Planner.rst
+++ b/docs/source/interfaces/direct/DGS Planner.rst
@@ -3,7 +3,7 @@ DGS Planner
.. contents:: Table of Contents
:local:
-
+
.. figure:: /images/DGSPlanner.png
:alt: DGSPlanner.png
:align: right
@@ -13,7 +13,7 @@ Overview
--------
DGSPlanner is an interface for plotting expected coverage
-for direct geometry time-of-flight instruments. It is based on the
+for direct geometry time-of-flight instruments. It is based on the
:ref:`CalculateCoverageDGS <algm-CalculateCoverageDGS>` algorithm.
Instrument options
@@ -22,8 +22,8 @@ Instrument options
One can select an **Instrument** from the list. Please contact
the Mantid developer team to add more options. The latest instrument
geometry is loaded from the instrument definition file. In the case
-of HYSPEC, a value for the **S2** angle is required. The monochromator to sample distance is
-chosen to be msd=1798.5.
+of HYSPEC, a value for the **S2** angle is required. The monochromator to sample distance is
+chosen to be msd=1798.5.
The **Incident Energy** is in mili-electron-Volts. The **Fast** option will use only 25% of the detectors
to calculate the coverage.
One can use a previously saved Mantid workspace containing a mask, the **Mask file** option,
@@ -33,16 +33,16 @@ The **Goniometer** settings follow the Mantid convention (see :ref:`SetGoniomete
The default values follow the goniometer description in `Horace <http://horace.isis.rl.ac.uk/Generating_SQW_files>`_.
The name of the axis is just used for plotting. z direction (0,0,1) is along the beam, y direction (0,1,0)
is pointing vertically upward, and the x direction (1,0,0) is in the horizontal plane, perpendicular to z.
-The **Sense** is either 1 for counterclockwise rotations, or -1 for clockwise rotation.
-The minimum, maximum, and step values for each goniometer axis describe all sample positions for which the
-trajectories calculation are made. If more than 10 orientations are selected, the user will be promted
+The **Sense** is either 1 for counterclockwise rotations, or -1 for clockwise rotation.
+The minimum, maximum, and step values for each goniometer axis describe all sample positions for which the
+trajectories calculation are made. If more than 10 orientations are selected, the user will be promted
to proceed, since this might take longer.
Sample settings
---------------
Information about the sample can be introduced either in terms of **Lattice parameters** and orientation vectors,
-or the **UB matrix**. One can also load an ISAW UB matrix or load the UB matrix from the Nexus metadata. For
+or the **UB matrix**. One can also load an ISAW UB matrix or load the UB matrix from the Nexus metadata. For
more information, look at :ref:`SetUB <algm-SetUB>`
Viewing axes
@@ -50,34 +50,34 @@ Viewing axes
The default projection axes are [H,0,0], [0,K,0], [0,0,L], and DeltaE. One can modify
the momentum transfer components by changing the **Projection Basis**. Modifying these values
-will automatically change the viewing axes labels on the left.
+will automatically change the viewing axes labels on the left.
For example, if Projection u is 1,1,1, the first label on the left
side is going to be [H,H,H].
The first viewing axis is going to be the x axis of the plot, the second is the y axis.
One can choose an integration range in the other two directions. When swapping viewing axes, the
program remembers settings for minimum, maximum, and step.
-
-.. Note ::
+
+.. Note ::
If the angle between the x and y viewing axes is not 90 degrees, the plot will have non-orthogonal axes
-
+
Plotting
--------
-Clicking on the **Plot** button will generate a plot of the coverage for the selected instrument, for all the
+Clicking on the **Plot** button will generate a plot of the coverage for the selected instrument, for all the
goniometer settings. One can **Overplot** a different configuration (goniometer setting, incident energy, or
-instrument). If the lattice parameters are different, or the projection basis / viewing axes have changed, the
+instrument). If the lattice parameters are different, or the projection basis / viewing axes have changed, the
**Overplot** will just automatically revert to **Plot**. If **Color by angle** option is selected,
-each goniometer setting will have a different color. The blue indicates lower first angle.
+each goniometer setting will have a different color. The blue indicates lower first angle.
In some case, for example when sample has a hexagonal lattice, one might wish to use the **Aspect ratio 1:1** option,
-which would force the x and y to have the same lengths. Please do not use it if one of the axis is DeltaE, since this
+which would force the x and y to have the same lengths. Please do not use it if one of the axis is DeltaE, since this
can yield very elongated figures.
The **?** button will show this help page.
The **Save Figure** button will save the image on the right, and information about the instrument, goniometer, sample,
-and integration limits into a png file.
+and integration limits into a png file.
.. categories:: Interfaces
diff --git a/docs/source/interfaces/direct/PyChop.rst b/docs/source/interfaces/direct/PyChop.rst
index f97ba5d1d45715c41e5840cb9295e30c0d080beb..d80e9c216a1216352d8dcbf435c7198d972e63c2 100644
--- a/docs/source/interfaces/direct/PyChop.rst
+++ b/docs/source/interfaces/direct/PyChop.rst
@@ -17,7 +17,7 @@ Overview
PyChop is a tool to allow direct inelastic neutron scattering users to estimate
the inelastic resolution and incident flux for a given spectrometer setting.
Currently, the four direct geometry spectrometers at ISIS (LET, MAPS, MARI, and
-MERLIN) are supported.
+MERLIN) are supported.
For MERLIN and LET, in addition, PyChop will also calculate the allowed Ei's in
multi-rep mode, and plot the time-distance diagrams for the desired setting.
@@ -26,26 +26,26 @@ Options
-------
First, the instrument, chopper slit packages (or instrument configurations for
-LET) and chopper frequency(ies) have to be selected from the pull-down menus
+LET) and chopper frequency(ies) have to be selected from the pull-down menus
(combo boxes). Then the user should enter the desired incident energy (or the Ei
-to focus on for multi-rep operation) in the line edit box.
+to focus on for multi-rep operation) in the line edit box.
Clicking the *Calculate* button will cause PyChop to run the resolution and flux
calculations, which will take 1-2s and update the plots in the tabs on the right
hand side of the GUI. Alternatively, in the options menu, the user can select
the option of having the calculations run when enter (return) is pressed when
-the focus is on the Ei line edit box.
+the focus is on the Ei line edit box.
If the *Hold current plot* check box is enabled (selected) then the resolution
-vs energy plots will overplot the current axes.
+vs energy plots will overplot the current axes.
If the *Show multi-reps* check box is enabled (selected) then the resolution vs
energy for all allowed Ei's will be plotted on the current axes. This only
applies to LET or MERLIN with the G (gadolinium) chopper slit package.
-In the *Flux-Ei* plot tab, there is a slider at the bottom and a line edit box
+In the *Flux-Ei* plot tab, there is a slider at the bottom and a line edit box
to allow the user to select the maximum x-range (incident energy range) to plot.
-The plot updates when the slider or edit box is changed. To save computation
+The plot updates when the slider or edit box is changed. To save computation
time, the flux / elastic resolution is only calculated at twenty incident energy
points from 0.1 meV to the maximum selected.
@@ -54,11 +54,11 @@ specified Ei is shown in the *Flux-Freq* plot tab. If *Hold current plot* is
selected then several settings can be overplotted. The program will not overplot
if it detects that only the frequency has changed.
-If the instrument is LET (or MERLIN with the G chopper), the time-distance plot
-is enabled, and an additional option to change the phase of chopper 2 is
-available. This chopper has a wide opening and can be used to suppress low
-energy reps. The time delay which is specified in the chopper 2 phase edit box
-is the time-of-flight in microseconds relative to the moderator pulse when the
+If the instrument is LET (or MERLIN with the G chopper), the time-distance plot
+is enabled, and an additional option to change the phase of chopper 2 is
+available. This chopper has a wide opening and can be used to suppress low
+energy reps. The time delay which is specified in the chopper 2 phase edit box
+is the time-of-flight in microseconds relative to the moderator pulse when the
chopper first opens.
If the *Instrument scientist mode* option is selected, a similar option is
@@ -75,7 +75,7 @@ In addition to the GUI, there is also a python commandline interface to PyChop.
This is encapsulated in the ``PyChop2`` class within the ``PyChop`` module. Within
MantidPlot, to do a single point calculation of the flux and resolution
-.. code:: python
+.. code:: python
from PyChop import PyChop2
resolution, flux = PyChop2.calculate(inst='maps', chtyp='a', freq=500, ei=600, etrans=range(0,550,50))
@@ -85,7 +85,7 @@ also works.
In addition, an object orient interface is provided:
-.. code:: python
+.. code:: python
mapsres = PyChop2('maps')
mapsres.setChopper('a')
@@ -94,7 +94,7 @@ In addition, an object orient interface is provided:
res = mapsres.getResolution(range(0,550,50))
In particular, the method ``getResolution``, which takes the energy transfers to
-calculate the resolution for as an input, can be directly passed to third party
+calculate the resolution for as an input, can be directly passed to third party
programs for resolution convolution purposes.
For further help, use ``help(PyChop2)`` after importing the class.
@@ -103,16 +103,16 @@ Theory
------
The energy resolution calculated by ``PyChop`` has contributions from the time
-width of the moderator pulse :math:`\tau_{\mathrm{mod}}`, the opening times of the
+width of the moderator pulse :math:`\tau_{\mathrm{mod}}`, the opening times of the
choppers, :math:`\tau_{\mathrm{chop}}`, the response time of the detector,
:math:`\tau_{\mathrm{det}}`, and the effect of the sample, :math:`\tau_{\mathrm{sam}}`.
The first two contributions dominate so we will only concentrate on those.
-The moderator time width is determined from fitting data above 100 meV to a
+The moderator time width is determined from fitting data above 100 meV to a
:math:`\chi^2` distribution `[1]`_ which has a variance :math:`\tau_{\mathrm{mod}}^2
=3/(\Sigma v)^2` where :math:`\Sigma` is the macroscopic scattering cross-section
of the moderator and :math:`v` is the neutron velocity. However, experimentally
-it was found that this underestimates the widths at high energy `[2]`_, so that a
+it was found that this underestimates the widths at high energy `[2]`_, so that a
modified form for the variance
.. math:: \tau_{\mathrm{mod}}^2 = \tau_0 + \frac{3}{(\Sigma v)^2}
@@ -124,10 +124,10 @@ at lower neutron energies.
The chopper time width is determined from the geometry of chopper and is given by
`[2]`_, `[3]`_
-.. math::
- \tau_{\mathrm{chop}}^2 \left\{ \begin{array}{ll} \frac{(\Delta T)^2}{6}
+.. math::
+ \tau_{\mathrm{chop}}^2 \left\{ \begin{array}{ll} \frac{(\Delta T)^2}{6}
\left[\frac{1-\gamma^4/10}{1-\gamma^2/6}\right] & 0 \leq \gamma < 1 \\
- \frac{(\Delta T)^2}{6} \left[\frac{3}{5}
+ \frac{(\Delta T)^2}{6} \left[\frac{3}{5}
\frac{\gamma(\sqrt{\gamma}-2)^2(\sqrt{\gamma}+8)}{\sqrt{\gamma}+4}\right]
& 1 \leq \gamma < 4 \\
\mathrm{undefined} & \gamma \geq 4 \end{array} \right.
@@ -139,8 +139,8 @@ where
s &=& 2\omega\rho \end{array}
and :math:`p` is the width of the slits of the Fermi chopper, :math:`R` is the radius
-of the chopper package (assumed cylindrical), :math:`\omega` is its rotation speed,
-:math:`v` is the neutron velocity and :math:`\rho` is the curvature of Fermi chopper
+of the chopper package (assumed cylindrical), :math:`\omega` is its rotation speed,
+:math:`v` is the neutron velocity and :math:`\rho` is the curvature of Fermi chopper
slits.
The time variances above are defined at the moderator and chopper positions respectively.
@@ -150,7 +150,7 @@ instrument. Specifically, the relative energy width is given by the sum in quadr
of each of the contributing time widths, which we will restrict here to the two major
terms, :math:`\tau_{\mathrm{mod}}` and :math:`\tau_{\mathrm{chop}}` `[4]`_:
-.. math:: \left( \frac{\Delta E}{E_i}\right )^2 =
+.. math:: \left( \frac{\Delta E}{E_i}\right )^2 =
\left[ 2\frac{\tau_{\mathrm{chop}}}{t_{\mathrm{chop}}} \left(1+\frac{l_0+l_1}{l_2}
\left(\frac{E_f}{E_i}\right)^{\frac{3}{2}} \right) \right]^2
+ \left[ 2\frac{\tau_{\mathrm{mod}}}{t_{\mathrm{chop}}} \left(1+\frac{l_1}{l_2}
@@ -186,8 +186,8 @@ The factor :math:`\frac{1}{12}` comes from the variance of a uniform distributio
For a thin annulus, the variation is proportional to its diameter.
The fractional factor is calculated as the following variance
-.. math:: \frac{ \int^{\frac{1}{2}}_{-\frac{1}{2}} x^2 \rho(x) dx } {\int \rho(x) dx}
-
+.. math:: \frac{ \int^{\frac{1}{2}}_{-\frac{1}{2}} x^2 \rho(x) dx } {\int \rho(x) dx}
+
Here :math:`x= r \cos\theta = \frac{1}{2} \cos\theta`.
:math:`\rho(x)` is the (unnormalized) distribution function,
which is proportional :math:`\frac{1}{\sin\theta}`.
@@ -204,14 +204,14 @@ References
T G Perring, Proceedings of ICANS XII (1993)
<http://www.neutronresearch.com/parch/1993/01/199301013280.pdf>`_
-.. _[2]:
+.. _[2]:
[2] RALT-028-94: High energy magnetic excitations in hexagonal cobalt,
T G Perring, Ph.D. Thesis, University of Cambridge (1991)
.. _[3]:
-[3] `M. Marseguerra and G. Pauli, Neutron transmission probability through a
+[3] `M. Marseguerra and G. Pauli, Neutron transmission probability through a
curved revolving slit, Nucl. Inst. Meth. 4 (1959) 140
<http://dx.doi.org/10.1016/0029-554X(59)90066-7>`_
diff --git a/docs/source/interfaces/framework/Multi-dataset Fitting.rst b/docs/source/interfaces/framework/Multi-dataset Fitting.rst
index 47b9b973dfb06f30cd8e6d60484ce9152637ff77..ade30bf4727524b4e91e5a816272429ddf9b04e0 100644
--- a/docs/source/interfaces/framework/Multi-dataset Fitting.rst
+++ b/docs/source/interfaces/framework/Multi-dataset Fitting.rst
@@ -14,7 +14,7 @@ the same model and starting parameters for each spectrum. This interface can be
accessed from the main menu of MantidPlot, in *Interfaces → General →
Multi-dataset Fitting*. The interface consists of three major parts: The fit
property window, the spectrum & fit viewer, and the list of spectra to operate
-on.
+on.
.. figure:: ../../images/multidataset-fitting/multidataset-fitting-labelled.png
:align: center
@@ -171,14 +171,14 @@ and tied as with the global parameters.
.. figure:: ../../images/multidataset-fitting/multidataset-edit-local-params.png
:align: center
:width: 400px
-
- Button to open the window to edit local parameter values.
+
+ Button to open the window to edit local parameter values.
.. figure:: ../../images/multidataset-fitting/multidataset-local-params.png
:align: center
:width: 800px
-
- Editing local parameter values for each spectrum.
+
+ Editing local parameter values for each spectrum.
Spectrum Viewer
---------------
@@ -187,7 +187,7 @@ The spectrum viewer is shown in the bottom panel of the interface. This shows a
plot of a single spectrum from the loaded list. It also shows a plot of the
model with the current parameters overlaid on the spectrum. Using the buttons
shown in the screenshot below the user can select which spectrum they wish to
-view. The plot is interactive and can be panned and zoomed.
+view. The plot is interactive and can be panned and zoomed.
The user can also interactively select `x` bounds either for a single spectrum
or for all spectra by selecting the "Apply to all spectra option. To select
diff --git a/docs/source/interfaces/indirect/Crystal Field Python Interface.rst b/docs/source/interfaces/indirect/Crystal Field Python Interface.rst
index 3949d08334de6bab93c4bd3539bcbd98de4e2eb1..6096cc707462af019c11e5d7e850a12ddc6f5309 100644
--- a/docs/source/interfaces/indirect/Crystal Field Python Interface.rst
+++ b/docs/source/interfaces/indirect/Crystal Field Python Interface.rst
@@ -26,23 +26,23 @@ Possible values for the `Ion` argument are::
Ce, Pr, Nd, Pm, Sm, Eu, Gd, Tb, Dy, Ho, Er, Tm, Yb
These are the trivalent rare-earth ions. For other rare earth ions, use the equivalent trivalent ion based on
-the number of *f*-electrons in the outer shell (e.g. for Pr\ :sup:`4+` (4\ *f*\ :sup:`1`) use `Ce`).
+the number of *f*-electrons in the outer shell (e.g. for Pr\ :sup:`4+` (4\ *f*\ :sup:`1`) use `Ce`).
The rare earth ions sets the correct value of the Lande g-factor. In addition, a pure spin ion with arbitrary
(but half-integral) *S* (or *J*) values are also supported using the syntax: `Ion=S<n>` where `<n>` is an integer
or half-integer value, e.g. `Ion=S2` or `Ion=S1.5`. In these cases, the g-factor is set to *g*\ :sub:`J` = 2.
The prefix letter can also be `J` instead of `S`, and lower case letters are also supported. (e.g. `Ion=j1`,
`Ion=s2.5` and `Ion=J0.5` are all valid).
-
+
Allowed values for `Symmetry` are::
C1, Ci, C2, Cs, C2h, C2v, D2, D2h, C4, S4, C4h, D4, C4v, D2d, D4h, C3,
S6, D3, C3v, D3d, C6, C3h, C6h, D6, C6v, D3h, D6h, T, Td, Th, O, Oh
-
+
The minimum code to create a crystal field object is::
from CrystalField import CrystalField
cf = CrystalField('Ce', 'C2v')
-
+
Names of the crystal field parameters have the form `Bnn` and `IBnn` where `nn` are two digits between 0 and 6.
`Bnn` is the real and `IBnn` is the imaginary part of a complex parameter. If a parameter isn't set explicitly
its default value is 0. To set a parameter pass it to the `CrystalField` constructor as a keyword argument, e.g.::
@@ -52,7 +52,7 @@ its default value is 0. To set a parameter pass it to the `CrystalField` constru
An alternative way to set a parameter is to use the square brackets with a `CrystalField` object::
cf['B40'] = -0.031
-
+
Which can also be used to query the value of a parameter::
b = cf['B40']
@@ -65,10 +65,10 @@ The `CrystalField` class has methods to calculate the Hamiltonian and its eigens
# Calculate and return the Hamiltonian matrix as a 2D numpy array.
h = cf.getHamiltonian()
-
+
# Calculate and return the eigenvalues of the Hamiltonian as a 1D numpy array.
e = cf.getEigenvalues()
-
+
# Calculate and return the eigenvectors of the Hamiltonian as a 2D numpy array.
w = cf.getEigenvectors()
@@ -86,14 +86,14 @@ The temperature can be set either via a keyword argument `Temperature` of the co
# Using the keyword argument
cf = CrystalField('Ce', 'C2v', B20=0.37737, B22=3.9770, Temperature=44)
-
+
# Using the property
cf.Temperature = 44
Knowing the temperature allows us to calculate a peak list: a list of transition energies and intensities.::
print cf.getPeakList()
-
+
Which produces the output::
[[ 0.00000000e+00 2.44006198e+01 4.24977124e+01 1.80970926e+01 -2.44006198e+01]
@@ -109,35 +109,35 @@ If we set `ToleranceIntensity` of the above crystal field object to 1 mb/sr we'l
cf.ToleranceIntensity = 1
print cf.getPeakList()
-
+
The new output::
[[ 0. 24.40061976 42.49771237]
[ 216.71156467 88.30985303 5.04430056]]
-
+
To calculate a spectrum we need to define the shape of each peak (peak profile function) and its default width (`FWHM`).
The width can be set either via a keyword argument or a property with name `FWHM`. If the peak shape isn't set the default
of `Lorentzian` is assumed. To set a different shape use the `PeakShape` property::
cf.PeakShape = 'Gaussian'
cf.FWHM = 0.9
-
+
The values of `PeakShape` are expected to be names of Mantid peak fit functions. At the moment only `Lorentzian` and
`Gaussian` can be used.
After the peak shape is defined a spectrum can be calculated::
sp = cf.getSpectrum()
-
+
The output is a tuple of two 1d numpy arrays (x, y) that can be used with `matplotlib` to plot::
import matplotlib.pyplot as plt
plt.plot(*sp)
plt.show()
-
+
.. image:: /images/CrystalFieldSpectrum1.png
:height: 300
-
+
It is possible to change parameters of individual peaks separately. Note though that only the shape parameters can be changed,
the peak centre and the integrated intensity are defined by the crystal field parameters. To change the width of a peak
use the following syntax::
@@ -149,7 +149,7 @@ use the following syntax::
# If the peak shape is Lorentzian
cf.peaks.param[1]['FWHM'] = 2.0
cf.peaks.param[2]['FWHM'] = 0.01
-
+
The three peaks now have all different widths. The first peak (index 0) keeps the default value.
.. image:: /images/CrystalFieldSpectrum2.png
@@ -162,13 +162,13 @@ Alternatively, the x-values can be taken from a workspace::
# Use a list for x-values
x = [0, 1, 2, 3, ...]
sp = cf.getSpectrum(x)
-
+
# Use the first spectrum of a workspace
sp = cf.getSpectrum(ws)
-
+
# Use the i-th spectrum of a workspace
sp = cf.getSpectrum(ws, i)
-
+
Plotting in MantidPlot
----------------------
@@ -178,8 +178,8 @@ and opens a window with a plot, e.g.::
cf.plot()
-In addition to plotting, the `plot` method creates a workspace named `CrystalField_<Ion>` with the plot data. Subsequent calls to `plot`
-for the same `CrystalField` object will use the same plot window as created by the first call unless this window has been closed in the
+In addition to plotting, the `plot` method creates a workspace named `CrystalField_<Ion>` with the plot data. Subsequent calls to `plot`
+for the same `CrystalField` object will use the same plot window as created by the first call unless this window has been closed in the
mean time.
@@ -193,13 +193,13 @@ A background has two components: a peak and a general background function. Set a
Temperature=44.0, FWHM=1.1)
cf.background = Background(peak=Function('Gaussian', Height=10, Sigma=1),
background=Function('LinearBackground', A0=1.0, A1=0.01))
-
+
Here is an example of how to access the parameters of the background::
-
+
h = cf.background.peak.param['Height']
a1 = cf.background.background.param['A1']
-
-
+
+
Setting Ties and Constraints
----------------------------
@@ -207,29 +207,29 @@ Setting ties and constraints are done by calling the `ties` and `constraints` me
The `Bnn` parameters are tied by the `CrystalField` class directly specifying the tied parameter as a keyword argument::
cf.ties(B20=1.0, B40='B20/2')
-
+
The constraints are passed as strings containing expressions::
cf.constraints('1 < B22 <= 2', 'B22 < 4')
-
+
For the parameters of the background the syntax is the same but the methods are called on the `background` property::
cf.background.peak.ties(Height=10.1)
cf.background.peak.constraints('Sigma > 0')
cf.background.background.ties(A0=0.1)
cf.background.background.constraints('A1 > 0')
-
+
The names of the peak parameters both in ties and constraints must include the index of the peak to which they belong. Here we follow
the naming convention of the :ref:`func-CompositeFunction`: f<n>.<name>, where <n> stands for an integer index staring at 0 and <name>
is the name of the parameter. For example, `f1.Sigma`, `f3.FWHM`. Because names now contain the period symbol '.' keyword arguments
cannot be used. Instead we must pass a dictionary containing ties. The keys are parameter names and the values are the ties::
cf.peaks.ties({'f2.FWHM': '2*f1.FWHM', 'f3.FWHM': '2*f2.FWHM'})
-
+
Constraints are a list of strings::
cf.peaks.constraints('f0.FWHM < 2.2', 'f1.FWHM >= 0.1')
-
+
If a parameter of all peaks needs to be tied/constrained with the same expression then the following shortcut methods can be used::
cf.peaks.tieAll('Sigma=0.1', 3)
@@ -255,7 +255,7 @@ Field python interface defines the helper class `ResolutionModel` to help define
To construct an instance of `ResolutionModel` one needs to provide up to four input parameters. The first parameter, `model`, is
mandatory and can be either of:
-1. A tuple containing two arrays (lists) of real numbers which will be interpreted as tabulated values of the model function.
+1. A tuple containing two arrays (lists) of real numbers which will be interpreted as tabulated values of the model function.
The first element of the tuple is a list of increasing values for peak centres, and the second element is a list of corresponding
widths. Values between the tabulated peak positions will be linearly interpolated.
@@ -291,12 +291,12 @@ Finally, the :ref:`PyChop` interface may be used to generate the resolution func
cf = CrystalField('Ce', 'C2v', B20=0.37737, B22=3.9770, ..., Temperature=44.0, ResolutionModel=rm)
When a resolution model is set, the peak width will be constrained to have a value close to the model. The degree of deviation is controlled by the
-`FWHMVariation` parameter. It has the default of 0.1 and is the maximum difference from the value given by the resolution model a width can have.
+`FWHMVariation` parameter. It has the default of 0.1 and is the maximum difference from the value given by the resolution model a width can have.
If set to 0 the widths will be fixed to their calculated values (depending on the instant values of their peak centres). For example::
cf = CrystalField('Ce', 'C2v', B20=0.37737, B22=3.9770, ..., Temperature=44.0, ResolutionModel=rm, FWHMVariation=0.1)
-will allow the peak widths to vary between :math:`\Delta(E)-0.1` and :math:`\Delta(E)+0.1` where :math:`\Delta(E)` is the value of the
+will allow the peak widths to vary between :math:`\Delta(E)-0.1` and :math:`\Delta(E)+0.1` where :math:`\Delta(E)` is the value of the
resolution model at the peak position :math:`E`.
@@ -350,10 +350,10 @@ To calculate a spectrum call the same method `getSpectrum` but pass the spectrum
# Calculate third spectrum, use a list for x-values
x = [0, 1, 2, 3, ...]
sp = cf.getSpectrum(2, x)
-
+
# Calculate second spectrum, use the first spectrum of a workspace
sp = cf.getSpectrum(1, ws)
-
+
# Calculate first spectrum, use the i-th spectrum of a workspace
sp = cf.getSpectrum(0, ws, i)
@@ -426,7 +426,7 @@ Parameters can be set when creating the object by passing in a dictionary using
parameters={'ion0.B20': 0.37737, 'ion0.B22': 3.9770, 'ion1.B40':-0.031787,
'ion1.B42':-0.11611, 'ion1.B44':-0.12544})
-A background can also be set this way, or using `cfms.background.` It can be passed as a string, a Function object(s), or a
+A background can also be set this way, or using `cfms.background.` It can be passed as a string, a Function object(s), or a
CompositeFunction object::
cfms = CrystalFieldMultiSite(Ions='Ce', Symmetries='C2v', Temperatures=[20], FWHMs=[1.0],
@@ -526,33 +526,33 @@ Here is an example of a fit with initial estimation::
Using the point charge model
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Alternatively, the *Point Charge Model* may be used to calculate the crystal field parameters. In this case, the
+Alternatively, the *Point Charge Model* may be used to calculate the crystal field parameters. In this case, the
crystal field interaction is assumed to be purely electrostatic. At an infinite distance away from an ion, or
-analogously, at a nonzero distance from an ion of infinitesimal extend (a *point charge*), the charge in free space
-is zero, so Gauss's law becomes :math:`\nabla^2 V = 0` which is Laplace's equation. The solution of this is a
-*multipole expansion*, a sum of spherical harmonic functions:
-:math:`V(r,\theta\phi) = \sum_{l=0}^{\infty} \sum_{m=-l}^l R_l(r) Y_l^m(\theta,\phi)`. In the limit of infinite
-:math:`r`, :math:`R_l(r) = B / r^{l+1}`. The radial term is the crystal field parameters, and the angular term
-(spherical harmonics in this case) are the crystal field operators.
+analogously, at a nonzero distance from an ion of infinitesimal extend (a *point charge*), the charge in free space
+is zero, so Gauss's law becomes :math:`\nabla^2 V = 0` which is Laplace's equation. The solution of this is a
+*multipole expansion*, a sum of spherical harmonic functions:
+:math:`V(r,\theta\phi) = \sum_{l=0}^{\infty} \sum_{m=-l}^l R_l(r) Y_l^m(\theta,\phi)`. In the limit of infinite
+:math:`r`, :math:`R_l(r) = B / r^{l+1}`. The radial term is the crystal field parameters, and the angular term
+(spherical harmonics in this case) are the crystal field operators.
One should now note that the quantities noted above are generally complex. In order to have real valued parameters,
-Stevens chose to use the *tesseral harmonics* :math:`Z_l^m(\theta,\phi)` instead of the spherical harmonics for the
+Stevens chose to use the *tesseral harmonics* :math:`Z_l^m(\theta,\phi)` instead of the spherical harmonics for the
angular part. These functions are simply the hermitian combinations of spherical harmonics of the same rank :math:`l`
and opposite signed order :math:`m`. (An alternative formulation by Wybourne uses the original spherical harmonics)
In Mantid we use the Stevens convention, as common in the neutron scattering literature. The user should note that
-the convention amongst optical spectroscopists is that of Wybourne.
+the convention amongst optical spectroscopists is that of Wybourne.
-A derivation of the point charge energy can be found in many text books (e.g.
+A derivation of the point charge energy can be found in many text books (e.g.
`Morrison <http://dx.doi.org/10.1007/978-3-642-93376-9_12>`_), but will not be detailed here, where only the final
result is given:
.. math::
- B_l^m = \frac{4\pi}{2l+1} \frac{| e|^2}{4\pi\epsilon_0}
+ B_l^m = \frac{4\pi}{2l+1} \frac{| e|^2}{4\pi\epsilon_0}
\sum_i \frac{q_i}{r_i^{l+1}} a_0^l \langle r^l \rangle Z_l^m(\theta_i,\phi_i)
where :math:`q_i`, :math:`r_i`, :math:`\theta_i` and :math:`\phi_i` are the charge (in units of the elemental
-charge :math:`|e|`) and relative polar coordinates of the :math:`i^{\mathrm{th}}` point charge from the magnetic ion;
+charge :math:`|e|`) and relative polar coordinates of the :math:`i^{\mathrm{th}}` point charge from the magnetic ion;
:math:`a_0` is the Bohr radius, :math:`\langle r^l \rangle` is the :math:`l^{\mathrm{th}}` order expectation value
of the radial wavefunction of the magnetic ion and :math:`\epsilon_0` is the permitivity of free space (note this
equation is in SI units; many older texts use cgs units, but this does not matter because the value is eventually
@@ -566,7 +566,7 @@ ion has to be given. This may be done either directly, as a list of 4-element li
axial_blm = axial_pc_model.calculate()
print(axial_blm)
-which represents a simple axial crystal field with charges at :math:`\pm 4\mathrm{\AA}` away from a Nd ion in the
+which represents a simple axial crystal field with charges at :math:`\pm 4\mathrm{\AA}` away from a Nd ion in the
*z*-direction.
Alternatively, the set of ligands may be calculated from a crystal structure and a maximum distance. For example,
@@ -596,7 +596,7 @@ so you should use the ``getIons()`` method to get the actual atom labels which `
cif_pc_model = PointCharge('AMS_DATA.cif')
print(cif_pc_model.getIons())
-
+
gives::
{'O1': [0.125, 0.125, 0.375],
@@ -637,20 +637,20 @@ to calculate a spectrum or as the starting parameters in a fit::
fit.fit()
Finally, note that the calculated crystal field parameters are defined with the quantisation axis along the *z* direction
-in the Busing-Levy convention (that is, it is perpendicular to the *a*-*b* plane). This means that if the particular
-magnetic ion lies on a higher symmetry site but the highest symmetry rotation axis is not along *z* (for example, the A
-or B site in the Pyrochlore lattice, which has a 3-fold axis along [111], whilst *z* is parallel to *c*), then the
-parameters may appear to have a low symmetry (e.g. more *m* terms are nonzero). You then need to rotate the parameters
-if you want it quantised along the high symmetry direction.
+in the Busing-Levy convention (that is, it is perpendicular to the *a*-*b* plane). This means that if the particular
+magnetic ion lies on a higher symmetry site but the highest symmetry rotation axis is not along *z* (for example, the A
+or B site in the Pyrochlore lattice, which has a 3-fold axis along [111], whilst *z* is parallel to *c*), then the
+parameters may appear to have a low symmetry (e.g. more *m* terms are nonzero). You then need to rotate the parameters
+if you want it quantised along the high symmetry direction.
Calculating Physical Properties
-------------------------------
In addition to the inelastic neutron spectrum, various physical properties arising from the crystal field interaction
-can be calculated. These include the crystal field contribution to the magnetic heat capacity, the magnetic
-susceptibility, and magnetisation. The calculated values can be invoked using the `getHeatCapacity()`,
-`getSusceptibility()` and `getMagneticMoment()` methods.
+can be calculated. These include the crystal field contribution to the magnetic heat capacity, the magnetic
+susceptibility, and magnetisation. The calculated values can be invoked using the `getHeatCapacity()`,
+`getSusceptibility()` and `getMagneticMoment()` methods.
To calculate the heat capacity use::
@@ -674,11 +674,11 @@ To calculate the heat capacity use::
Cv = cf.getHeatCapacity(ws, 1) # Uses the second spectrum's x-values for T (e.g. 450<T<900)
plot(*Cv)
-All the physical properties methods returns a tuple of `(x, y)` values. The heat capacity is calculated in
+All the physical properties methods returns a tuple of `(x, y)` values. The heat capacity is calculated in
Jmol\ :sup:`-1`\ K\ :sup:`-1`\ .
The theory is described in :ref:`CrystalFieldHeatCapacity <func-CrystalFieldHeatCapacity>`.
-The molar susceptibility is calculated using Van Vleck's formula, and requires in addition knowledge of the applied
+The molar susceptibility is calculated using Van Vleck's formula, and requires in addition knowledge of the applied
field direction (default is `[0, 0, 1]` where the field is along the crystal field quantisation direction)::
chi_v = cf.getSusceptibility(T, Hdir=[1, 1, 1])
@@ -704,7 +704,7 @@ In addition, "atomic" units (:math:`\mu_B/\mathrm{T}/\mathrm{ion}`) can also be
The theory is described in the :ref:`CrystalFieldSusceptibility <func-CrystalFieldSusceptibility>` function page.
-The magnetic moment is calculated by adding a Zeeman interaction to the crystal field Hamiltonian and diagonalising
+The magnetic moment is calculated by adding a Zeeman interaction to the crystal field Hamiltonian and diagonalising
the combined matrix, from which the expectation of the magnetic moment operator is calculated. The moment can
be calculated as a function of temperature or applied field magnitude::
@@ -712,7 +712,7 @@ be calculated as a function of temperature or applied field magnitude::
H = np.linspace(0, 30, 121)
moment_h = cf.getMagneticMoment(Hmag=H, Hdir='powder', Temperature=10) # Calcs M(H) at 10K for powder sample
-By default, the magnetisation is calculated in atomic units of bohr magnetons per magnetic ion. Alternatively, the
+By default, the magnetisation is calculated in atomic units of bohr magnetons per magnetic ion. Alternatively, the
SI or cgs molar magnetic moments can be calculated::
moment_SI = cf.getMagneticMoment(H, [1, 1, 1], Unit='SI') # M(H) in Am^2/mol at 1K for H||[111]
@@ -720,12 +720,12 @@ SI or cgs molar magnetic moments can be calculated::
Please note that if cgs units are used, then the magnetic field must be specified in *Gauss* rather than *Tesla*
(1T == 10000G). Note also that the cgs unit "emu/mol" in this case is "erg/Gauss/mol" quantifying a molar magnetic
-moment.
+moment.
Finally, please note that the calculation result is the molar magnetic moment. Thus to get the magnetisation, you
-should divide this by the molar volume of the material.
-By default, the calculation temperature is 1K, and the applied magnetic field is 1T along [001]. For further details
-and a description of the theory, see the :ref:`CrystalFieldMagnetisation <func-CrystalFieldMagnetisation>` and
+should divide this by the molar volume of the material.
+By default, the calculation temperature is 1K, and the applied magnetic field is 1T along [001]. For further details
+and a description of the theory, see the :ref:`CrystalFieldMagnetisation <func-CrystalFieldMagnetisation>` and
:ref:`CrystalFieldMoment <func-CrystalFieldMoment>` pages.
Fitting Physical Properties
@@ -772,9 +772,9 @@ or separately after construction::
Unfortunately only 1D datasets can be fitted (e.g. M(H, T) cannot be fitted as a simultaneous function of field and
temperature). Also, note that setting the `PhysicalProperty` attribute after constructing the `CrystalField` object
-(e.g. running `cf.PhysicalProperty = PhysicalProperties('Cv')`) causes the number of datasets to change and will
-clear all `Ties` and `Constraints` previously set, and also reset all `FWHM` and `peaks` to the default values (zero
-for `FWHM` and `Lorentzian` for `peaks`).
+(e.g. running `cf.PhysicalProperty = PhysicalProperties('Cv')`) causes the number of datasets to change and will
+clear all `Ties` and `Constraints` previously set, and also reset all `FWHM` and `peaks` to the default values (zero
+for `FWHM` and `Lorentzian` for `peaks`).
Simultaneous Fitting of Physical Properties and Inelastic Neutron Spectra
@@ -815,9 +815,9 @@ are in the following order::
PhysicalProperties('M(T)', hmag, hdir, inverse, unit)
PhysicalProperties('M(T)', unit)
-Or these parameters may be specified using keyword arguments, with the keywords: `'Hdir'`, `'Hmag'`, `'Inverse'`,
-`'Unit'`, and `'Temperature'` (note these are case sensitive, and not all parameters apply to all types of
-physical properties). The default values (`Hdir=[0,0,1]`, `Hmag=1`, `Inverse=False`, `Unit='cgs'` and
+Or these parameters may be specified using keyword arguments, with the keywords: `'Hdir'`, `'Hmag'`, `'Inverse'`,
+`'Unit'`, and `'Temperature'` (note these are case sensitive, and not all parameters apply to all types of
+physical properties). The default values (`Hdir=[0,0,1]`, `Hmag=1`, `Inverse=False`, `Unit='cgs'` and
`Temperature=1` are used if nothing is specified for a particular attribute.
.. categories:: Interfaces Indirect
diff --git a/docs/source/interfaces/indirect/Indirect Corrections.rst b/docs/source/interfaces/indirect/Indirect Corrections.rst
index ce486298600ddc1a36e652761e72e558bac54332..14f6a052a45c64da09158c9ebcaf3a732dc6e303 100644
--- a/docs/source/interfaces/indirect/Indirect Corrections.rst
+++ b/docs/source/interfaces/indirect/Indirect Corrections.rst
@@ -40,8 +40,8 @@ Container Subtraction
The Container Subtraction Tab is used to remove the container's contribution to a run.
-Once run the corrected output and container correction is shown in the preview plot. Note
-that when this plot shows the result of a calculation the X axis is always in wavelength,
+Once run the corrected output and container correction is shown in the preview plot. Note
+that when this plot shows the result of a calculation the X axis is always in wavelength,
however when data is initially selected the X axis unit matches that of the sample workspace.
The input and container workspaces will be converted to wavelength (using
@@ -50,16 +50,16 @@ as their X unit.
.. interface:: Corrections
:widget: tabContainerSubtraction
-
+
Options
~~~~~~~
Sample
Either a reduced file (_red.nxs) or workspace (_red) or an S(Q,\omega) file (_sqw.nxs) or workspace (_sqw) that represents the sample.
-
+
Container
Either a reduced file (_red.nxs) or workspace (_red) or an S(Q,\omega) file (_sqw.nxs) or workspace (_sqw) that represents the container.
-
+
Scale Container by Factor
Allows the container's intensity to be scaled by a given scale factor before being used in the corrections calculation.
@@ -80,7 +80,7 @@ Plot Spectra
Plot Contour
If enabled, it will plot the selected output workspace as a contour plot.
-
+
Save Result
If enabled the result will be saved as a NeXus file in the default save directory.
@@ -107,8 +107,8 @@ Use Container
\omega)` file (*_sqw.nxs*) or workspace (*_sqw*).
Corrections Details
- These options will be automatically preset to the default values read from the sample workspace,
- whenever possible. They can be overridden manually.(see below)
+ These options will be automatically preset to the default values read from the sample workspace,
+ whenever possible. They can be overridden manually.(see below)
Sample Shape
Sets the shape of the sample, this affects the options for the shape details
@@ -264,7 +264,7 @@ Calculate Monte Carlo Absorption
--------------------------------
The Calculate Monte Carlo Absorption tab provides a cross platform alternative to the
-Calculate Paalman Pings tab. In this tab a Monte Carlo implementation is used to calculate the
+Calculate Paalman Pings tab. In this tab a Monte Carlo implementation is used to calculate the
absorption corrections.
.. interface:: Corrections
@@ -292,9 +292,9 @@ Interpolation
Method of interpolation used to compute unsimulated values.
Maximum Scatter Point Attempts
- Maximum number of tries made to generate a scattering point within the sample (+ optional
- container etc). Objects with holes in them, e.g. a thin annulus can cause problems if this
- number is too low. If a scattering point cannot be generated by increasing this value then
+ Maximum number of tries made to generate a scattering point within the sample (+ optional
+ container etc). Objects with holes in them, e.g. a thin annulus can cause problems if this
+ number is too low. If a scattering point cannot be generated by increasing this value then
there is most likely a problem with the sample geometry.
Beam Height
@@ -414,7 +414,7 @@ Sample Height
Apply Absorption Corrections
----------------------------
-The Apply Corrections tab applies the corrections calculated in the Calculate Paalman
+The Apply Corrections tab applies the corrections calculated in the Calculate Paalman
Pings or Calculate Monte Carlo Absorption tabs of the Indirect Data Corrections interface.
This uses the :ref:`ApplyPaalmanPingsCorrection
@@ -424,7 +424,7 @@ only the :math:`A_{s,s}` factor must be provided, when using a container the
additional factors must be provided: :math:`A_{c,sc}`, :math:`A_{s,sc}` and
:math:`A_{c,c}`.
-Once run the corrected output and container correction is shown in the preview plot. Note
+Once run the corrected output and container correction is shown in the preview plot. Note
that when this plot shows the result of a calculation the X axis is always in
wavelength, however when data is initially selected the X axis unit matches that
of the sample workspace.
diff --git a/docs/source/interfaces/indirect/Indirect Data Analysis.rst b/docs/source/interfaces/indirect/Indirect Data Analysis.rst
index 8b755647f6482a9a8b9fbb870048dc92d90e262d..531f8fc4b72344ab4d5292c82d25db676f3fa44d 100644
--- a/docs/source/interfaces/indirect/Indirect Data Analysis.rst
+++ b/docs/source/interfaces/indirect/Indirect Data Analysis.rst
@@ -16,7 +16,7 @@ Reduction interface or using :math:`S(Q, \omega)` files (*_sqw.nxs*) and
workspaces (*_sqw*) created using either the Indirect Data Reduction interface or
taken from a bespoke algorithm or auto reduction.
-Four of the available tabs are QENS fitting interfaces and share common features and
+Four of the available tabs are QENS fitting interfaces and share common features and
layout. These tabs are documented in :ref:`Indirect Fitting <QENS-fitting-ref>`.
The other two tabs in the interface perform transformations on data and are documented in :ref:`Elwin and I(Q,t) <Elwin-iqt-ref>`.
diff --git a/docs/source/interfaces/indirect/Indirect Data Reduction.rst b/docs/source/interfaces/indirect/Indirect Data Reduction.rst
index 27d0ae52097ae661e5c78b0658dbed3d7c1bd90a..0ea8b22bd2235dce559dae36c3a2ebb5e93ec888 100644
--- a/docs/source/interfaces/indirect/Indirect Data Reduction.rst
+++ b/docs/source/interfaces/indirect/Indirect Data Reduction.rst
@@ -57,14 +57,14 @@ Manage Directories
ISIS/ILL Energy Transfer
------------------------
-If the default facility has been set to ISIS, then the ISIS Energy Transfer tab will be available. However, this tab will
-be replaced by the ILL Energy Transfer tab if the default facility has been set to ILL. A further explanation of each tab
+If the default facility has been set to ISIS, then the ISIS Energy Transfer tab will be available. However, this tab will
+be replaced by the ILL Energy Transfer tab if the default facility has been set to ILL. A further explanation of each tab
can be found below.
ISIS Energy Transfer
~~~~~~~~~~~~~~~~~~~~
-This tab provides you with the functionality to convert the raw data from the experiment run into
+This tab provides you with the functionality to convert the raw data from the experiment run into
units of :math:`\Delta E`. See the algorithm :ref:`ISISIndirectEnergyTransfer <algm-ISISIndirectEnergyTransfer>`.
.. interface:: Data Reduction
@@ -98,8 +98,8 @@ Spectra Min/Spectra Max
Used to specify a range of spectra.
Detector Grouping
- Used to specify a method for grouping spectra. Possible grouping options include Individual, All,
- File, Groups and Custom. The TOSCA instrument also has the Default grouping option which will use the grouping
+ Used to specify a method for grouping spectra. Possible grouping options include Individual, All,
+ File, Groups and Custom. The TOSCA instrument also has the Default grouping option which will use the grouping
specified in the IPF.
Background Removal
@@ -107,7 +107,7 @@ Background Removal
Detailed Balance
Gives the option to perform an exponential correction on the data once it has
- been converted to Energy based on the temperature. This is automatically loaded
+ been converted to Energy based on the temperature. This is automatically loaded
from the sample logs of the input file if available.
Scale by Factor
@@ -170,7 +170,7 @@ The ISIS Energy Transfer tab operates on raw TOF data files. Before starting thi
3. Change the **Spectra Min** and **Spectra Max** if you want to avoid some of the detectors. For
the purposes of this demonstration, keep them at their default values.
-4. The **Detector Grouping** option allows you to specify how you want to group your detectors. The
+4. The **Detector Grouping** option allows you to specify how you want to group your detectors. The
different option available are explained in the :ref:`detector-grouping` section. For this
demonstration, choose **Individual**.
@@ -210,7 +210,7 @@ File
Gives the option of supplying a grouping file to be used with the
:ref:`GroupDetectors <algm-GroupDetectors>` algorithm.
-Default
+Default
This grouping option is only available for TOSCA. It uses the spectra grouping specified in the IPF.
Rebinning
@@ -267,7 +267,7 @@ would therefore be 13, 53, 54, 55 and 56.
ILL Energy Transfer
~~~~~~~~~~~~~~~~~~~
-This tab handles the reduction of data from the IN16B instrument and will appear when the default facility is set to be
+This tab handles the reduction of data from the IN16B instrument and will appear when the default facility is set to be
the ILL. See the algorithm :ref:`IndirectILLEnergyTransfer <algm-IndirectILLEnergyTransfer>`.
.. interface:: Data Reduction
@@ -458,7 +458,7 @@ The ISIS Calibration tab operates on raw TOF data files. Before starting this wo
workspaces ending in _red, _res and _calib. The calibration workspace can be used in the ISIS
Energy Transfer tab by ticking **Use Calib File**.
-5. Select the workspace ending in _calib in the output options. Enter index 0 in the neighbouring box,
+5. Select the workspace ending in _calib in the output options. Enter index 0 in the neighbouring box,
and then click the down arrow on the **Plot Spectra** button, and select **Plot Bins**. This will
plot the bin at index 0.
@@ -466,7 +466,7 @@ The ISIS Calibration tab operates on raw TOF data files. Before starting this wo
and then click the **Plot Spectra** button. This will plot the spectrum at workspace index 0.
7. Choose a default save directory and then click **Save Result** to save the workspaces ending
- in _res and _calib. The _res file is used in the :ref:`iqt-example-workflow` and
+ in _res and _calib. The _res file is used in the :ref:`iqt-example-workflow` and
:ref:`convfit-example-workflow`. The _calib file is used in the
:ref:`isis-diagnostics-example-workflow`.
@@ -710,11 +710,11 @@ S(Q, w) Options
Input
Allows you to select a reduced NeXus file (*_red.nxs*) or workspace (*_red*) as the
- input to the algorithm. An automatic contour plot of *_rqw* will be plotted in the preview
+ input to the algorithm. An automatic contour plot of *_rqw* will be plotted in the preview
plot once a file has finished loading.
Q Low, Q Width & Q High
- Q binning parameters that are passed to the :ref:`SofQW <algm-SofQW>` algorithm. The low and high
+ Q binning parameters that are passed to the :ref:`SofQW <algm-SofQW>` algorithm. The low and high
values can be determined using the neighbouring contour plot.
Rebin in Energy
diff --git a/docs/source/interfaces/indirect/Indirect Elwin & Iqt.rst b/docs/source/interfaces/indirect/Indirect Elwin & Iqt.rst
index 97606a0fafc19fdeeb5e4f6d293a52692b6378f4..ce84966445cb1c10746dd6e0a412c6326089f4c9 100644
--- a/docs/source/interfaces/indirect/Indirect Elwin & Iqt.rst
+++ b/docs/source/interfaces/indirect/Indirect Elwin & Iqt.rst
@@ -159,8 +159,8 @@ Calculate Errors
this option.
Number Of Iterations
- The number of iterations to perform in the Monte Carlo routine for error calculation
- in I(Q,t).
+ The number of iterations to perform in the Monte Carlo routine for error calculation
+ in I(Q,t).
Run
Runs the processing configured on the current tab.
@@ -211,13 +211,13 @@ and the reflection is 002.
A note on Binning
~~~~~~~~~~~~~~~~~
-
-The bin width is determined from the energy range and the sample binning factor. The number of bins is automatically
-calculated based on the **SampleBinning** specified. The width is determined from the width of the range divided
+
+The bin width is determined from the energy range and the sample binning factor. The number of bins is automatically
+calculated based on the **SampleBinning** specified. The width is determined from the width of the range divided
by the number of bins.
The following binning parameters cannot be modified by the user and are instead automatically calculated through
-the :ref:`TransformToIqt <algm-TransformToIqt>` algorithm once a valid resolution file has been loaded. The calculated
+the :ref:`TransformToIqt <algm-TransformToIqt>` algorithm once a valid resolution file has been loaded. The calculated
binning parameters are displayed alongside the binning options:
EWidth
diff --git a/docs/source/interfaces/indirect/Indirect Fitting.rst b/docs/source/interfaces/indirect/Indirect Fitting.rst
index 8c8d610e0bc92e3e09d7d37ccfe4fb626d231877..49782f0ee2c15dd1327ac26474968ed313390393 100644
--- a/docs/source/interfaces/indirect/Indirect Fitting.rst
+++ b/docs/source/interfaces/indirect/Indirect Fitting.rst
@@ -10,11 +10,11 @@ QENS Fitting
:height: 400px
:align: center
-There are four QENS fitting interfaces:
+There are four QENS fitting interfaces:
* MSD Fit
-* I(Q,t) Fit,
-* Conv Fit
+* I(Q,t) Fit,
+* Conv Fit
* F(Q)
These fitting interfaces share common features, with a few unique options in each.
@@ -40,13 +40,13 @@ plots there is a drop-down menu with which can be used to select the active data
Sequential and Simultaneous fits
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-There are options to fit your selected spectra either Sequentially or Simultaneously.
+There are options to fit your selected spectra either Sequentially or Simultaneously.
-A :ref:`sequential fit <algm-IqtFitSequential>` will fit each spectra one after another. By default this will use the end values of one fit as the starting values of the next. This behaviour can be toggled
-using the sequential/individual option.
+A :ref:`sequential fit <algm-IqtFitSequential>` will fit each spectra one after another. By default this will use the end values of one fit as the starting values of the next. This behaviour can be toggled
+using the sequential/individual option.
A :ref:`simultaneous fit <algm-IqtFitSimultaneous>` will fit all the selected spectra against one cost function. The primary advantage of this method is that
-parameters which are expected to be constant across the data range can be tied across all the spectra. This leads to these parameters being
+parameters which are expected to be constant across the data range can be tied across all the spectra. This leads to these parameters being
fitted with better statistics and hence reduced errors.
Fit Function
@@ -58,9 +58,9 @@ Fit Function
Under 'Fit Function', you can view the selected model and associated parameters as well as make modifications.
-There are two modes which can be used to select functions. The default version allows easy selection of the most commonly used function models. The options
+There are two modes which can be used to select functions. The default version allows easy selection of the most commonly used function models. The options
in this mode differ for each of the four fitting tabs so more detailed information is given in the specific sections below. The other mode, which may be switched to
-bu ticking the `See full function` box, displays the generic function browser in which any function model can be specified.
+bu ticking the `See full function` box, displays the generic function browser in which any function model can be specified.
This generic browser functions in a very similar way to the one in :ref:`Multi-dataset Fitting Interface <Multi-dataset-Fitting-Interface>`.
Parameters may be tied by right-clicking on a parameter and selecting either 'Tie > To Function' to tie the parameter
@@ -120,7 +120,7 @@ The 'Plot Guess' check-box can be used to enable/disable the guess curve in the
Spectrum Selection
~~~~~~~~~~~~~~~~~~
-In MsdFit, IqtFit and ConvFit below the fit model selection and preview plots, the spectra to be fit can be selected.
+In MsdFit, IqtFit and ConvFit below the fit model selection and preview plots, the spectra to be fit can be selected.
The 'Fit Spectra' drop-down menu provides two options ('Range' and 'String') to specificity the fit spectra. If 'Range' is selected, you are able to select a range of spectra to fit by
providing the upper and lower bounds. If 'String' is selected you can provide the spectra to fit in a text form.
When selecting spectra using text, you can use '-' to identify a range and ',' to separate each spectrum/range.
@@ -133,15 +133,15 @@ Output
The results of the fit may be plotted and saved under the 'Output' section of the fitting interfaces.
-Next to the 'Plot' label, you can select a parameter to plot and then click 'Plot' to plot it with error
-bars across the fit spectra (if multiple data-sets have been used, a separate plot will be produced for each data-set).
+Next to the 'Plot' label, you can select a parameter to plot and then click 'Plot' to plot it with error
+bars across the fit spectra (if multiple data-sets have been used, a separate plot will be produced for each data-set).
The 'Plot Output' options will be disabled after a fit if there is only one data point for the parameters.
-During a sequential fit, the parameters calculated for one spectrum are used as the initial parameters for the next spectrum to be fitted.
+During a sequential fit, the parameters calculated for one spectrum are used as the initial parameters for the next spectrum to be fitted.
Although this normally yields better parameter values for the later spectra, it can also lead to poorly fitted parameters if the
-next spectrum is not 'related' to the previous spectrum. It may be useful to replace this poorly fitted spectrum with the results
-from a single fit using the 'Edit Result' option.
-Clicking the 'Edit Result' button will allow you to modify the data within your *_Results* workspace using the results
+next spectrum is not 'related' to the previous spectrum. It may be useful to replace this poorly fitted spectrum with the results
+from a single fit using the 'Edit Result' option.
+Clicking the 'Edit Result' button will allow you to modify the data within your *_Results* workspace using the results
produced from a fit to a single spectrum. See the algorithm :ref:`IndirectReplaceFitResult <algm-IndirectReplaceFitResult>`.
Clicking the 'Save Result' button will save the result of the fit to your default save location.
@@ -156,9 +156,9 @@ as function of run number. This is done using the
:ref:`QENSFitSequential <algm-QENSFitSequential>` algorithm.
MSDFit searches for the log files named <runnumber>_sample.txt in your chosen
-raw file directory (the name ‘sample’ is for OSIRIS). These log files will exist
-if the correct temperature was loaded using SE-log-name in the Elwin tab. If they
-exist the temperature is read and the MSD is plotted versus temperature; if they do
+raw file directory (the name ‘sample’ is for OSIRIS). These log files will exist
+if the correct temperature was loaded using SE-log-name in the Elwin tab. If they
+exist the temperature is read and the MSD is plotted versus temperature; if they do
not exist the MSD is plotted versus run number (last 3 digits).
The fitted parameters for all runs are in _msd_Table and the <u2> in _msd. To
@@ -168,11 +168,11 @@ this may be of interest.
A sequential fit is run by clicking the Run button at the bottom of the tab, a
single fit can be performed using the Fit Single Spectrum button underneath the
-preview plot. A simultaneous fit may be performed in a very similar fashion by changeing the Fit Type to Simultaneous
+preview plot. A simultaneous fit may be performed in a very similar fashion by changeing the Fit Type to Simultaneous
and the clicking run.
-The :ref:`Peters model <func-MsdPeters>` [1] reduces to a :ref:`Gaussian <func-MsdGauss>` at large
-(towards infinity) beta. The :ref:`Yi Model <func-MsdYi>` [2] reduces to a :ref:`Gaussian <func-MsdGauss>` at sigma
+The :ref:`Peters model <func-MsdPeters>` [1] reduces to a :ref:`Gaussian <func-MsdGauss>` at large
+(towards infinity) beta. The :ref:`Yi Model <func-MsdYi>` [2] reduces to a :ref:`Gaussian <func-MsdGauss>` at sigma
equal to zero.
.. interface:: Data Analysis
@@ -196,7 +196,7 @@ tab as seen in the :ref:`elwin-example-workflow`.
4. Choose the **Fit Type** to be Gaussian. The parameters for this function can be seen if you
expand the row labelled **f0-MsdGauss**. Choose appropriate starting values for these parameters.
As well as being able to change the value of the parameters, Two additional options are available.
- Clicking on the button with `...` will bring up more options to set constraints and ties on the parameters. The checkbox will toggle
+ Clicking on the button with `...` will bring up more options to set constraints and ties on the parameters. The checkbox will toggle
whether the parameter is local or global. You need to click on the parameter value to see these options.
5. Tick **Plot Guess** to get a prediction of what the fit will look like.
@@ -207,7 +207,7 @@ tab as seen in the :ref:`elwin-example-workflow`.
calculated fit and the lower mini-plot displaying the difference between the input data and the
fit.
-7. Alternatively, you can click **Fit Single Spectrum** to perform a fit on just the currently displayed spectrum.
+7. Alternatively, you can click **Fit Single Spectrum** to perform a fit on just the currently displayed spectrum.
Do not click this for the purposes of this demonstration.
8. In the **Output** section, select the **Msd** parameter and then click **Plot**. This plots the
@@ -222,7 +222,7 @@ I(Q, t) Fit provides a simplified interface for controlling various fitting
functions (see the :ref:`Fit <algm-Fit>` algorithm for more info). The functions
are also available via the fit wizard.
-The fit types available for use in IqtFit are :ref:`Exponentials <func-ExpDecay>` and
+The fit types available for use in IqtFit are :ref:`Exponentials <func-ExpDecay>` and
:ref:`Stretched Exponential <func-StretchExp>`.
.. interface:: Data Analysis
@@ -236,7 +236,7 @@ I(Q, t) Fit Example Workflow
The I(Q, t) Fit tab operates on ``_iqt`` files. The files used in this workflow are produced on the
I(Q, t) tab as seen in the :ref:`iqt-example-workflow`.
-1. Click **Browse** and select the file ``irs26176_graphite002_iqt``.
+1. Click **Browse** and select the file ``irs26176_graphite002_iqt``.
2. Change the **EndX** variable to be around 0.2 in order to change the time range. Alternatively, drag
the **EndX** blue line seen on the upper mini-plot using the cursor.
@@ -256,7 +256,7 @@ I(Q, t) tab as seen in the :ref:`iqt-example-workflow`.
7. Click **Fit Single Spectrum** to produce a fit result for the first spectrum.
-8. In the **Output** section, click **Edit Result** and then select the _Result workspace containing
+8. In the **Output** section, click **Edit Result** and then select the _Result workspace containing
multiple fits (1), and in the second combobox select the _Result workspace containing the single fit
(2). Choose an output name and click **Replace Fit Result**. This will replace the corresponding fit result
in (1) with the fit result found in (2). See the :ref:`IndirectReplaceFitResult <algm-IndirectReplaceFitResult>`
@@ -280,9 +280,9 @@ A sequential fit is run by clicking the Run button at the bottom of the tab, a
single fit can be done using the Fit Single Spectrum button underneath the
preview plot.
-The fit types available in ConvFit are One :ref:`Lorentzian <func-Lorentzian>`, Two Lorentzian,
-:ref:`TeixeiraWater (SQE) <func-TeixeiraWaterSQE>`, :ref:`InelasticDiffSphere <func-InelasticDiffSphere>`,
-:ref:`InelasticDiffRotDiscreteCircle <func-InelasticDiffRotDiscreteCircle>`, :ref:`ElasticDiffSphere <func-ElasticDiffSphere>`,
+The fit types available in ConvFit are One :ref:`Lorentzian <func-Lorentzian>`, Two Lorentzian,
+:ref:`TeixeiraWater (SQE) <func-TeixeiraWaterSQE>`, :ref:`InelasticDiffSphere <func-InelasticDiffSphere>`,
+:ref:`InelasticDiffRotDiscreteCircle <func-InelasticDiffRotDiscreteCircle>`, :ref:`ElasticDiffSphere <func-ElasticDiffSphere>`,
:ref:`ElasticDiffRotDiscreteCircle <func-ElasticDiffRotDiscreteCircle>` and :ref:`StretchedExpFT <func-StretchedExpFT>`.
.. interface:: Data Analysis
@@ -329,7 +329,7 @@ and the reflection is 002.
calculated fit and the lower mini-plot displaying the difference between the input data and the
fit.
-6. Choose a default save directory and then click **Save Result** to save the _result workspaces
+6. Choose a default save directory and then click **Save Result** to save the _result workspaces
found inside of the group workspace ending with _Results. The saved workspace will be used in
the :ref:`fqfit-example-workflow`.
@@ -377,22 +377,22 @@ and *Use Delta Function* options in the interface.
- :ref:`ProductFunction <func-ProductFunction>` (InelasticDiffRotDiscreteCircle)
- - :ref:`Inelastic Diff Rot Discrete Circle <func-DiffRotDiscreteCircle>`
+ - :ref:`Inelastic Diff Rot Discrete Circle <func-DiffRotDiscreteCircle>`
- Temperature Correction
-
+
- :ref:`ProductFunction <func-ProductFunction>` (ElasticDiffSphere)
- :ref:`Elastic Diff Sphere <func-DiffSphere>`
- Temperature Correction
-
+
- :ref:`ProductFunction <func-ProductFunction>` (ElasticDiffRotDiscreteCircle)
- :ref:`Elastic Diff Rot Discrete Circle <func-DiffRotDiscreteCircle>`
- Temperature Correction
-
+
- :ref:`ProductFunction <func-ProductFunction>` (StretchedExpFT)
- :ref:`StretchedExpFT <func-StretchedExpFT>`
@@ -414,8 +414,8 @@ This interface can be used for a jump diffusion fit as well as fitting across
EISF. This is done by means of the
:ref:`QENSFitSequential <algm-QENSFitSequential>` algorithm.
-The fit types available in F(Q)Fit are :ref:`ChudleyElliot <func-ChudleyElliot>`, :ref:`HallRoss <func-Hall-Ross>`,
-:ref:`FickDiffusion <func-FickDiffusion>`, :ref:`TeixeiraWater <func-TeixeiraWater>`, :ref:`EISFDiffCylinder <func-EISFDiffCylinder>`,
+The fit types available in F(Q)Fit are :ref:`ChudleyElliot <func-ChudleyElliot>`, :ref:`HallRoss <func-Hall-Ross>`,
+:ref:`FickDiffusion <func-FickDiffusion>`, :ref:`TeixeiraWater <func-TeixeiraWater>`, :ref:`EISFDiffCylinder <func-EISFDiffCylinder>`,
:ref:`EISFDiffSphere <func-EISFDiffSphere>` and :ref:`EISFDiffSphereAlkyl <func-EISFDiffSphereAlkyl>`.
.. interface:: Data Analysis
@@ -480,14 +480,14 @@ Convergence Criteria
Acceptance Rate
The desired percentage acceptance of new parameters (see *JumpAcceptanceRate*
in :ref:`FABADA` documentation)
-
+
The FABADA minimizer can output a PDF group workspace when the PDF option is ticked. If this happens,
then it is possible to plot this PDF data using the output options at the bottom of the tabs.
**References**
1. Peters & Kneller, Journal of Chemical Physics, 139, 165102 (2013)
-2. Yi et al, J Phys Chem B 116, 5028 (2012)
+2. Yi et al, J Phys Chem B 116, 5028 (2012)
:ref:`Indirect Data Analysis <interface-indirect-data-analysis>`
diff --git a/docs/source/interfaces/indirect/Indirect Settings.rst b/docs/source/interfaces/indirect/Indirect Settings.rst
index bde665a7ceeb58611f2bab218114c2176442c3f3..a4bd879e53eb5bdf49c8583604dd16636ed2faaa 100644
--- a/docs/source/interfaces/indirect/Indirect Settings.rst
+++ b/docs/source/interfaces/indirect/Indirect Settings.rst
@@ -10,7 +10,7 @@ Overview
--------
Provides options which allow you to customise and save the behaviour of features on the
-Indirect interfaces.
+Indirect interfaces.
.. interface:: Settings
:width: 450
@@ -55,7 +55,7 @@ Restrict allowed input files by name
the restrictions on data when this option is ticked.
Plot error bars for external plots
- If ticked, this will ensure that error bars are plotted on any plots which are plotted
+ If ticked, this will ensure that error bars are plotted on any plots which are plotted
externally (i.e. in a separate window) from the indirect interfaces.
diff --git a/docs/source/interfaces/isis_sans/Beam Centre Tab.rst b/docs/source/interfaces/isis_sans/Beam Centre Tab.rst
index 9aa93b54ead5f205549b4b0cbccd7bb0266af2b5..ee5ffb0dc0eacc729da277a4acfd376c5fbb241c 100644
--- a/docs/source/interfaces/isis_sans/Beam Centre Tab.rst
+++ b/docs/source/interfaces/isis_sans/Beam Centre Tab.rst
@@ -88,10 +88,10 @@ therefore paramount.
The following procedure seems to work:
-#. Load the most recent user (mask) file (or a proto-user file for
+#. Load the most recent user (mask) file (or a proto-user file for
the new User).
-#. Load a suitable SANS pattern (eg, the scattering from a calibration
+#. Load a suitable SANS pattern (eg, the scattering from a calibration
standard).
#. 'Show Instrument' on the SANS run.
diff --git a/docs/source/interfaces/isis_sans/Settings Tab.rst b/docs/source/interfaces/isis_sans/Settings Tab.rst
index 32b5200df4ce914435e7b3c377bc83221a6d5582..a69a5f6af0e7bac100a84a4acf9c7d07d1129876 100644
--- a/docs/source/interfaces/isis_sans/Settings Tab.rst
+++ b/docs/source/interfaces/isis_sans/Settings Tab.rst
@@ -385,7 +385,7 @@ An example would be ``5-10,12:2:16,20-30``.
| **Ranges** | A set of wavelength ranges. This option |
| | only appears if a range step type is |
| | selected. |
-+---------------+------------------------------------------+
++---------------+------------------------------------------+
Cuts
""""
diff --git a/docs/source/interfaces/isis_sans/User File Format.rst b/docs/source/interfaces/isis_sans/User File Format.rst
index b4ec9d8e2ed663a47e06bc5464577a13a4293f7f..a189ac74555886fc7627087bddf8d9b92ca0bd21 100644
--- a/docs/source/interfaces/isis_sans/User File Format.rst
+++ b/docs/source/interfaces/isis_sans/User File Format.rst
@@ -80,8 +80,8 @@ Syntax
DET/MAIN
DET/HAB
- DET/RESCALE rescale
- DET/SHIFT shift
+ DET/RESCALE rescale
+ DET/SHIFT shift
DET/RESCALE/FIT [Q1 Q2]
DET/SHIFT/FIT [Q1 Q2]
@@ -196,9 +196,9 @@ Optional Qualifiers
^^^^^^^^^^^^^^^^^^^
**/TRANS/SAMPLE/...**
- Configure the settings for FIT just for the sample workspace. Ex: FIT/TRANS/SAMPLE/POLYNOMIAL3 - applies a third order polynomial to fit sample workspace for transmission.
+ Configure the settings for FIT just for the sample workspace. Ex: FIT/TRANS/SAMPLE/POLYNOMIAL3 - applies a third order polynomial to fit sample workspace for transmission.
**/TRANS/CAN/...**
- Configure the settings for FIT just for the can workspace. Ex: FIT/TRANS/SAMPLE/LIN - fit the transmission of the can using a linear function.
+ Configure the settings for FIT just for the can workspace. Ex: FIT/TRANS/SAMPLE/LIN - fit the transmission of the can using a linear function.
If SAMPLE or CAN is not provided, it is assumed that the FIT/TRANS option applies to both.
@@ -391,7 +391,7 @@ Qualifiers
**/LINE**
Masking arm only has effect for SANS2D
**/REAR**
- Specifies that the mask applies to the Rear detector (if SANS2D) and the Main detector (if LOQ). This is default if not specified
+ Specifies that the mask applies to the Rear detector (if SANS2D) and the Main detector (if LOQ). This is default if not specified
**/FRONT**
Specifies that the mask applies to the Front detector (if SANS2D) and the High-Angle Bank (if LOQ)
**/HAB**
@@ -557,7 +557,7 @@ Command Verbs
^^^^^^^^^^^^^
**CENTRE**
- Defines the coordinates of the centre of the pattern on the detector and the detector pixel sizes
+ Defines the coordinates of the centre of the pattern on the detector and the detector pixel sizes
**SCALES**
Defines the absolute intensity scaling factors to be applied to the reduced data
@@ -670,7 +670,7 @@ Syntax
.. code-block:: none
- QRESOL/ON
+ QRESOL/ON
QRESOL/OFF
QRESOL/DELTAR=dr
QRESOL/LCOLLIM="lcollim"
@@ -690,7 +690,7 @@ Qualifiers
**/OFF**
Turns the QResolution calcuation explicitly off for the reduction.
**/DELTAR**
- Specifies the virtual ring width on the detector
+ Specifies the virtual ring width on the detector
**/LCOLLIM**
Specifies the collimation length
**/MODERATOR**
diff --git a/docs/source/interfaces/isis_sans/sans_save_other.rst b/docs/source/interfaces/isis_sans/sans_save_other.rst
index b0b0bf38b77b5e1d1ea9b26ca4ce095c1b8479a2..c1da09ac697c824ab997cef069963abcdf5ed591 100644
--- a/docs/source/interfaces/isis_sans/sans_save_other.rst
+++ b/docs/source/interfaces/isis_sans/sans_save_other.rst
@@ -24,5 +24,5 @@ This uses the three algorithms:
The workspaces are saved into the directory specified using the following naming scheme:
* If a filename is input and one workspace is selected to be saved this name will be used.
-* If a filename is input and multiple workspaces are selected the filename will be appended to the workspace name.
+* If a filename is input and multiple workspaces are selected the filename will be appended to the workspace name.
* If no filename is input the workspaces will be saved out using the names they have in Mantid.
\ No newline at end of file
diff --git a/docs/source/interfaces/muon/Frequency Domain Analysis Old.rst b/docs/source/interfaces/muon/Frequency Domain Analysis Old.rst
index 5ba41663c98d8f8eb914fa31ede229c7cee116d6..0860664057f61a88831fb325b0a690701eb51d0a 100644
--- a/docs/source/interfaces/muon/Frequency Domain Analysis Old.rst
+++ b/docs/source/interfaces/muon/Frequency Domain Analysis Old.rst
@@ -18,18 +18,18 @@ accessed from the main menu of MantidPlot, in *Interfaces → Muon → Frequency
datasets, please visit `Muon - Downloads <http://www.isis.stfc.ac.uk/groups/muons/downloads/downloads4612.html>`_.
This interface is currently still in development. The data needs to be loaded and prepared using :ref:`Muon_Analysis-ref`.
-When Frequency Domain Analysis is opened it will import the groups/pairs from the current run in Muon Analysis,
+When Frequency Domain Analysis is opened it will import the groups/pairs from the current run in Muon Analysis,
**if no data has been loaded into Muon Analysis then Frequency Domain Analysis will not open**.
Analysis of the frequency spectrum can be achieved by clicking the fit function icon.
-As the interfaces is developed the features from Muon Analysis will be replicated.
+As the interfaces is developed the features from Muon Analysis will be replicated.
Transformation
---------------
.. _Transformation:
-This tab is designed for the user to transform pre-loaded data into the frequency domain. At present there are two methods available, which the user can switch between by using the drop-down menu at the top of the interface.
+This tab is designed for the user to transform pre-loaded data into the frequency domain. At present there are two methods available, which the user can switch between by using the drop-down menu at the top of the interface.
Default: Fast Fourier Transforms
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -38,31 +38,31 @@ Default: Fast Fourier Transforms
:align: center
:height: 500px
-In this mode the interface displays two tables, FFT and Advanced options. The FFT table contains
+In this mode the interface displays two tables, FFT and Advanced options. The FFT table contains
all of the information required to produce a forward FFT. The Advanced Options table contains the information
-for adding padding and apodization functions to the data.
+for adding padding and apodization functions to the data.
Selecting the workspace to be ``PhaseQuad`` will cause the :ref:`PhaseQuad <algm-PhaseQuad>` algorithm to be called first. If no phase table is available then
the interface will generate one and output the result as ``PhaseTable``. It is possible to select the direction of the axis when generating the table and it is
-possible to use a pre-existing ``PhaseTable``. **Note that the PhaseQuad option requires the data archieve to be in the search directory**.
+possible to use a pre-existing ``PhaseTable``. **Note that the PhaseQuad option requires the data archieve to be in the search directory**.
The Calculate button will execute the :ref:`Padding and Apodization <algm-PaddingAndApodization>` and then :ref:`FFT <algm-FFT>` algortihms. The output workspace will be added to
-appropriate grouped workspace.
+appropriate grouped workspace.
Maximum Entropy Method
^^^^^^^^^^^^^^^^^^^^^^
-The maximum entropy method can be used to calculate the frequency domain spectrum. This interface uses the :ref:`MuonMaxent <algm-MuonMaxent>` algorithm to calculate the frequency spectrum. The MaxEnt Property table contains
+The maximum entropy method can be used to calculate the frequency domain spectrum. This interface uses the :ref:`MuonMaxent <algm-MuonMaxent>` algorithm to calculate the frequency spectrum. The MaxEnt Property table contains
the basic quantitites used during the calculation. If the ``Use Phase Table`` checkbox is set to true, then an input phase table will be used for the initial phase values (the phase table will be called ``PhaseTable``). To generate
-an estimate phase table the ``Construct Phase Table`` option can be used and when the ``Calculate MaxEnt`` button is pressed :ref:`CalMuonDetectorPhases <algm-CalMuonDetectorPhases>` is ran first to generate the phase table. If the
+an estimate phase table the ``Construct Phase Table`` option can be used and when the ``Calculate MaxEnt`` button is pressed :ref:`CalMuonDetectorPhases <algm-CalMuonDetectorPhases>` is ran first to generate the phase table. If the
``Construct Phase Table`` option is not selected then ``PhaseTable`` must already exist. At present ``Construct Phase Table`` does not work with the ``MuonAnalysisGrouped`` workspaces. If the ``Workspace`` is set to the run number then
-their is no pre-defined grouping.
-The
+their is no pre-defined grouping.
+The
Advanced property table contains variables for users that would
like more control overt the calculation.
-For large calculations this interface can be slow, therefore the Calculate button is disabled until the current calculation is complete.
+For large calculations this interface can be slow, therefore the Calculate button is disabled until the current calculation is complete.
.. image:: ../../images/FDAG_MaxEnt.png
:align: center
@@ -73,6 +73,6 @@ Feedback & Comments
If you have any questions or comments about this interface or this help page, please
contact the `Mantid team <http://www.mantidproject.org/Contact>`__ or the
-`Muon group <http://www.isis.stfc.ac.uk/groups/muons/muons3385.html>`__.
+`Muon group <http://www.isis.stfc.ac.uk/groups/muons/muons3385.html>`__.
.. categories:: Interfaces Muon
diff --git a/docs/source/interfaces/muon/Muon ALC.rst b/docs/source/interfaces/muon/Muon ALC.rst
index 0aa327da85e93379c1c47aaba87e8c60a304dc30..0d3730618e68a1fd7e16c73e9338cc40d6792b48 100644
--- a/docs/source/interfaces/muon/Muon ALC.rst
+++ b/docs/source/interfaces/muon/Muon ALC.rst
@@ -124,15 +124,15 @@ Fitting.
Data Loading
~~~~~~~~~~~~
-In the Data Loading step, the instrument will be decided by the users default instrument
-in workbench, otherwise HIFI will be selected instead. The instrument can be manually
-changed. Once changed if there are already runs found using the previous instrument,
-the interface will automatically try to find the same runs for the new instrument.
-A sequence of runs are loaded through the **Runs** field by entering a valid expression of
-run numbers. The path is set once the entered run numbers have been found and is for
+In the Data Loading step, the instrument will be decided by the users default instrument
+in workbench, otherwise HIFI will be selected instead. The instrument can be manually
+changed. Once changed if there are already runs found using the previous instrument,
+the interface will automatically try to find the same runs for the new instrument.
+A sequence of runs are loaded through the **Runs** field by entering a valid expression of
+run numbers. The path is set once the entered run numbers have been found and is for
display purposes only i.e. it is not editable.
-The interface will attempt to locate runs by first searching any user defined directories
+The interface will attempt to locate runs by first searching any user defined directories
and then the Data archive (only useful if you’re at ISIS). You can manage your user directories
with the :ref:`manage user directories <ManageUserDirectories>` button.
@@ -143,14 +143,14 @@ Some additional options may be specified: the **Dead Time Corrections**, if any,
loaded from the input dataset itself or from a custom file specified by the user. The
detector **Grouping** is defaulted to **Auto**, in which case the grouping information
is read from the run data, although it can be customized by setting the list of spectra
-for the forward and backward groups. **Alpha** (the balance parameter) is defaulted to 1.0 and
-can only be changed when analysing single period data.The user can also choose the **Period**
+for the forward and backward groups. **Alpha** (the balance parameter) is defaulted to 1.0 and
+can only be changed when analysing single period data.The user can also choose the **Period**
number that corresponds to the red period, and the number corresponding to the green period,
if the option **Subtract** is checked, and finally the type of **Calculation** together
with the time limits. A click on the **Load** button results in the calculation of the
asymmetry, displayed on the right panel.
-Once data has been loaded, **Auto add** can be checked. This will watch for new files
+Once data has been loaded, **Auto add** can be checked. This will watch for new files
to be added to the path and try to load them automatically.
.. figure:: ../../images/MuonALCDataLoading.png
@@ -161,10 +161,10 @@ Options
^^^^^^^
Instrument
The instrument
-
+
Manage User Directories
Opens a dialog where a user can specify which directories to load from
-
+
Path
The directory data has been loaded from
@@ -179,25 +179,25 @@ Log
Take log value at
The function to apply to the time series log: Mean/Min/Max/First/Last.
-
+
Load
- Computes the asymmetry according to selected options and displays it against the
+ Computes the asymmetry according to selected options and displays it against the
chosen log value.
Dead Time Correction
- Type of dead time corrections to apply. Options are *None*, in which case no
- corrections will be applied, *From Data File*, to load corrections from
- the input dataset itself, or *From Custom File*, to load corrections from a
+ Type of dead time corrections to apply. Options are *None*, in which case no
+ corrections will be applied, *From Data File*, to load corrections from
+ the input dataset itself, or *From Custom File*, to load corrections from a
specified nexus file.
Grouping
- Detector grouping to apply. *Auto* will load the grouping information contained
- in the run file, while *Custom* allows to specify the list of spectra for both the
- forward and backward groups. *Alpha* is the balance parameter and is only available
+ Detector grouping to apply. *Auto* will load the grouping information contained
+ in the run file, while *Custom* allows to specify the list of spectra for both the
+ forward and backward groups. *Alpha* is the balance parameter and is only available
for single period data.
Periods
- Period number to use as red data. The *Subtract* option, if checked, allows to
+ Period number to use as red data. The *Subtract* option, if checked, allows to
select the green period number that will be subtracted to the red data.
Calculation
@@ -205,7 +205,7 @@ Calculation
?
Shows this help page.
-
+
Loaded Data
Graph where the asymmetry as a function of the Log value is displayed. These are the
data passed to the BaselineModelling step.
@@ -214,7 +214,7 @@ Baseline Modelling
~~~~~~~~~~~~~~~~~~
In the Baseline Modelling step, the user can fit a baseline by selecting which
-sections of the data should be used in the fit, and what the baseline fit
+sections of the data should be used in the fit, and what the baseline fit
function should be. To select a baseline function, right-click on the **Function**
region, then **Add function** and choose among the different possibilities. Then
pick the desired fitting sections by right-clicking in the **Sections** area as
@@ -233,7 +233,7 @@ Function
Right-click on the blank area to add a baseline function.
Sections
- Right-click on the blank area to add as many sections as needed to
+ Right-click on the blank area to add as many sections as needed to
select the different ranges to fit. Each section is coloured differently and
can be modified by dragging the vertical lines.
@@ -251,12 +251,12 @@ Corrected data
Graph where the corrected data, i.e., the original data with the baseline
subtracted, are displayed. These are the data passed to the PeakFitting
step.
-
+
Peak Fitting
~~~~~~~~~~~~
-In the Peak Fitting step, the data with the baseline subtracted are shown in
-the right panel. The user can study the peaks of interest all with the same simple
+In the Peak Fitting step, the data with the baseline subtracted are shown in
+the right panel. The user can study the peaks of interest all with the same simple
interface. To add a new peak, right-click on the **Peaks** region, then select
**Add function** and choose among the different possibilities in the category Peak.
Add as many peaks as needed. To activate the peak picker tool, click on one of
@@ -296,6 +296,6 @@ Feedback & Comments
-------------------
If you have any questions or comments about this interface or this help page, please
-contact the `Mantid team <http://www.mantidproject.org/Contact>`__ or the `Muon group <http://www.isis.stfc.ac.uk/groups/muons/muons3385.html>`__.
+contact the `Mantid team <http://www.mantidproject.org/Contact>`__ or the `Muon group <http://www.isis.stfc.ac.uk/groups/muons/muons3385.html>`__.
.. categories:: Interfaces Muon
diff --git a/docs/source/interfaces/muon/Muon Analysis 2.rst b/docs/source/interfaces/muon/Muon Analysis 2.rst
index cbf7d32e12bbaca17f716618be4928d70083bd20..fb877d6feb8b27eb7bc96b6e6c8a611ed5a5a76a 100644
--- a/docs/source/interfaces/muon/Muon Analysis 2.rst
+++ b/docs/source/interfaces/muon/Muon Analysis 2.rst
@@ -25,7 +25,7 @@ The loading section is used to load data as well as to specify what the current
**Load Current Run** This will load the latest run for the selected instrument. You must be connected to the
data archive. It also currently only works on windows.
-**Run selection box** This takes a comma seperated list of run numbers for the GUI to load. A range
+**Run selection box** This takes a comma seperated list of run numbers for the GUI to load. A range
be specified with a dash. For example ``62260, 62270-3`` will load ``62260, 62270, 62271, 62273``. This specifies
the runs that are used in the rest of the GUI.
@@ -33,7 +33,7 @@ the runs that are used in the rest of the GUI.
**Clear All** This clears all the data from the current GUI.
-**Co-Add** If selected the runs are added together for improved statistics.
+**Co-Add** If selected the runs are added together for improved statistics.
Tabs
----
diff --git a/docs/source/interfaces/muon/Muon Analysis Developers Guide.rst b/docs/source/interfaces/muon/Muon Analysis Developers Guide.rst
index e2a4598e5317b1fafd51035c6fa7111a87d0eeb3..a9449828f734d21afeb7efaf17faafaeccd4d9ae 100644
--- a/docs/source/interfaces/muon/Muon Analysis Developers Guide.rst
+++ b/docs/source/interfaces/muon/Muon Analysis Developers Guide.rst
@@ -1,11 +1,11 @@
.. _Muon_Analysis_DevelopersGuide-ref:
-Muon Analysis: a guide for Mantid developers
+Muon Analysis: a guide for Mantid developers
============================================
.. contents:: Table of Contents
:local:
-
+
Introduction
^^^^^^^^^^^^
This document is intended for Mantid developers as a guide to the architecture of the Muon Analysis custom interface.
@@ -27,7 +27,7 @@ In a typical muon spin resonance experiment, the muon spins precess in a magneti
Data is loaded into the interface, corrected for dead time, and the detectors grouped into groups.
For example, MuSR (64 detectors) uses two groups, *fwd* (forward, detectors 33-64) and *bwd* (backward, detectors 1-32) in its longitudinal field configuration, corresponding to the two detector rings.
-(MuSR is special in that the main field direction can be rotated either longitudinal or transverse).
+(MuSR is special in that the main field direction can be rotated either longitudinal or transverse).
In this case scientists will usually look at a "group pair" called *long*, defined as *fwd - bwd*.
The grouping used is taken from the IDF by default, or from the data file if not present.
@@ -48,7 +48,7 @@ Groups and Periods
Groups are explained above, as sets of detectors corresponding to physical arrangements.
For example, the MuSR instrument has two rings of detectors, leading to two detector groups in the longitudinal field arrangement.
-*Periods* refers to collecting data in several periods of time - for example you might have two periods "RF on" and "RF off" or "laser on" and "laser off".
+*Periods* refers to collecting data in several periods of time - for example you might have two periods "RF on" and "RF off" or "laser on" and "laser off".
The interface allows users to analyse one period at a time, or a sum/difference (such as "1+2", "1-2" or even "1+2-3+4").
.. warning:: Note that for summed periods (1+2), you sum the periods 1 and 2 first, then calculate the asymmetry of the sum. For subtracted periods (1-2), you calculate the asymmetry of each period separately, then subtract the asymmetry of period 2 from that of period 1. So for 1+2-3+4, you sum 1+2 and 3+4, calculate asymmetry of each sum, then subtract the asymmetry of (3+4) from that of (1+2).
@@ -98,7 +98,7 @@ It is fully tested, in addition to the tests that the algorithms themselves have
The grouping is stored in a ``Mantid::API::Grouping`` struct. The user can specify their own grouping on the "Grouping Options" tab, and a ``MuonGroupingHelper`` object is used to deal with this. (This is not tested as it is too coupled to the GUI - needs refactoring).
-Load current run
+Load current run
################
**ISIS only**
@@ -106,7 +106,7 @@ Load current run
Scientists at ISIS often use the "load current run" feature - a button on the front tab that will load the most recent data file from the selected instrument. The button is not enabled at other facilities, where this feature is not available.
The location of the current run is kept in ``\\<instrument>\data\autosave.run``, a file that points to another file in the same directory where the data is.
-For example, ``\\MUSR\data\autosave.run`` might contain the file name ``auto_B.tmp``, meaning that the current data is in ``\\MUSR\data\auto_B.tmp``.
+For example, ``\\MUSR\data\autosave.run`` might contain the file name ``auto_B.tmp``, meaning that the current data is in ``\\MUSR\data\auto_B.tmp``.
After loading the current run, the left/right buttons are used to cycle through recent datasets.
@@ -125,7 +125,7 @@ As noted above, data loading/processing is handled with ``MuonAnalysisDataLoader
``MuonAnalysisHelper`` is also where the generation and parsing of workspace names is done.
In the Muon Analysis interface, these follow a strict format delimited by semicolons:
-
+
``INST00012345; Pair; long; Asym;[ 1;] #1``
1. Run label, made up of instrument and run number.
@@ -193,7 +193,7 @@ Of course, it's not *properly* MVP, as that would have required a rewrite - the
It inherits from two new abstract base classes (i.e. implements two interfaces), so that it can be mocked when testing the two presenters.
- **Views:**
+ **Views:**
- Fit function: ``FunctionBrowser`` - the same one used in the general multi-fitting interface. It is reused here, with the only change being to restrict the range of functions shown to only those that are of interest to muon scientists.
@@ -217,7 +217,7 @@ Fit function
The actual function that is going to be fitted to the data is stored in the ``MuonFitPropertyBrowser`` (model) and, after the fit, this function will have the correct parameter values.
-It is therefore the job of the presenter to
+It is therefore the job of the presenter to
- Update the model's function when the user changes the function in the view
- Update the view's displayed function parameters when the fit has finished.
@@ -251,7 +251,7 @@ Sequence of events when "Fit" clicked
The "Fit" button is part of the *MuonFitPropertyBrowser*, i.e. the model. This doesn't fit with the MVP pattern but is this way for historical reasons, as the button was always part of this widget.
-When the user clicks "Fit", the model emits a signal ``preFitChecksRequested``. This is caught by the data presenter, which performs some checks that the data is valid before the fit starts. Extra checks could be easily added at this point.
+When the user clicks "Fit", the model emits a signal ``preFitChecksRequested``. This is caught by the data presenter, which performs some checks that the data is valid before the fit starts. Extra checks could be easily added at this point.
If everything is OK, the data presenter tells the model to continue, and the model emits ``functionUpdateAndFitRequested``.
This signal is caught by the function presenter, which updates the fit function in the model from that in the view, to ensure they are in sync before the fit. It then tells the model to start the fit.
@@ -283,7 +283,7 @@ This is done by the ``PeakPickerTool`` from MantidPlot, not by anything within M
(The ``PeakPickerTool`` is set to the plot when the Data Analysis tab is selected - see box below.)
-The ``PeakPickerTool`` can recognise muon data by noticing that the fit property browser is a ``MuonFitPropertyBrowser``.
+The ``PeakPickerTool`` can recognise muon data by noticing that the fit property browser is a ``MuonFitPropertyBrowser``.
In this case it doesn't remove previous fit curves like it would for other graphs, because this is handled by Muon Analysis instead - we have the option there to keep *n* previous fits as selected by the user...
If it notes that the fit was a *simultaneous* fit of muon data, then **nothing is plotted**.
@@ -295,7 +295,7 @@ What users can currently do to plot the results of a simultaneous or sequential
Probably it would be best to make this automatic when a multiple fit ends, or provide a "Plot" button in Muon Analysis - this would most likely require exposing the relevant tiled plot functionality to Python first.
.. topic:: Changing tabs in Muon Analysis
-
+
Changing tabs is handled by the ``changeTab`` method in ``MuonAnalysis.cpp``.
When entering the *Data Analysis* tab:
diff --git a/docs/source/interfaces/muon/muon_fitting_tab.rst b/docs/source/interfaces/muon/muon_fitting_tab.rst
index 36f5216d32c6aeb6392b0eb5d50ca3da718667af..bfbfb4ac8b130418194dfd0145b3a5fa74ba0f34 100644
--- a/docs/source/interfaces/muon/muon_fitting_tab.rst
+++ b/docs/source/interfaces/muon/muon_fitting_tab.rst
@@ -11,8 +11,8 @@ This tab is used to evaluate a single fit object, which corresponds to a list of
**Fit** Executes the specified fit.
-**Simultaneous Fit** This option will perform a fit for multiple data sets, which may share parameters.
-The simultaneous fit can be performed over a selected run, or selected group/pair.
+**Simultaneous Fit** This option will perform a fit for multiple data sets, which may share parameters.
+The simultaneous fit can be performed over a selected run, or selected group/pair.
**Select Workspace** This drop-down list can be used select the workspace to perform a single fit over.
diff --git a/docs/source/interfaces/muon/muon_home_tab.rst b/docs/source/interfaces/muon/muon_home_tab.rst
index 7383a506f400bd993cfd1f91a144867af8dd30da..97264e739a3ab70ec728246f44cedb18c110f3b5 100644
--- a/docs/source/interfaces/muon/muon_home_tab.rst
+++ b/docs/source/interfaces/muon/muon_home_tab.rst
@@ -29,11 +29,11 @@ The specified first good data is used for all calculations.
**Double Pulse** This controls whether todo a double pulse fit and if so what time offset to use. If checked then :ref:`DoublePulseFit <algm-DoublePulseFit>` is run instead of :ref:`Fit <algm-Fit>`, when pressing the `fit` button. The `PulseOffset` parameter is the value entered here. The pulse weightings are set as
-.. math::
+.. math::
N_1 = \frac{x}{1+x} \quad and \quad N_2 = \frac{1}{1+x},
where :math:`x = \exp(\frac{-t_s}{\tau})`, :math:`t_s` is the time offset, :math:`\tau` is the posotive muon half life, :math:`N_1` is the first pulse weighting and :math:`N_2` is the second pulse weighting.
-
+
Rebin
^^^^^
diff --git a/docs/source/interfaces/muon/muon_phase_table_tab.rst b/docs/source/interfaces/muon/muon_phase_table_tab.rst
index 5ab35a9c36170dad3a7c2bb471f178abdea1465f..2b62e93b5783f75786799c9dcbe62d694d3f34a1 100644
--- a/docs/source/interfaces/muon/muon_phase_table_tab.rst
+++ b/docs/source/interfaces/muon/muon_phase_table_tab.rst
@@ -29,7 +29,7 @@ Phase Quad Calculator
The phase quad calcuator use the :ref:`PhaseQuad <algm-PhaseQuad>` algorithm combine the signals from multiple detectors
into a quadrature phase signal.
-It will calculate the phasequad for all of the loaded runs using the selected phase table. If you are using co-added runs,
+It will calculate the phasequad for all of the loaded runs using the selected phase table. If you are using co-added runs,
the deadtime table is only taken from the first run during calculation.
When the runs are changed all of the phasequads are removed.
diff --git a/docs/source/interfaces/muon/muon_plotting_window.rst b/docs/source/interfaces/muon/muon_plotting_window.rst
index 183d007995e639ed0bc0886aaff6e2f89485b7ad..684a44440015401540204d3dc26b85df410ebc43 100644
--- a/docs/source/interfaces/muon/muon_plotting_window.rst
+++ b/docs/source/interfaces/muon/muon_plotting_window.rst
@@ -8,7 +8,7 @@ Plotting Window
:width: 350px
-The plotting window displays the data specified by the tabs within the interface. This data can be displayed as a single plot,
+The plotting window displays the data specified by the tabs within the interface. This data can be displayed as a single plot,
or as tiled plots, where each tile corresponds to either a Group/pair or a run.
By default this plot window is docked to the right-hand side of the main interface window, but can be undocked by
double-clicking on the title bar of the window.
@@ -20,15 +20,15 @@ The workspaces plotted in the figure depends on the tab which is currently being
- If the user is on the fitting tab, the workspace displayed in the workspace selection box is plotted.
- If the user is on the sequential the plotted workspace is controlled through the table present in this tab.
-Plotting Controls
+Plotting Controls
^^^^^^^^^^^^^^^^^
The plotting can be controlled through serveral options:
-**Plot type** Changes the plot type (e.g from asymmetry to counts).
+**Plot type** Changes the plot type (e.g from asymmetry to counts).
**Tiled plotting** The 'tile plots by' checkbox enables tiled plotting, which can be performed over runs or Groups/pairs.
-**Plot raw** Plot raw controls whether the raw or rebinned workspaces are plotted.
+**Plot raw** Plot raw controls whether the raw or rebinned workspaces are plotted.
.. image:: ../../images/muon_plotting_window_tiled.png
:width: 350px
@@ -39,15 +39,15 @@ Plotting Options
.. image:: ../../images/muon_plotting_window_options.png
:height: 40px
-**Subplot Selector** Which axis to change the options for.
+**Subplot Selector** Which axis to change the options for.
**x-Range** Sets the x-limits for the selected axes.
-**Autoscale** Autoscales the y-axis based on the x-limits.
+**Autoscale** Autoscales the y-axis based on the x-limits.
**y-Range** Sets the y-limits for the selected axes.
-**Errors** Whether to display errors for the workspaces plotted on the selected axes.
+**Errors** Whether to display errors for the workspaces plotted on the selected axes.
:ref:`Muon Analysis <MuonAnalysis_2-ref>`
diff --git a/docs/source/interfaces/muon/muon_sequential_fitting_tab.rst b/docs/source/interfaces/muon/muon_sequential_fitting_tab.rst
index 94147c01e90c4373ea34e739006d6918de84c7de..65be6bbdbc3073fbfa7225c4561dd79d2a1a943a 100644
--- a/docs/source/interfaces/muon/muon_sequential_fitting_tab.rst
+++ b/docs/source/interfaces/muon/muon_sequential_fitting_tab.rst
@@ -19,13 +19,13 @@ Sequential fitting options
**Plot fit results** Determines whether the results of the fit will be added to the plot window.
-**Parameters for previous fit** Uses the parameters from the previous fit calculation as initial values for the next fit.
+**Parameters for previous fit** Uses the parameters from the previous fit calculation as initial values for the next fit.
**Initial parameters for each fit** Uses the initial values (as specified in the Fit Table) in each fit calculation.
Fit Table
^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Each entry of the Fit Table corresponds to a fit object, which comprises a list of input workspaces and a fit function.
+Each entry of the Fit Table corresponds to a fit object, which comprises a list of input workspaces and a fit function.
**Run** The runs present in the fit object.
@@ -34,7 +34,7 @@ Each entry of the Fit Table corresponds to a fit object, which comprises a list
**Fit quality** The quality of the fit returned from the fitting algorithm.
**List of fit parameters** The columns that proceed this correspond to the values of the fit parameters. The value of these
-parameters can be edited.
+parameters can be edited.
Used By
diff --git a/docs/source/interfaces/reflectometry/ISIS Reflectometry.rst b/docs/source/interfaces/reflectometry/ISIS Reflectometry.rst
index b7654e0e75dcd4e3fc95079c83f70271f729bb92..591a8276149aa1212acdb942c2197893bfbd3ee5 100644
--- a/docs/source/interfaces/reflectometry/ISIS Reflectometry.rst
+++ b/docs/source/interfaces/reflectometry/ISIS Reflectometry.rst
@@ -123,7 +123,7 @@ tab, and tick the ``Debug`` option. Then re-process the group.
:alt: Editing experiment settings
*Editing experiment settings*
-
+
Viewing Results
~~~~~~~~~~~~~~~
@@ -168,7 +168,7 @@ plots the stitched output for the selected group(s)
*Plotting the results of the reduction*
-
+
Layout
------
@@ -831,7 +831,7 @@ and separate spectra, if required, can be specified for the transmission runs -
if the latter are not specified then the ``Run Spectra`` will also be used for
the transmission runs. If both a First and Second tranmission input is
specified, then they will be stitched using the options specified.
-
+
.. figure:: /images/ISISReflectometryInterface/transmission_runs.png
:class: screenshot
:width: 600px
diff --git a/docs/source/interfaces/utility/Filter Events.rst b/docs/source/interfaces/utility/Filter Events.rst
index bba786b56f497197ea4e04d527789684dcd5dcaf..cb1f672c6366c425aafb8bd21a6393073d9124ee 100644
--- a/docs/source/interfaces/utility/Filter Events.rst
+++ b/docs/source/interfaces/utility/Filter Events.rst
@@ -6,23 +6,23 @@ Filter Events Interface
.. contents:: Table of Contents
:local:
-
+
Description
-----------
-
-The Filter Events interface provides aid to users in order to set up event filter with different
-:ref:`functionalities-GenerateEventFilter-ref`. This interface utilises the algorithm
+
+The Filter Events interface provides aid to users in order to set up event filter with different
+:ref:`functionalities-GenerateEventFilter-ref`. This interface utilises the algorithm
:ref:`GenerateEventsFilter <algm-GenerateEventsFilter>` which is able to generate event splitters
-according to user’s requirement for filtering events.
-The generated time splitters are stored either in a SplittersWorkspace or a
-:ref:`MatrixWorkspace <MatrixWorkspace>`. Both of them will be used by algorithm
-:ref:`FilterEvents <algm-FilterEvents>` which filters the events from a EventWorkspace to one or
+according to user’s requirement for filtering events.
+The generated time splitters are stored either in a SplittersWorkspace or a
+:ref:`MatrixWorkspace <MatrixWorkspace>`. Both of them will be used by algorithm
+:ref:`FilterEvents <algm-FilterEvents>` which filters the events from a EventWorkspace to one or
multiple EventWorkspaces according to an input :ref:`SplittersWorkspace`
-containing a series of splitters.
+containing a series of splitters.
-On the bottom section the user has an option of :ref:`filterbylogv-GenerateEventFilter-ref`
-or :ref:`filterbytime-GenerateEventFilter-ref`. User also has an option of filtering events using
-:ref:`advsetup-FilterEventUI-ref`.
+On the bottom section the user has an option of :ref:`filterbylogv-GenerateEventFilter-ref`
+or :ref:`filterbytime-GenerateEventFilter-ref`. User also has an option of filtering events using
+:ref:`advsetup-FilterEventUI-ref`.
Layout
@@ -36,51 +36,51 @@ Layout
Data Loading
------------
-For the data loading step, MantidPlot provides an interface in which the user shall select the
-appropriate file via *Browse* button or by entering an integer as a valid run number in the
-*File/Run* field, if the instrument name is set up in Mantid. The user must provide a file,
-which contains valid sample logs
-for splitting and :ref:`EventWorkspace <EventWorkspace>`. The data will be loaded once the user
-has clicked upon the *Load* button.
-With the help of *drop-down* list, user is be able to load more than one file and then click
+For the data loading step, MantidPlot provides an interface in which the user shall select the
+appropriate file via *Browse* button or by entering an integer as a valid run number in the
+*File/Run* field, if the instrument name is set up in Mantid. The user must provide a file,
+which contains valid sample logs
+for splitting and :ref:`EventWorkspace <EventWorkspace>`. The data will be loaded once the user
+has clicked upon the *Load* button.
+With the help of *drop-down* list, user is be able to load more than one file and then click
on the *Use* button which will load the selected
-file. If the file cannot be found in the *drop-down* list then user can click `Refresh` button
-which should update
+file. If the file cannot be found in the *drop-down* list then user can click `Refresh` button
+which should update
the *drop-down* list and enable user to select any browsed file.
Plotting
--------
-Once the file has been selected then the Interface would automatically generate the plot using
-the provided file. If the user wish to plot another file then that could be achieved by selecting
-another file from *drop-down* list and clicking on the *Use* button, which will automatically
-plot the new graph generated from the selected file.
+Once the file has been selected then the Interface would automatically generate the plot using
+the provided file. If the user wish to plot another file then that could be achieved by selecting
+another file from *drop-down* list and clicking on the *Use* button, which will automatically
+plot the new graph generated from the selected file.
Output & Storing Event Splitters
--------------------------------
-The output will be one or multiple workspaces according to the number of index in splitters. The
-output workspace name is the combination of parameter OutputWorkspaceBaseName and the index in
-splitter. The *Splitter Title* field is used as title of output splitters workspace and information
-workspace. An event splitter used in Mantid contains start time, stop time and target workspace. Any
-data structure that has the above 3 properties can serve as an event splitter. There are two types of
-output workspaces for storing event splitters that are supported by
+The output will be one or multiple workspaces according to the number of index in splitters. The
+output workspace name is the combination of parameter OutputWorkspaceBaseName and the index in
+splitter. The *Splitter Title* field is used as title of output splitters workspace and information
+workspace. An event splitter used in Mantid contains start time, stop time and target workspace. Any
+data structure that has the above 3 properties can serve as an event splitter. There are two types of
+output workspaces for storing event splitters that are supported by
:ref:`GenerateEventsFilter <algm-GenerateEventsFilter>` algorithm.
- :ref:`SplittersWorkspace`: It is a
- :ref:`TableWorkspace <Table Workspaces>` that has 3 columns for start time,
- stop time and target workspace for events within start time and stop time. This type of workspace is
+ :ref:`TableWorkspace <Table Workspaces>` that has 3 columns for start time,
+ stop time and target workspace for events within start time and stop time. This type of workspace is
appropriate for the case that the amount of generated event splitters are not huge.
-- :ref:`MatrixWorkspace <MatrixWorkspace>`: It uses X-axis to store time stamp in total nanoseconds
- and Y-axis to store target workspace. For example, :math:`[x_i, x_i+1]` and :math:`[y_i]` construct
- an event filter as start time is :math:`[x_i]`, stop time is :math:`[x_i+1]`, and target workspace
- is :math:`[y_i-th]` workspace. If :math:`[y_i]`, is less than 0, then it means
- that all events between time :math:`[x_i]` and :math:`[x_i+1]` will be discarded. This type of
- workspace is appropriate for the case that the amount of generated event splitters are huge, because
- processing a :ref:`MatrixWorkspace <MatrixWorkspace>` is way faster than a
+- :ref:`MatrixWorkspace <MatrixWorkspace>`: It uses X-axis to store time stamp in total nanoseconds
+ and Y-axis to store target workspace. For example, :math:`[x_i, x_i+1]` and :math:`[y_i]` construct
+ an event filter as start time is :math:`[x_i]`, stop time is :math:`[x_i+1]`, and target workspace
+ is :math:`[y_i-th]` workspace. If :math:`[y_i]`, is less than 0, then it means
+ that all events between time :math:`[x_i]` and :math:`[x_i+1]` will be discarded. This type of
+ workspace is appropriate for the case that the amount of generated event splitters are huge, because
+ processing a :ref:`MatrixWorkspace <MatrixWorkspace>` is way faster than a
:ref:`TableWorkspace <Table Workspaces>` in Mantid.
.. _advsetup-FilterEventUI-ref:
@@ -88,7 +88,7 @@ output workspaces for storing event splitters that are supported by
Advanced Setup
--------------
-The **Advanced Setup** section on the bottom of the interface provides access to the following
+The **Advanced Setup** section on the bottom of the interface provides access to the following
functionality:
+------------------+----------------------------------------------------------+
@@ -101,8 +101,8 @@ functionality:
| | workspace. |
+------------------+----------------------------------------------------------+
| Generate Filter | Use multiple cores to generate events filter by log |
-| In Parallel | values. Default as Serial which uses a single core and |
-| | Parallel uses multiple cores. |
+| In Parallel | values. Default as Serial which uses a single core and |
+| | Parallel uses multiple cores. |
+------------------+----------------------------------------------------------+
| Spectrum without | Approach to deal with spectrum without detectors. |
| Detector | |
diff --git a/docs/source/interfaces/utility/TOF Converter.rst b/docs/source/interfaces/utility/TOF Converter.rst
index 912b9ce4cb2fdbacc1c167ea380508e267151b0f..1c82caad67152ebc22e0a7daa48b82c047444aa7 100644
--- a/docs/source/interfaces/utility/TOF Converter.rst
+++ b/docs/source/interfaces/utility/TOF Converter.rst
@@ -10,7 +10,7 @@ ToF converter takes multiple inputs depending on the units you wish to convert b
Input
-----
-ToF Converter will take an Input value i.e the value you wish to convert.
+ToF Converter will take an Input value i.e the value you wish to convert.
If you wish to convert Momentum Transfer or d-spacing then a Scattering angle :math:`\theta` will need to be specified.
If you wish to convert Time of Flight then you will need to specify a Total Flight path in meters.
@@ -23,13 +23,13 @@ Available Conversion Units
Some of the units available are those registered with see: :ref:`Units <Unit Factory>`.
The units that are not specified in :ref:`Units <Unit Factory>` but are used in ToFConverter
-are:
+are:
Nu (:math:`\nu`): :math:`\frac{h}{m_{N}\lambda^2}`
Velocity: :math:`\frac{h}{m_{N}\lambda}` and
-Temperature: :math:`\frac{m_{N} v_{p}^2}{2k_{b}}`.
+Temperature: :math:`\frac{m_{N} v_{p}^2}{2k_{b}}`.
.. categories:: Interfaces
diff --git a/docs/source/plotting/1DPlotsHelp.rst b/docs/source/plotting/1DPlotsHelp.rst
index a722fae61aaf2a96d082b733257989cc3d84e6a9..f42cab958795fd4de3515be7541e2362d6d2b906 100644
--- a/docs/source/plotting/1DPlotsHelp.rst
+++ b/docs/source/plotting/1DPlotsHelp.rst
@@ -46,7 +46,7 @@ Click Menus
-----------
.. figure:: /images/PlotClickMenus1D.png
- :alt: Click Menus 1D
+ :alt: Click Menus 1D
:align: center
:width: 1500px
@@ -61,7 +61,7 @@ Click Menus
:align: center
-| **TIP**: Change a Legend entry by editing `Set curve label` on the Curves tab.
+| **TIP**: Change a Legend entry by editing `Set curve label` on the Curves tab.
Then on the Legend tab there are Color and Font options.
|
|
@@ -115,7 +115,7 @@ Click the generate a script button |GenerateAScript.png| on a 1D Plot:
axes.set_title('MAR11060')
axes.set_xlabel('Time-of-flight ($\mu s$)')
axes.set_ylabel('Counts ($\mu s$)$^{-1}$')
- axes.legend() #.set_draggable(True) # uncomment to set the legend draggable
+ axes.legend() #.set_draggable(True) # uncomment to set the legend draggable
plt.show()
@@ -124,7 +124,7 @@ For more advice: :ref:`02_scripting_plots`
|
|
-Tiled Plots
+Tiled Plots
===========
|
@@ -166,7 +166,7 @@ Tiled plots are essentially an array of axes (1D plots) on the same figure. As s
:alt: Plot Options Axes Legend Tiled plots
:align: center
-| **TIP**: Change a Legend entry by editing `Set curve label` on the Curves tab.
+| **TIP**: Change a Legend entry by editing `Set curve label` on the Curves tab.
Then on the Legend tab there are Color and Font options.
|
|
@@ -229,22 +229,22 @@ Click the generate a script button |GenerateAScript.png| on a Tiled Plot:
axes[0][0].plot(MAR11060, color='#1f77b4', label='MAR11060: spec 1', specNum=1)
axes[0][0].set_xlabel('Time-of-flight ($\mu s$)')
axes[0][0].set_ylabel('Counts ($\mu s$)$^{-1}$')
- axes[0][0].legend() #.set_draggable(True) # uncomment to set the legend draggable
+ axes[0][0].legend() #.set_draggable(True) # uncomment to set the legend draggable
axes[0][1].plot(MAR11060, color='#1f77b4', label='MAR11060: spec 2', specNum=2)
axes[0][1].set_xlabel('Time-of-flight ($\mu s$)')
axes[0][1].set_ylabel('Counts ($\mu s$)$^{-1}$')
- axes[0][1].legend() #.set_draggable(True) # uncomment to set the legend draggable
+ axes[0][1].legend() #.set_draggable(True) # uncomment to set the legend draggable
axes[1][0].plot(MAR11060, color='#1f77b4', label='MAR11060: spec 3', specNum=3)
axes[1][0].set_xlabel('Time-of-flight ($\mu s$)')
axes[1][0].set_ylabel('Counts ($\mu s$)$^{-1}$')
- axes[1][0].legend() #.set_draggable(True) # uncomment to set the legend draggable
+ axes[1][0].legend() #.set_draggable(True) # uncomment to set the legend draggable
axes[1][1].plot(MAR11060, color='#1f77b4', label='MAR11060: spec 4', specNum=4)
axes[1][1].set_xlabel('Time-of-flight ($\mu s$)')
axes[1][1].set_ylabel('Counts ($\mu s$)$^{-1}$')
- axes[1][1].legend() #.set_draggable(True) # uncomment to set the legend draggable
+ axes[1][1].legend() #.set_draggable(True) # uncomment to set the legend draggable
plt.show()
@@ -293,5 +293,5 @@ File > Settings
.. |FigureOptionsGear.png| image:: /images/FigureOptionsGear.png
:width: 150px
-.. |GenerateAScript.png| image:: /images/GenerateAScript.png
+.. |GenerateAScript.png| image:: /images/GenerateAScript.png
:width: 30px
diff --git a/docs/source/plotting/3DPlotsHelp.rst b/docs/source/plotting/3DPlotsHelp.rst
index 789e73bcdff9eca538ead7a831c29b2cb458feb5..7e97b9c54b7a76c18e6c6c6c9c0c417cf95a984d 100644
--- a/docs/source/plotting/3DPlotsHelp.rst
+++ b/docs/source/plotting/3DPlotsHelp.rst
@@ -89,7 +89,7 @@ For more advice: :ref:`02_scripting_plots`
|
|
-Wireframe Plots
+Wireframe Plots
===============
|
@@ -146,7 +146,7 @@ Basic example of plotting a `Wireframe <https://matplotlib.org/mpl_toolkits/mplo
import matplotlib.pyplot as plt
data = Load('MAR11060.nxs')
-
+
fig, ax = plt.subplots(subplot_kw={'projection':'mantid3d'})
ax.plot_wireframe(data, color='#1f77b4')
plt.show()
@@ -193,7 +193,7 @@ File > Settings
* :ref:`plotting`
* `Matplotlib Keyboard Shortcuts <https://matplotlib.org/3.1.1/users/navigation_toolbar.html#navigation-keyboard-shortcuts>`_
-* See :ref:`here <plotting>` for custom color cycles and colormaps
+* See :ref:`here <plotting>` for custom color cycles and colormaps
.. |FigureOptionsGear.png| image:: /images/FigureOptionsGear.png
:width: 150px
\ No newline at end of file
diff --git a/docs/source/plotting/ColorfillPlotsHelp.rst b/docs/source/plotting/ColorfillPlotsHelp.rst
index 0797dd3ff9f85d15fc7b886d0cb20623c9f6c71c..3642ad446718761e9566e4b2b7ecf32f74ced244 100644
--- a/docs/source/plotting/ColorfillPlotsHelp.rst
+++ b/docs/source/plotting/ColorfillPlotsHelp.rst
@@ -117,7 +117,7 @@ Click the generate a script button |GenerateAScript.png| on a `Colorfill Plot <h
plt.show()
-For more advice:
+For more advice:
* :ref:`01_basic_plot_scripting`
* :ref:`02_scripting_plots`
@@ -125,7 +125,7 @@ For more advice:
|
|
-Contour Plots
+Contour Plots
=============
A Contour Plot is essentially a Colorfill Plot with Contour lines overlaid.
@@ -201,7 +201,7 @@ Basic example of plotting a `Contour Plot <https://matplotlib.org/api/_as_gen/ma
fig.tight_layout()
plt.show()
-For more advice:
+For more advice:
* :ref:`01_basic_plot_scripting`
* :ref:`02_scripting_plots`
@@ -249,5 +249,5 @@ File > Settings
.. |FigureOptionsGear.png| image:: /images/FigureOptionsGear.png
:width: 150px
-.. |GenerateAScript.png| image:: /images/GenerateAScript.png
+.. |GenerateAScript.png| image:: /images/GenerateAScript.png
:width: 30px
diff --git a/docs/source/plotting/WaterfallPlotsHelp.rst b/docs/source/plotting/WaterfallPlotsHelp.rst
index 5bf5d481871ae6ed6ce18127e202f09f6f9465fb..a58ee8610f531318200cdeeb3f64671e78dbc545 100644
--- a/docs/source/plotting/WaterfallPlotsHelp.rst
+++ b/docs/source/plotting/WaterfallPlotsHelp.rst
@@ -67,7 +67,7 @@ Waterfall plots are very similar to :ref:`1D plots<Basic_1D_Plots>` of multiple
:align: center
-| **TIP**: Change a Legend entry by editing `Set curve label` on the Curves tab.
+| **TIP**: Change a Legend entry by editing `Set curve label` on the Curves tab.
Then on the Legend tab there are Color and Font options.
|
|
diff --git a/docs/source/plotting/index.rst b/docs/source/plotting/index.rst
index e2ab1963b630269a7f98dfa30b3a06af75ec98bc..69dabdaf429e782345973660f1f2daa7f1df6ca2 100644
--- a/docs/source/plotting/index.rst
+++ b/docs/source/plotting/index.rst
@@ -434,7 +434,7 @@ Custom Colors
Custom Color Cycle (Line / 1D plots)
####################################
-The Default Color Cycle doesn't have to be used. Here is an example where a Custom Color Cycle is chosen. Make sure to fill the list `custom_colors` with either the HTML hex codes (eg. #b3457f) or recognised names for the desired colours.
+The Default Color Cycle doesn't have to be used. Here is an example where a Custom Color Cycle is chosen. Make sure to fill the list `custom_colors` with either the HTML hex codes (eg. #b3457f) or recognised names for the desired colours.
Both can be found `online <https://www.rapidtables.com/web/color/html-color-codes.html>`_.
.. plot::
@@ -453,7 +453,7 @@ Both can be found `online <https://www.rapidtables.com/web/color/html-color-code
'''Change the following two parameters as you wish'''
custom_colors = ['#0000ffff', 'salmon','#00ff00ff'] # I've chosen Blue, Salmon, Green
-
+
fig = plt.figure(figsize = (10,10))
ax1 = plt.subplot(211,projection='mantid')
for i in range(Number):
@@ -509,7 +509,7 @@ Then open up any dataset (such as EMU00020884.nxs from the `TrainingCourseData <
This New Colormap is saved within the MantidInstall folder so it can be used without re-running this script!
-
+
Custom Colormap (MantidWorkbench)
#################################
@@ -559,7 +559,7 @@ The following methods show how to Load, Convert from MantidPlot format, Create f
Res = len(Loaded_Cmap)
Cmap = np.zeros((Res,4))
- for i in range(Res):
+ for i in range(Res):
'''Normalise RGB values, Add 4th column alpha set to 1'''
for j in range(3):
Cmap[i][j] = float(Loaded_Cmap[i][j]) / 255
@@ -605,7 +605,7 @@ The following methods show how to Load, Convert from MantidPlot format, Create f
Re = Res-1
Cmap = np.zeros((Res,4))
- for i in range(Res):
+ for i in range(Res):
'''Input functions inside float(), Divide by Res to normalise'''
Cmap[i][0] = float(Res) / Res #Red #just 1
Cmap[i][1] = float(i) / Re #Green #+ve i divisible by Res-1 = Re
@@ -636,7 +636,7 @@ The following methods show how to Load, Convert from MantidPlot format, Create f
Listed_CustomCmap_r = ListedColormap(Reverse, name=(Cmap_Name + '_r') )
plt.register_cmap(name=(Cmap_Name + '_r'), cmap= Listed_CustomCmap_r)
-Now the Custom Colormap has been registered, right-click on a workspace and produce a colorfill plot. In Figure Options (Gear Icon in Plot Figure), under the Images Tab, you can use the drop down-menu to select the new Colormap, and use the check-box to select its Reverse!
+Now the Custom Colormap has been registered, right-click on a workspace and produce a colorfill plot. In Figure Options (Gear Icon in Plot Figure), under the Images Tab, you can use the drop down-menu to select the new Colormap, and use the check-box to select its Reverse!
- Otherwise, use a script like this (from above in Section "Simple Plots") to plot with your new Colormap:
@@ -652,7 +652,7 @@ Now the Custom Colormap has been registered, right-click on a workspace and prod
data = ConvertUnits(InputWorkspace=data,Target='DeltaE', EMode='Direct', EFixed=3)
data = Rebin(InputWorkspace=data, Params='-3,0.025,3', PreserveEvents=False)
md = ConvertToMD(InputWorkspace=data,QDimensions='|Q|',dEAnalysisMode='Direct')
- sqw = BinMD(InputWorkspace=md,AlignedDim0='|Q|,0,3,100',AlignedDim1='DeltaE,-3,3,100')
+ sqw = BinMD(InputWorkspace=md,AlignedDim0='|Q|,0,3,100',AlignedDim1='DeltaE,-3,3,100')
fig, ax = plt.subplots(subplot_kw={'projection':'mantid'})
c = ax.pcolormesh(sqw, cmap='Beach', norm=LogNorm())
@@ -671,7 +671,7 @@ Now the Custom Colormap has been registered, right-click on a workspace and prod
Re = Res-1
Cmap = np.zeros((Res,4))
- for i in range(Res):
+ for i in range(Res):
'''Input functions inside float(), Divide by Res to normalise'''
Cmap[i][0] = float(Res) / Res #Red #just 1
Cmap[i][1] = float(i) / Re #Green #+ve i divisible by Res-1 = Re
@@ -701,7 +701,7 @@ Now the Custom Colormap has been registered, right-click on a workspace and prod
Listed_CustomCmap_r = ListedColormap(Reverse, name=(Cmap_Name + '_r') )
plt.register_cmap(name=(Cmap_Name + '_r'), cmap= Listed_CustomCmap_r)
-
+
from mantid.simpleapi import Load, ConvertToMD, BinMD, ConvertUnits, Rebin
from mantid import plots
from matplotlib.colors import LogNorm
@@ -709,7 +709,7 @@ Now the Custom Colormap has been registered, right-click on a workspace and prod
data = ConvertUnits(InputWorkspace=data,Target='DeltaE', EMode='Direct', EFixed=3)
data = Rebin(InputWorkspace=data, Params='-3,0.025,3', PreserveEvents=False)
md = ConvertToMD(InputWorkspace=data,QDimensions='|Q|',dEAnalysisMode='Direct')
- sqw = BinMD(InputWorkspace=md,AlignedDim0='|Q|,0,3,100',AlignedDim1='DeltaE,-3,3,100')
+ sqw = BinMD(InputWorkspace=md,AlignedDim0='|Q|,0,3,100',AlignedDim1='DeltaE,-3,3,100')
fig, ax = plt.subplots(subplot_kw={'projection':'mantid'})
c = ax.pcolormesh(sqw, cmap='Beach', norm=LogNorm())
diff --git a/docs/source/release/v3.10.0/diffraction.rst b/docs/source/release/v3.10.0/diffraction.rst
index b56af8227315c6ad12b5a20f7760cc5b3b1bcdea..222ab44dbeeb46150d74127179bc600d2e8450ba 100644
--- a/docs/source/release/v3.10.0/diffraction.rst
+++ b/docs/source/release/v3.10.0/diffraction.rst
@@ -11,7 +11,7 @@ Powder Diffraction
- New loader :ref:`LoadILLDiffraction <algm-LoadILLDiffraction>` has been added to load the data-scan nexus files from ILL diffractometers.
- ISIS Powder diffraction scripts have been released. These include support for
GEM, PEARL and POLARIS instruments. For more details see the ISIS Powder documentation
- under API, Python category.
+ under API, Python category.
- New instrument definition files are added for D1B, D4, and D20 powder/liquid diffractometers at ILL. The source and monitor positions, as well as detector to sample distance have been corrected for existing D2B.
- New IDF for the POWGEN upgrade
- :ref:`AlignAndFocusPowder <algm-AlignAndFocusPowder>` Now supports supplying an a second ``.cal`` file for the ``GroupingFilename``.
diff --git a/docs/source/release/v3.10.0/direct_inelastic.rst b/docs/source/release/v3.10.0/direct_inelastic.rst
index 8312a8402cbfeb31d81186de9de19c8e69623a20..92fbba16c377fc80e688111dc95bafa683ca5731 100644
--- a/docs/source/release/v3.10.0/direct_inelastic.rst
+++ b/docs/source/release/v3.10.0/direct_inelastic.rst
@@ -33,9 +33,9 @@ Deprecated
Crystal Field
-------------
-- Now accepts arbitrary ``J`` (or ``S`` - angular momentum quantum number, determining the basis states)
+- Now accepts arbitrary ``J`` (or ``S`` - angular momentum quantum number, determining the basis states)
values with the syntax: ``Ion=S<n>`` or ``Ion=J<n>`` where ``<n>`` is an integer or half integer.
-- Crystal field parameters from a *point charge model* can now be calculated using the ``PointCharge`` class, from a defined crystal structure or CIF file.
+- Crystal field parameters from a *point charge model* can now be calculated using the ``PointCharge`` class, from a defined crystal structure or CIF file.
See the :ref:`Crystal Field Python Interface` for details of the syntax.
`Full list of changes on GitHub <https://github.com/mantidproject/mantid/issues?q=is%3Aclosed+milestone%3A%22Release+3.10%22+label%3A%22Component%3A+Direct+Inelastic%22>`_
diff --git a/docs/source/release/v3.10.0/imaging.rst b/docs/source/release/v3.10.0/imaging.rst
index 1b6dd499f395b22f773f881b5a6db254e9a76da8..72198c42127fe0219fbe519a624fd4292cf338a5 100644
--- a/docs/source/release/v3.10.0/imaging.rst
+++ b/docs/source/release/v3.10.0/imaging.rst
@@ -24,7 +24,7 @@ Documentation
|
-This work on imaging has received funding from the Horizon 2020 Framework
+This work on imaging has received funding from the Horizon 2020 Framework
Programme of the European Union under the SINE2020 project Grant No 654000.
|
diff --git a/docs/source/release/v3.10.0/muon.rst b/docs/source/release/v3.10.0/muon.rst
index b617ec4a32147db26bb0e223bd90ef77cc7c73f1..d29ed3cff0cf471af45763cd4c148d531c0dc798 100644
--- a/docs/source/release/v3.10.0/muon.rst
+++ b/docs/source/release/v3.10.0/muon.rst
@@ -12,9 +12,9 @@ Muon Analysis
- The main part of the multiple fitting GUI has been upgraded to be more user friendly.
-- Fixed a bug that meant transverse field asymmetry data was normalized to bin width.
+- Fixed a bug that meant transverse field asymmetry data was normalized to bin width.
-- Added a fix normalization tick box into the TF asymmetry mode. Once this box is ticked (true) the normalization cannot be changed and will be applied to all of the data that is loaded into the GUI.
+- Added a fix normalization tick box into the TF asymmetry mode. Once this box is ticked (true) the normalization cannot be changed and will be applied to all of the data that is loaded into the GUI.
Algorithms
----------
diff --git a/docs/source/release/v3.10.0/reflectometry.rst b/docs/source/release/v3.10.0/reflectometry.rst
index 046a9fedc49160fa9479bfb4705f2aa9024b5855..f6eb16c66e1410f2ecbbdba432dbcc6998e4cbe8 100644
--- a/docs/source/release/v3.10.0/reflectometry.rst
+++ b/docs/source/release/v3.10.0/reflectometry.rst
@@ -11,7 +11,7 @@ Algorithms
----------
- :ref:`algm-SpecularReflectionPositionCorrect` - fixed a bug where entering an invalid detector or sample name would cause a segmentation fault.
-- The :ref:`algm-SpecularReflectionPositionCorrect` algorithm has a new property, ``DetectorCorrectionType``,
+- The :ref:`algm-SpecularReflectionPositionCorrect` algorithm has a new property, ``DetectorCorrectionType``,
which specifies whether detector positions should be corrected by a vertical shift (default) or by a rotation around the sample position.
- :ref:`algm-ReflectometryReductionOneAuto-v2` and :ref:`algm-CreateTransmissionWorkspaceAuto-v2` attempts to populate properties `StartOverlap` and `EndOverlap` with values from the IDF.
- :ref:`algm-GroupDetectors-v2` peforms a more resilient validation of grouping pattern that is less likely to throw an exception.
diff --git a/docs/source/release/v3.11.0/indirect_inelastic.rst b/docs/source/release/v3.11.0/indirect_inelastic.rst
index e764bcc8cf376a7adb8382b9623702205ed7ff65..add16c354534bbb2e844f29c3c19decd8ab5a859 100644
--- a/docs/source/release/v3.11.0/indirect_inelastic.rst
+++ b/docs/source/release/v3.11.0/indirect_inelastic.rst
@@ -29,11 +29,11 @@ Improved
- The Grouping Policy in :ref:`algm-ISISIndirectDiffractionReduction`, now allows for grouping with a Workspace.
- :ref:`FlatPlatePaalmanPingsCorrection <algm-FlatPlatePaalmanPingsCorrection>` now supports `Direct` and `Indirect` modes.
- :ref:`BASISReduction <algm-BASISReduction>` can save to NXSPE format.
-
+
Bugfixes
########
- :ref:`algm-ElasticWindowMultiple` now correctly normalizes by the lowest temperature - rather than the first one.
-- An issue has been fixed in :ref:`algm-IndirectILLEnergyTransfer` when handling the data with mirror sense, that have shifted 0 monitor counts in the left and right wings. This was causing the left and right workspaces to have different x-axis binning and to fail to sum during the unmirroring step.
+- An issue has been fixed in :ref:`algm-IndirectILLEnergyTransfer` when handling the data with mirror sense, that have shifted 0 monitor counts in the left and right wings. This was causing the left and right workspaces to have different x-axis binning and to fail to sum during the unmirroring step.
- An issue has been fixed in :ref:`algm-IndirectILLReductionFWS` when the scaling of the data after vanadium calibration was not applied.
- :ref:`algm-CalculateSampleTransmission` now divides by the tabulated wavelength when calculating the absorption cross section.
@@ -43,7 +43,7 @@ Indirect Interfaces
- In the Indirect ConvFit interface, EISF is now extracted as a parameter when performing a single fit using 'Fit Single Spectrum'.
- The Indirect *S(Q, W)* interface now automatically replaces NaN values with 0.
- The Save Result option in the Indirect Elwin interface now writes to file the temperature-dependent elastic intensity normalized to the lowest temperature.
-- Model selection is available in the Indirect MSDFit interface, providing the option to choose one of the three models available in the :ref:`algm-MSDFit` algorithm.
+- Model selection is available in the Indirect MSDFit interface, providing the option to choose one of the three models available in the :ref:`algm-MSDFit` algorithm.
- Removed fit option from plot options drop-down menu, in the Indirect Bayes interface.
- Use Manual Grouping in the Indirect Diffraction interface now functions in the same way as the equivalent option in the Indirect ISISEnergyTransfer interface; providing and option to choose the number of groups and subsequently grouping by detector.
- Plot Current Preview is now an available option across all Indirect interfaces, where a mini-plot is shown within the interface.
diff --git a/docs/source/release/v3.11.0/muon.rst b/docs/source/release/v3.11.0/muon.rst
index f9a707e6ef361aac6ca324b7d37c9e93778e7778..e408cea816db7855e37ce41733503b2479c19dec 100644
--- a/docs/source/release/v3.11.0/muon.rst
+++ b/docs/source/release/v3.11.0/muon.rst
@@ -12,14 +12,14 @@ Interfaces
:class: screenshot
:align: right
:width: 500 px
-
+
- Added the Frequency Domain Analysis GUI. At present it is only able to transform data from real space to frequency space. Includes FFT and Maximum entropy methods.
- Updated the TF asymmetry fit. It now works with multiple fitting.
-- Moved the TF Asymmetry checkbox to the data analysis tab.
+- Moved the TF Asymmetry checkbox to the data analysis tab.
Bug Fixes
---------
-- Mantid would crash when multiple period data was used in single fits (in muon analysis). This has been fixed.
+- Mantid would crash when multiple period data was used in single fits (in muon analysis). This has been fixed.
- Fixed crash when loading data into MuonAnalysis after using Add/Remove curves.
diff --git a/docs/source/release/v3.11.0/sans.rst b/docs/source/release/v3.11.0/sans.rst
index d6ded164e101b1cd079c43cf801cc8a4e2205d20..f0e3cf748d07c8dec4d431e1bd934539206163dc 100644
--- a/docs/source/release/v3.11.0/sans.rst
+++ b/docs/source/release/v3.11.0/sans.rst
@@ -12,7 +12,7 @@ Interfaces
:class: screenshot
:align: right
:width: 400 px
-
+
- SANS > ISIS SANS v2 experimental interface has become available. It has basic reduction functionalities and makes use of the new reduction backend.
diff --git a/docs/source/release/v3.12.0/direct_inelastic.rst b/docs/source/release/v3.12.0/direct_inelastic.rst
index 7a4903d60b7dc06f25d7f18731fa9314d334fbe5..369fc2756d2322d64416376f6e451538e34d9591 100644
--- a/docs/source/release/v3.12.0/direct_inelastic.rst
+++ b/docs/source/release/v3.12.0/direct_inelastic.rst
@@ -27,7 +27,7 @@ New features
:class: screenshot
:align: center
:width: 500 px
-
+
Similar to the slice viewer, MSlice plots slices and cuts from workspaces. It creates customisable publication quality figures. Cuts can be created interactively by dragging a rectangle across a slice, and information such as recoil lines and bragg peaks can be overplotted.
diff --git a/docs/source/release/v3.12.0/framework.rst b/docs/source/release/v3.12.0/framework.rst
index e4d0fc9a4b5ce3b0a57a5c8766ae42fa0b8c43d8..a57739df4ecc6196508f50679664557e2f80102c 100644
--- a/docs/source/release/v3.12.0/framework.rst
+++ b/docs/source/release/v3.12.0/framework.rst
@@ -108,7 +108,7 @@ Performance
Improved
########
-- :ref:`LoadEmptyInstrument <algm-LoadEmptyInstrument>` and load algorithms that are using it. Improved performance for second and consecutive loads of instrument geometry, particularly for instruments with many detector pixels.
+- :ref:`LoadEmptyInstrument <algm-LoadEmptyInstrument>` and load algorithms that are using it. Improved performance for second and consecutive loads of instrument geometry, particularly for instruments with many detector pixels.
- :ref:`CropToComponent <algm-CropToComponent>`: Up to 30% performance improvement, based on ongoing work on Instrument-2.0.
- :ref:`MaxEnt <algm-MaxEnt>`: Improved rate of convergence. The ``ChiTarget`` property has been replaced by ``ChiTargetOverN``.
diff --git a/docs/source/release/v3.12.0/index.rst b/docs/source/release/v3.12.0/index.rst
index 6e4e7479a0d6828cadb9ae466d7f30192f0aab3a..9e6c3634c99fc7a0a6de91747e6c936b4bc09180 100644
--- a/docs/source/release/v3.12.0/index.rst
+++ b/docs/source/release/v3.12.0/index.rst
@@ -15,9 +15,9 @@ Mantid 3.12.0 Release Notes
We are proud to announce version 3.12.0 of Mantid.
-We have included the Mantid Mslice interface with this release for the first time, this alternative to the Dave or matlab variants has been developed separately for some time, but has now been included with Mantid to make installation easier.
+We have included the Mantid Mslice interface with this release for the first time, this alternative to the Dave or matlab variants has been developed separately for some time, but has now been included with Mantid to make installation easier.
-This version of Mantid will also go live across 6 instruments at the ILL with the startup in March.
+This version of Mantid will also go live across 6 instruments at the ILL with the startup in March.
We have also listened to your concerns about stability issues with previous releases during long experiments and have implemented error reporting into Mantidplot to capture information about crashes allowing us to quantify the problems and help track them down and resolve them.
diff --git a/docs/source/release/v3.12.0/muon.rst b/docs/source/release/v3.12.0/muon.rst
index bb310b1277b2d8060cb490c5dbc955ddeeada2bf..04e4c23456dbc1d998dec26d1a878c33dc0d203d 100644
--- a/docs/source/release/v3.12.0/muon.rst
+++ b/docs/source/release/v3.12.0/muon.rst
@@ -23,13 +23,13 @@ Improvements
- The period display no longer becomes blank when changing the period selection in multiple fitting mode.
- The group/pair selection in Muon Analysis no longer resets when changing tabs or loading data.
- The Frequency Domain Analysis GUI now uses :ref:`CalMuonDetectorPhases <algm-CalMuonDetectorPhases>` to create the phase table for PhaseQuad FFTs.
-- The Frequency Domain Analysis GUI now uses :ref:`MuonMaxent <algm-MuonMaxent>` to calculate the frequency spectrum in MaxEnt mode.
+- The Frequency Domain Analysis GUI now uses :ref:`MuonMaxent <algm-MuonMaxent>` to calculate the frequency spectrum in MaxEnt mode.
- The ALC interface now allows background sections with negative values.
- If data is loaded with 0 good frames into Muon Analysis then it will try to load the data without dead time correction (does not need number of good frames).
- Muon analysis no longer disables the "co add" and "simultaneous" buttons in the multiple fitting interface.
- Frequency domain analysis will reload the data if the active workspace has changed.
- Muon analysis no longer crashes when using the browse button in sequential fitting.
-- The period summation/subtraction can now be used in multiple fitting.
+- The period summation/subtraction can now be used in multiple fitting.
- Muon analysis now handles the "auto background" gracefully in single and multiple fitting modes.
- We have disabled some non functional graph right click context menu items or adding functions when in multi data fitting mode, in the Data Analysis tab of the Muon Analysis Interface.
- Frequency domain analysis will produce a warning if there is no data to load.
diff --git a/docs/source/release/v3.12.0/reflectometry.rst b/docs/source/release/v3.12.0/reflectometry.rst
index ad414a4088bc5a283f4836f64e55c233719e9477..7dae9297f552abb5ebdbbb36c7497e007c025351 100644
--- a/docs/source/release/v3.12.0/reflectometry.rst
+++ b/docs/source/release/v3.12.0/reflectometry.rst
@@ -21,13 +21,13 @@ New features
- The following new options have been added to the Settings tab:
- A new table has been added to the Experiment settings which allows default options to be specified on a per-angle basis. If a row in the Runs tab contains an angle, it will be looked up in this table and those options will be used if a matching angle is found (the angle does not have to be exact as it will match to within 100th of a degree). If you want to specify values that will be used by default for all runs, then simply leave the angle empty.
-
+
- Two new drop-down boxes have been added to the Experiment settings, 'ReductionType' and 'SummationType', which are passed to the corresponding parameters of :ref:`algm-ReflectometryReductionOneAuto`.
- A 'CorrectDetectors' check box has been added to the Instrument settings, which maps to the corresponding property in :ref:`algm-ReflectometryReductionOneAuto`.
- The 'Get Defaults' button now looks for values for the following additional properties in the IDF:
-
+
- AnalysisMode
- PolarizationAnalysis
- TransRunStartOverlap
@@ -43,21 +43,21 @@ Improvements
############
- Output workspace names and plotting:
-
+
- Output workspace names now use ``+`` to indicate preprocessed (i.e. summed) workspaces, rather than ``_``, which is used to indicate postprocessed (i.e. stitched) workspaces.
- Output workspace names for time sliced data now contain the time periods, rather than just a slice index number.
- Plotting results in event handling mode now plots the ``IvsQ_binned_`` workspaces rather than ``IvsQ_``, to make the behaviour consistent with non-event mode.
- The Python code generated when you tick ``Output Notebook`` has been improved to support special characters (e.g. ``+``) in workspace names.
- The ``Output Notebook`` option now works for all groups that are processed as non-event workspaces. Previously, if event handling was enabled but a group contained non-event workspaces, generating the notebook was not performed.
-
+
- Properties on the Runs tab now take precedence over properties on the Settings tab.
-
+
- Extra tooltips have been added along with a new ``?`` button which links to the documentation page.
-
+
- The runs tab table now contains grid lines to make it easier to see where to enter text.
-
+
- Menu items and toolbar buttons are now enabled/disabled when appropriate, e.g. to prevent table modification during processing. Directly editing table rows and settings is also disabled during processing.
-
+
- The 'DirectBeam' box has been from the settings tab because this is not used.
@@ -65,9 +65,9 @@ Bug fixes
#########
- Fixed some bugs where transmission runs entered on the Settings tab were not being found, whether entered as a run number to load or as the name of an existing workspace in the ADS.
-
+
- The Python code generated when you tick ``Output Notebook`` has been changed so that all algorithm property values are enclosed in quotes. Unquoted values were causing failures in some algorithms. A bug has also been fixed in setting the legend location for the 4th (stitched) plot, which is shown when post-processing is performed.
-
+
- If any of the mandatory parameters listed below are missing when pressing 'Get Default' a warning is shown rather than a crash.
- MonitorIntegralMax
diff --git a/docs/source/release/v3.12.0/ui.rst b/docs/source/release/v3.12.0/ui.rst
index 109be98e3530c14c4a807fab54d21dc9d5fb68f8..3e57d7c33d174cb1e6abfc431722724c1ddbe3ad 100644
--- a/docs/source/release/v3.12.0/ui.rst
+++ b/docs/source/release/v3.12.0/ui.rst
@@ -94,7 +94,7 @@ The dialog box will close having sent no information. Mantid will either continu
**Share non-identifiable information**
An error report will be sent to errorreports.mantidproject.org. It will contain the following information:
-
+
- Operating System including version.
- Mantid version including git Sha1.
- System architecture.
diff --git a/docs/source/release/v3.13.0/framework.rst b/docs/source/release/v3.13.0/framework.rst
index b17dc2272865c09aad13b45b49ceaf741ba6c71c..2b9516b40d17ef60f39f4fa636260a9cf83e5d9d 100644
--- a/docs/source/release/v3.13.0/framework.rst
+++ b/docs/source/release/v3.13.0/framework.rst
@@ -18,7 +18,7 @@ Stability
- We have introduced a Project Recovery mechanism for Mantidplot in order to be able to recover the lost state of the interface in the event of a crash or unexpected shutdown. There are more details in the UI section of the release notes.
- The error reporter can now catches hard crashes to desktop, allowing us to get more information on causes of hangs or crashes in Mantid. Since the last release error reports sent to us led directly to the identification of and fixes for 3 separate bugs in Mantid.
-- Mantid now handles poor network stability better when reading live data from the ISIS DAE. Mantid will now timeout after a couple of minutes of loss of network connectivity and remains responsive during this time.
+- Mantid now handles poor network stability better when reading live data from the ISIS DAE. Mantid will now timeout after a couple of minutes of loss of network connectivity and remains responsive during this time.
You can alter the duration of this timeout by adding a line to the mantid.user.properties file like:
```
ISISDAE.Timeout = 100 #seconds
diff --git a/docs/source/release/v3.13.0/index.rst b/docs/source/release/v3.13.0/index.rst
index f561bd675fb2786db81e2fcb86b8b4a0a9a7fdd4..9eaf849f5e6e560052da19f807cc6e764ca421bd 100644
--- a/docs/source/release/v3.13.0/index.rst
+++ b/docs/source/release/v3.13.0/index.rst
@@ -7,7 +7,7 @@ Mantid 3.13.0 Release Notes
.. figure:: ../../images/Release3-13.png
:class: screenshot
:align: right
-
+
Mantid introduces project recovery for Mantidplot.
.. contents:: Table of Contents
diff --git a/docs/source/release/v3.13.0/muon.rst b/docs/source/release/v3.13.0/muon.rst
index a6ab959b68b8e4ab3a122dc4c57332aa15b555de..36d411463997d0c9fe9480de6700ad8974747e9e 100644
--- a/docs/source/release/v3.13.0/muon.rst
+++ b/docs/source/release/v3.13.0/muon.rst
@@ -4,7 +4,7 @@ MuSR Changes
.. contents:: Table of Contents
:local:
-
+
Interface
---------
diff --git a/docs/source/release/v3.13.0/sans.rst b/docs/source/release/v3.13.0/sans.rst
index f7cd556735fb0349633b58bf5fd868b03a612d55..052e8f683841345ddad1d471d6164bd770fd987e 100644
--- a/docs/source/release/v3.13.0/sans.rst
+++ b/docs/source/release/v3.13.0/sans.rst
@@ -30,7 +30,7 @@ Improvements
############
* Transmission workspaces are now output by default from the new GUI.
* The Beam centre finder now takes the default radius limits from the instrument parameter file if specified.
-* Updated old backend to mask by detector ID rather than spectrum number, improving reliability.
+* Updated old backend to mask by detector ID rather than spectrum number, improving reliability.
* Added EventSlice option to options column in new GUI.
* Added thickness column to table in new GUI.
* Added Radius Cutoff and Wavelength Cutoff boxes to the old and new GUI.
@@ -46,9 +46,9 @@ Bugfixes
* User files specified in the batch file are now being loaded into the new GUI.
* The new sans GUI will now save out all the outputs of a time sliced reduction.
* Fixed a bug where save_format was not being specified if a user file was entered for a row.
-* Use gravity now defaulting to false.
+* Use gravity now defaulting to false.
* MASK/TIME and TIME/MASK now both work in new backend.
-* SET Centre/HAB command is now correctly parsed into a separate variable to SET Centre.
+* SET Centre/HAB command is now correctly parsed into a separate variable to SET Centre.
Features Removed
################
diff --git a/docs/source/release/v3.7.1/diffraction.rst b/docs/source/release/v3.7.1/diffraction.rst
index 6caa8115967a7d01ca2cb7ca36b5d57de13f6aa2..09104ab0cad8353eae01063c95369532b99d38ce 100644
--- a/docs/source/release/v3.7.1/diffraction.rst
+++ b/docs/source/release/v3.7.1/diffraction.rst
@@ -7,8 +7,8 @@ Diffraction Changes
Documentation
-------------
-
-- The documentation for all calibration approaches, including Powder diffraction, single crystal and engineering calibrations has been pulled together, and expanded :ref:`here <Calibration Intro>`.
+
+- The documentation for all calibration approaches, including Powder diffraction, single crystal and engineering calibrations has been pulled together, and expanded :ref:`here <Calibration Intro>`.
Powder Diffraction
------------------
@@ -29,7 +29,7 @@ Powder Diffraction Scripts
- PowderISIS script has been renamed to CryPowderISIS and can be found within
the following folder `scripts/CryPowderISIS`
-- `Pearl Powder Diffraction Script <http://docs.mantidproject.org/v3.7.1/api/python/techniques/PearlPowderDiffractionISIS-v1.html>`_
+- `Pearl Powder Diffraction Script <http://docs.mantidproject.org/v3.7.1/api/python/techniques/PearlPowderDiffractionISIS-v1.html>`_
documentation has been implemented and
PowderISIS script documentation has been renamed to
`Crystallography Powder Diffraction Script <http://docs.mantidproject.org/v3.7.1/api/python/techniques/CryPowderDiffractionISIS-v1.html>`_
@@ -38,8 +38,8 @@ Single Crystal Improvements
---------------------------
- :ref:`SCDCalibratePanels <algm-SCDCalibratePanels>` has parameter errors reduced,
- an option for simplex minimization, and 3 new workspaces which can plot calculated
- vs theoretical columns, rows, and TOF for each bank. Calibration is now as good
+ an option for simplex minimization, and 3 new workspaces which can plot calculated
+ vs theoretical columns, rows, and TOF for each bank. Calibration is now as good
as ISAW's for Mandi data.
- 5 detectors added to the MANDI instrument geometry
- :ref:`LoadCIF <algm-LoadCIF>` can now also load structures where only anisotropic displacement parameters are given,
@@ -123,12 +123,12 @@ Graphical user interface
Imaging
-------
-- The new algorithm `ImggAggregateWavelengths
+- The new algorithm `ImggAggregateWavelengths
<http://docs.mantidproject.org/v3.7.1/algorithms/ImggAggregateWavelengths-v1.html>`_
aggregates stacks of images from wavelength dependent data.
-- The algorithm `ImggTomographicReconstruction
- <http://docs.mantidproject.org/v3.7.1/algorithms/ImggTomographicReconstruction-v1.html>`_
+- The algorithm `ImggTomographicReconstruction
+ <http://docs.mantidproject.org/v3.7.1/algorithms/ImggTomographicReconstruction-v1.html>`_
has been introduced. This is a
first experimental version that implements the Filtered
Back-Projection (FBP) reconstruction method using the FBP
@@ -159,7 +159,7 @@ Improvements in the tomographic reconstruction graphical user interface
- The energy bands tab can now produce multiple output bands in one
pass, and supports different aggregation methods via the new
- algorithm `ImggAggregateWavelengths
+ algorithm `ImggAggregateWavelengths
<http://docs.mantidproject.org/v3.7.1/algorithms/ImggAggregateWavelengths-v1.html>`_.
diff --git a/docs/source/release/v3.7.1/framework.rst b/docs/source/release/v3.7.1/framework.rst
index 6664ded6738c0817cf4dcb948a9864de3e4707ce..ba1816468d0b00aa946bca1942d0a739a17aa9ab 100644
--- a/docs/source/release/v3.7.1/framework.rst
+++ b/docs/source/release/v3.7.1/framework.rst
@@ -63,7 +63,7 @@ New
- :ref:`GetIPTS <algm-GetIPTS>` Returns the IPTS directory of the specified ORNL run.
- :ref:`GSASIIRefineFitPeaks <algm-GSASIIRefineFitPeaks>` uses the GSAS-II
software to refine lattice parameters (whole pattern refinement) and fit
-- `ImggAggregateWavelengths <http://docs.mantidproject.org/v3.7.1/algorithms/ImggAggregateWavelengths-v1.html>`_
+- `ImggAggregateWavelengths <http://docs.mantidproject.org/v3.7.1/algorithms/ImggAggregateWavelengths-v1.html>`_
aggregates stacks of images from wavelength dependent imaging into one or more output bands.
- `ImggTomographicReconstruction <http://docs.mantidproject.org/v3.7.1/algorithms/ImggTomographicReconstruction-v1.html>`_
implements a method for 3D tomographic reconstruction from projection images.
diff --git a/docs/source/release/v3.7.1/muon.rst b/docs/source/release/v3.7.1/muon.rst
index e592ad3edd188bfc61dd854e737983cf78b11449..145a1671e01b6c81e79c2f018099df35949e4e7a 100644
--- a/docs/source/release/v3.7.1/muon.rst
+++ b/docs/source/release/v3.7.1/muon.rst
@@ -11,9 +11,9 @@ Interfaces
Muon ALC
########
-- The default directory for the last run is now set to the same directory selected for the first run
-- Fixed an occasional crash seen when "Auto" was selected
-- Several usability fixes were made to the interface:
+- The default directory for the last run is now set to the same directory selected for the first run
+- Fixed an occasional crash seen when "Auto" was selected
+- Several usability fixes were made to the interface:
- The "Function" box was renamed "Take log value at" and moved next to the log to which it applies
- The integration start time is initialised to the first good data rather than the first time bin, and is not reset when a new first run is loaded
- The choice of periods is no longer reset when a new first run is loaded
@@ -22,8 +22,8 @@ Muon ALC
Muon Analysis
#############
-- "Load current data" now works for ARGUS
-- A bug was fixed where the user's choice of which group (or pair of groups) to plot was changed unexpectedly when the grouping table was updated
+- "Load current data" now works for ARGUS
+- A bug was fixed where the user's choice of which group (or pair of groups) to plot was changed unexpectedly when the grouping table was updated
- The "run number" field of the results table has been improved:
- It now shows the range of co-added runs, e.g. *15189-90*, rather than just the first one
@@ -31,18 +31,18 @@ Muon Analysis
- No period number is shown in the case of single-period data, or if the sum of all periods is used.
- These changes can be combined, e.g. *15189-91: 1+2*
-- The "Run Information" box on the Home tab has been corrected for co-added sets of runs. The information shown now applies to all runs, where previously some of it was relevant to the first only:
+- The "Run Information" box on the Home tab has been corrected for co-added sets of runs. The information shown now applies to all runs, where previously some of it was relevant to the first only:
- *Runs* label deals with non-consecutive ranges
- *Sample Temperature* and *Sample Magnetic Field* are a range if not all the same value
- *Average Temperature* is calculated from all logs
- *Start* and *End* are the earliest start and latest end
-- When the window is resized, all widgets within the window should now resize with it. This enables the interface to be used on smaller screens.
-- "Plot/Remove guess" now deals correctly with the case when a new run is loaded.
-- When plotting data from a new run in the same window as the previous plot, previous fits now remain on the graph, to enable easy comparison between datasets. They can be removed with the "Clear fit curves" option.
+- When the window is resized, all widgets within the window should now resize with it. This enables the interface to be used on smaller screens.
+- "Plot/Remove guess" now deals correctly with the case when a new run is loaded.
+- When plotting data from a new run in the same window as the previous plot, previous fits now remain on the graph, to enable easy comparison between datasets. They can be removed with the "Clear fit curves" option.
- A crash was fixed when loading data on Linux.
-- When loading a new run with a different main field direction, the correct grouping for the new field direction is now always loaded.
+- When loading a new run with a different main field direction, the correct grouping for the new field direction is now always loaded.
Algorithms
----------
@@ -50,21 +50,21 @@ Algorithms
- :ref:`CalMuonDetectorPhases <algm-CalMuonDetectorPhases>`: speed increased by using a sequential fit. The shared frequency
is found as a first step by grouping the spectra and fitting the asymmetry, then this frequency is treated as fixed
in a sequential fit of all spectra individually. The grouping can be provided by the user or read automatically from
- the instrument definition.
+ the instrument definition.
- :ref:`FFT <algm-FFT>`: can now be run on muon workspaces without the need to run Rebin first. This is done by setting the
property AcceptXRoundingErrors to true, meaning the algorithm will accept workspaces whose bin widths differ
slightly. Large deviations will still produce a warning message or, if very large, an error.
- :ref:`FFT <algm-FFT>`: added property *AutoShift* to enable automatic phase correction for workspaces not centred at zero.
- :ref:`AsymmetryCalc <algm-AsymmetryCalc>`: a bug was fixed where the algorithm failed to run on input WorkspaceGroups.
-- :ref:`MaxEnt <algm-MaxEnt>`: MaxEnt now handles positive images
-- :ref:`MaxEnt <algm-MaxEnt>`: Some improvements/fixes were added (output label, X rounding errors and ability to increase the number of points in the image and reconstructed data)
-- :ref:`MaxEnt <algm-MaxEnt>`: *AutoShift* property was added. As in :ref:`FFT <algm-FFT>` this property allows for automatic phase correction for workspaces not centred at zero
+- :ref:`MaxEnt <algm-MaxEnt>`: MaxEnt now handles positive images
+- :ref:`MaxEnt <algm-MaxEnt>`: Some improvements/fixes were added (output label, X rounding errors and ability to increase the number of points in the image and reconstructed data)
+- :ref:`MaxEnt <algm-MaxEnt>`: *AutoShift* property was added. As in :ref:`FFT <algm-FFT>` this property allows for automatic phase correction for workspaces not centred at zero
- :ref:`LoadMuonNexus <algm-LoadMuonNexus>`: If the NeXus file (version 1) does not contain a grouping entry, or the grouping entry it contains is invalid, then the grouping will be loaded from the IDF. This enables use of such files in the ALC interface.
Fit Functions
-------------
-- :ref:`Keren <func-Keren>` has been added as a new fit function - Amit Keren's
+- :ref:`Keren <func-Keren>` has been added as a new fit function - Amit Keren's
generalisation of the Abragam relaxation function to a longitudinal field,
for fitting the time-dependent muon polarisation.
diff --git a/docs/source/release/v3.7.1/reflectometry.rst b/docs/source/release/v3.7.1/reflectometry.rst
index 9654b27060b7784611489281c0bc7884aff408a3..0f41f8989f2be654dc5055a38c23bf2e9bdec572 100644
--- a/docs/source/release/v3.7.1/reflectometry.rst
+++ b/docs/source/release/v3.7.1/reflectometry.rst
@@ -8,22 +8,22 @@ Reflectometry Changes
Reflectometry Instruments
--------------------------
-- An updated version of the OFFSPEC IDF is now being used in mantid
+- An updated version of the OFFSPEC IDF is now being used in mantid
- CRISP and POLREF IDFs were causing problems in the ISIS Reflectometry (Polref) interface as they were using the `opening height` tag
when defining their slits. This has now been changed to be uniform across all reflectometry instruments (INTER, POLREF, CRISP, SURF, OFFSPEC)
- to `vertical gap` such that the CalculateResolution algorithm invoked by the interface will now work correctly.
-
+ to `vertical gap` such that the CalculateResolution algorithm invoked by the interface will now work correctly.
+
ConvertToReflectometryQ
-----------------------
-- A bug producing dark regions in *QxQz* maps was fixed
+- A bug producing dark regions in *QxQz* maps was fixed
ReflectometryReductionOne
-------------------------
-- Transmission corrections options are now applicable with both PointDetectorAnalysis and MultiDetectorAnalysis modes as long as a first
+- Transmission corrections options are now applicable with both PointDetectorAnalysis and MultiDetectorAnalysis modes as long as a first
transmission workspace has been provided. `#15683 <https://github.com/mantidproject/mantid/pull/15683>`_
-
+
- In CreateTransmissionWorkspace and ReflectometryReductionOne the default value for the algorithm property WavelengthStep has been changed
from 0.05 to 0.02.
@@ -31,7 +31,7 @@ ReflectometryReductionOne
Reflectometry Reduction Interface
---------------------------------
-- The ReflTBL data handling algorithms (namely SaveReflTBL and LoadReflTBL) have been generalised to allow for any number of column headings and
+- The ReflTBL data handling algorithms (namely SaveReflTBL and LoadReflTBL) have been generalised to allow for any number of column headings and
custom column heading titles. Any old ReflTBL files will still work with the new algorithms (SaveTBL and LoadTBL) however any new tables created
using SaveTBL will now be made with the new format. In the new format, the first line of the TBL file will contain a comma-separated list of column headings
and all subsequent lines will define the data for each row. For an example this new format see here `LoadTBL <http://docs.mantidproject.org/nightly/algorithms/LoadTBL-v1.html>`_ .
@@ -43,8 +43,8 @@ ISIS Reflectometry (Polref)
was closed before the details had been entered then mantid crashed. This has been fixed.
- Bugfix: When attempting to plot rows in the Processing Table, if the processing table contained a row without an associated Run Number
Mantid will raise an unexpected exception. This has now been fixed resulting in a warning being shown to the user that a certain row does not
- contain a Run Number.
-- Some changes were made to the interface as part of a code refactoring (functional behaviour remains the same).
+ contain a Run Number.
+- Some changes were made to the interface as part of a code refactoring (functional behaviour remains the same).
As a consequence there are some changes visible to users: a new progress bar that has been added to the *Search Runs* section, which shows the progress when
transferring runs. The progress bar that existed before will only indicate the progress of processing that is
in progress. A new section below the processing table has been added. It
diff --git a/docs/source/release/v3.8.0/diffraction.rst b/docs/source/release/v3.8.0/diffraction.rst
index f377ad8488b91bf862dc7870f5b08c0f73aef95f..413b0e1dfa70e665f55499ac03659b13a04da7e6 100644
--- a/docs/source/release/v3.8.0/diffraction.rst
+++ b/docs/source/release/v3.8.0/diffraction.rst
@@ -72,7 +72,7 @@ Engineering Diffraction
- New *Load* button on the Fitting Tab, will enable user to load the
focused file to the canvas, so that the user can select the peaks
manually beforehand
-
+
- New tool-tip *How to use* quickly tells users how to use the peak
picker tool by simply hovering their cursor over it.
@@ -104,7 +104,7 @@ Powder Diffraction
weights applied to events have changed by a factor of the duty cycle
(:math:`c\approx0.498`) as requested by the instrument scientists.
-- `Pearl Powder Diffraction Script <http://docs.mantidproject.org/v3.8.0/api/python/techniques/PearlPowderDiffractionISIS-v1.html>`_:
+- `Pearl Powder Diffraction Script <http://docs.mantidproject.org/v3.8.0/api/python/techniques/PearlPowderDiffractionISIS-v1.html>`_:
A workflow diagram for ``pearl_run_focus`` function has been created.
- :ref:`CalibrateRectangularDetectors
diff --git a/docs/source/release/v3.8.0/direct_inelastic.rst b/docs/source/release/v3.8.0/direct_inelastic.rst
index e5b72ce1b7303eea57abc2c6a17806360ecfd28f..d3aedf2aa1810f28d12e33ea8a25da7a7e89e0ce 100644
--- a/docs/source/release/v3.8.0/direct_inelastic.rst
+++ b/docs/source/release/v3.8.0/direct_inelastic.rst
@@ -11,16 +11,16 @@ Improvements
- :ref:`MDNormDirectSC <algm-MDNormDirectSC>` has an option to skip safety checks. This improves the speed when acting on workspace groups.
- The :ref:`ExportSpectraMask <algm-ExportSpectraMask>` algorithm was added to Mantid, along with documentation, unit tests and a Python GUI.
- The algorithm exports a list of masked spectra and the list can be saved as a single ISIS *.msk* file.
- The export mask procedure is often used by instrument scientists in ISIS, and they had to initialize qtiGenie to do this operation before these changes.
+ The algorithm exports a list of masked spectra and the list can be saved as a single ISIS *.msk* file.
+ The export mask procedure is often used by instrument scientists in ISIS, and they had to initialize qtiGenie to do this operation before these changes.
- :ref:`GetEiMonDet <algm-GetEiMonDet>` has had a complete rewrite. Version 2 utilises the elastic peak position data generated by :ref:`FindEPP <algm-FindEPP>`. The detectors of interest are specified by their indices instead of their distance from the sample. The revised algorithm is able to deal with cases where neutrons arrive at the detectors in a later time frame.
-- :ref:`MaskDetectors <algm-MaskDetectors>` has been modified to work on grouped spectra. If a detector of the workspace is masked then the relevant spectra of the target workspace become masked(zero). Masks defined by *.xml* files, produced by :ref:`SaveMask <algm-SaveMask>` algorithm, can be applied to workspaces containing mapped spectra that has been obtained from ISIS instruments.
-
+- :ref:`MaskDetectors <algm-MaskDetectors>` has been modified to work on grouped spectra. If a detector of the workspace is masked then the relevant spectra of the target workspace become masked(zero). Masks defined by *.xml* files, produced by :ref:`SaveMask <algm-SaveMask>` algorithm, can be applied to workspaces containing mapped spectra that has been obtained from ISIS instruments.
+
- :ref:`LoadMask <algm-LoadMask>` was modified to accept a spectra mask and a spectra-detector map.
This allows the use of old legacy *.msk* files to generate a masked workspace, use old spectra masks on workspaces with different groupings and spectra-detector maps.
-- The algorithm :ref:`MagFormFactorCorrection <algm-MagFormFactorCorrection>` will scale an input workspace by 1/:math:`|F(Q)|^2`, where :math:`F(Q)` is the magnetic form factor for a specified magnetic ion.
+- The algorithm :ref:`MagFormFactorCorrection <algm-MagFormFactorCorrection>` will scale an input workspace by 1/:math:`|F(Q)|^2`, where :math:`F(Q)` is the magnetic form factor for a specified magnetic ion.
diff --git a/docs/source/release/v3.8.0/framework.rst b/docs/source/release/v3.8.0/framework.rst
index 99ce3002366ca87df4600ddaf140d197c0ee8436..225050079602e6f1614aa3cb5af08b55912d1496 100644
--- a/docs/source/release/v3.8.0/framework.rst
+++ b/docs/source/release/v3.8.0/framework.rst
@@ -162,8 +162,8 @@ CurveFitting
is a histogram with large bins it can improve accuracy of the fit.
- The concept page for :ref:`Comparing fit minimizers <FittingMinimizers>` has been updated to include the new
minimizer and a comparison against neutron data examples.
-
-The work on benchmarking fitting has received funding from the Horizon 2020 Framework Programme of the European Union under the SINE2020 project Grant No 654000.
+
+The work on benchmarking fitting has received funding from the Horizon 2020 Framework Programme of the European Union under the SINE2020 project Grant No 654000.
Others
------
diff --git a/docs/source/release/v3.8.0/muon.rst b/docs/source/release/v3.8.0/muon.rst
index e1a679f1e1600f005a928e49284676b72548132d..30de6ed45d9fd7af6aee9ee13368bc3e1ca696eb 100644
--- a/docs/source/release/v3.8.0/muon.rst
+++ b/docs/source/release/v3.8.0/muon.rst
@@ -16,14 +16,14 @@ ALC
Muon Analysis
#############
-Multi-dataset fitting
+Multi-dataset fitting
*********************
The *Data Analysis* tab of the Muon Analysis interface has been updated to enable simultaneous fits of multiple datasets.
A full explanation of how to use this new functionality is contained in the interface's documentation.
Results tables of these new kinds of fit can also be created.
-As this is a new change for this release, please report any bugs, or requests for enhancements, to the development team.
+As this is a new change for this release, please report any bugs, or requests for enhancements, to the development team.
If you find a bug that stops you working, or would simply prefer to stick with the previous UI, just check the "Compatibility mode" box on the *Settings* tab and this will revert the interface to how it was in Mantid 3.7.
Other fixes and enhancements:
diff --git a/docs/source/release/v3.8.0/reflectometry.rst b/docs/source/release/v3.8.0/reflectometry.rst
index f9bf6319c7f30197450bd0cfafba786fe8ce34ab..5fb63c99d3d06d32c6dff1cc1c3150ba687ec669 100644
--- a/docs/source/release/v3.8.0/reflectometry.rst
+++ b/docs/source/release/v3.8.0/reflectometry.rst
@@ -20,7 +20,7 @@ ReflectometryReductionOne
ReflectometryReductionOneAuto
-----------------------------
-- The scaling step has now been added to the Workflow diagram of ReflectometryReductionOneAuto `#16671 <https://github.com/mantidproject/mantid/pull/16671>`__
+- The scaling step has now been added to the Workflow diagram of ReflectometryReductionOneAuto `#16671 <https://github.com/mantidproject/mantid/pull/16671>`__
CreateTransmissionWorkspace
---------------------------
diff --git a/docs/source/release/v3.8.0/ui.rst b/docs/source/release/v3.8.0/ui.rst
index 9b26f33f640ba65a1466b33bf2d216a4927a0d09..7b0ec3953854788d372449b6f92c31ee6316e207 100644
--- a/docs/source/release/v3.8.0/ui.rst
+++ b/docs/source/release/v3.8.0/ui.rst
@@ -63,7 +63,7 @@ Documentation
Options Window
###############
-- Within Preferences->Mantid->Options ticking a category off/on will now untick/tick all subcategories. Also having some subcategories on and off will now show a partially ticked box for that category.
+- Within Preferences->Mantid->Options ticking a category off/on will now untick/tick all subcategories. Also having some subcategories on and off will now show a partially ticked box for that category.
SliceViewer Improvements
diff --git a/docs/source/release/v3.9.0/direct_inelastic.rst b/docs/source/release/v3.9.0/direct_inelastic.rst
index 1b1bc0f4c49f4ee1654576c87618c9467f2b81c9..ee974bf9e3675062de1267c9f1c1ecc13963ce82 100644
--- a/docs/source/release/v3.9.0/direct_inelastic.rst
+++ b/docs/source/release/v3.9.0/direct_inelastic.rst
@@ -8,7 +8,7 @@ Direct Inelastic Changes
Improvements
------------
-- New algorithm :ref:`CalculateCountRate <algm-CalculateCountRate>` allows to calculate instrument counting rate as function of the experiment
+- New algorithm :ref:`CalculateCountRate <algm-CalculateCountRate>` allows to calculate instrument counting rate as function of the experiment
time to be able to filter spurions, which may sometimes appear on ISIS instruments. It can also be used to evaluate changes
of sample reflectivity as function of some slow changing experiment's parameter e.g. temperature, magnetic field or pressure.
diff --git a/docs/source/release/v3.9.0/imaging.rst b/docs/source/release/v3.9.0/imaging.rst
index 5f3ca09ba9806a3762808be858aefcfc86de58fd..a9e84b28fa9ba1f136b6441ca82193bd5af5e590 100644
--- a/docs/source/release/v3.9.0/imaging.rst
+++ b/docs/source/release/v3.9.0/imaging.rst
@@ -20,9 +20,9 @@ Bug Fixes
- Clicking Cancel now cancels the running reconstruction process.
- The reconstruction scripts will now run with TomoPy v1.x.x, however the output is not tested with versions newer than 0.10.x.
- Selecting the Center of Rotation, Area for Normalsation and Region of Interest will now always follow the exact position of the mouse.
-- Multiple success/warning/error messages will no longer be shown after an operation.
+- Multiple success/warning/error messages will no longer be shown after an operation.
-Work done on imaging has received funding from the Horizon 2020 Framework
+Work done on imaging has received funding from the Horizon 2020 Framework
Programme of the European Union under the SINE2020 project Grant No 654000.
diff --git a/docs/source/release/v3.9.0/muon.rst b/docs/source/release/v3.9.0/muon.rst
index 6f98b13730795166f134effc2328a2ba98e5c70e..c8bad87b63cf2124ab3a49661d35906aa4efaaf9 100644
--- a/docs/source/release/v3.9.0/muon.rst
+++ b/docs/source/release/v3.9.0/muon.rst
@@ -20,7 +20,7 @@ Muon Analysis
- Fixed a bug where stale plot guesses would be left on the graph in some situations.
- Fixed a bug with load current run that meant it would be actually loading old data due to caching. Data from current run files is no longer cached behind the scenes.
- The default Plot Policy has been changed to **Use Previous Window**. This avoids the speed and stability issues that could occur with **Create New Window** once hundreds of graph windows had accumulated over several days of an experiment.
-- Fixed a bug for the time averaging within the muon analysis. Now uses the time average function.
+- Fixed a bug for the time averaging within the muon analysis. Now uses the time average function.
diff --git a/docs/source/release/v3.9.0/reflectometry.rst b/docs/source/release/v3.9.0/reflectometry.rst
index a5780fe19adfad3e926df431cc7fb5324ea76375..5281ab783cf2909a9e4a2c3c4cdf16c8b1af2a57 100644
--- a/docs/source/release/v3.9.0/reflectometry.rst
+++ b/docs/source/release/v3.9.0/reflectometry.rst
@@ -85,7 +85,7 @@ ISIS Reflectometry (Polref)
- An issue by which the interface was not populating ``dQ/Q``, ``Q min`` and ``Q max`` correctly for multi-period datasets has been fixed.
- A shift in Y between different slices has been fixed.
- When the instrument is changed from the GUI, the Mantid default instrument is updated accordingly.
-- Error messages are displayed if the user either attempts to transfer zero runs or transfer runs with a different strategy to the one they used to search for runs with.
+- Error messages are displayed if the user either attempts to transfer zero runs or transfer runs with a different strategy to the one they used to search for runs with.
- Fixed a bug where if the user answered 'no' to a popup asking if they wanted to process all runs, the progress bar would show activity as though a data reduction was occurring.
- Documentation regarding the interface has been updated accordingly.
diff --git a/docs/source/release/v3.9.0/ui.rst b/docs/source/release/v3.9.0/ui.rst
index b51519a896c4596485b549020586cf3ccf79fa49..e66df207afa6324e9f431d59be5b535e79e85716 100644
--- a/docs/source/release/v3.9.0/ui.rst
+++ b/docs/source/release/v3.9.0/ui.rst
@@ -39,7 +39,7 @@ Instrument View
- New peak comparison tool on the pick tab. The user can select two peaks and information relating to their properties and the angles between them.
- New tool for computing in-plane and out-of-plane angles in Qlab space for crystal alignment.
- Added the ability to drag and drop mask workspaces onto the instrument view. This will apply the store workspace to the view.
-- Added the ability to store masking/ROI/grouping shapes to a table workspace, which can be dragged & dropped back onto different instrument views.
+- Added the ability to store masking/ROI/grouping shapes to a table workspace, which can be dragged & dropped back onto different instrument views.
Plotting Improvements
#####################
@@ -52,7 +52,7 @@ Plotting Improvements
:width: 550px
:align: right
- plotSubplots
+ plotSubplots
Algorithm Toolbox
#################
@@ -78,8 +78,8 @@ SliceViewer Improvements
:width: 450px
:align: right
- SliceViewer with nonorthogonal view
-
+ SliceViewer with nonorthogonal view
+
- Added the ability to view data using non orthogonal axes. View can be toggled on or off. When non orthogonal view is toggled the peak viewer and line viewer tools are disabled.
- Setting the thickess now means that the slicing happens between `-0.5*thicness+center` and `+0.5*thicness+center`, instead of `-thicness+center` and `+thicness+center`. For the LineViewer, the python `setPlanarWidth` and `getPlanarWidth` are still having the old behavior, but the constructor is fixed.
@@ -87,7 +87,7 @@ VSI Improvements
----------------
- ParaView updated to v5.2.0
-- The sources and views more reliably show progress in the VSI status bar.
+- The sources and views more reliably show progress in the VSI status bar.
- Added a button to the standard view which applies the threshold filter.
- Update the cut button to match the equivalent ParaView icon.
- Changed the fallback for when MDHistoworkspace was opened in the (incompatible) SplatterPlot view to the MultiSlice view.
diff --git a/docs/source/release/v3.9.2/index.rst b/docs/source/release/v3.9.2/index.rst
index 9476b5bef7b0434cd8062374e3ef44aa9a449bc4..97f5a46b016d6c36fce68a31324781e2ab271137 100644
--- a/docs/source/release/v3.9.2/index.rst
+++ b/docs/source/release/v3.9.2/index.rst
@@ -25,11 +25,11 @@ Changes in this version
-----------------------
* `19110 <https://www.github.com/mantidproject/mantid/pull/19161>`__ Fixes bug when changing group in muon analysis.
-* `19129 <https://www.github.com/mantidproject/mantid/pull/19129>`__ New CNCS geometry.
+* `19129 <https://www.github.com/mantidproject/mantid/pull/19129>`__ New CNCS geometry.
* `19161 <https://www.github.com/mantidproject/mantid/pull/19161>`__ Fixes bug when plotting after simultaneous fit.
-
+
Summary of impact
-----------------
diff --git a/docs/source/release/v4.0.0/diffraction.rst b/docs/source/release/v4.0.0/diffraction.rst
index 8ca5e471b3793a3370e4808a3bee80aeb4ff0e15..d5f6ae0f4cd8cb89c0cab041853f94e38e9e6f74 100644
--- a/docs/source/release/v4.0.0/diffraction.rst
+++ b/docs/source/release/v4.0.0/diffraction.rst
@@ -119,7 +119,7 @@ Engineering Diffraction
New
###
- Scripts added that produce the same results as the ISIS engineering gui (supports ENGINX and IMAT), this is to allow use with ISIS autoreduction. The script plots calibration automatically, like the GUI.
-- Changed 'Add Peak' button on fitting tab of gui to read 'Add Peak to List' to clarify use.
+- Changed 'Add Peak' button on fitting tab of gui to read 'Add Peak to List' to clarify use.
Bugfixes
########
diff --git a/docs/source/release/v4.0.0/indirect_inelastic.rst b/docs/source/release/v4.0.0/indirect_inelastic.rst
index 9fb1cddf2c08c2eb8d7fd8c5b7a057daad3fdee8..1457405792ff997c581b42256fe5c19917f8a16d 100644
--- a/docs/source/release/v4.0.0/indirect_inelastic.rst
+++ b/docs/source/release/v4.0.0/indirect_inelastic.rst
@@ -38,9 +38,9 @@ Improvements
- The *Fit Single Spectrum* buttons on MSDFit, I(Q,t)Fit, ConvFit and F(Q)Fit are now disabled
during fitting.
-- When the :ref:`InelasticDiffSphere <func-InelasticDiffSphere>`,
+- When the :ref:`InelasticDiffSphere <func-InelasticDiffSphere>`,
:ref:`InelasticDiffRotDiscreteCircle <func-InelasticDiffRotDiscreteCircle>`,
- :ref:`ElasticDiffSphere <func-ElasticDiffSphere>` or
+ :ref:`ElasticDiffSphere <func-ElasticDiffSphere>` or
:ref:`ElasticDiffRotDiscreteCircle <func-ElasticDiffRotDiscreteCircle>` functions are selected in
the ConvFit tab, the Q values are retrieved from the workspaces, preventing a crash when plotting
a guess.
@@ -158,7 +158,7 @@ Improvements
Bugfixes
########
-- Symmetrise tab has changed so you can no longer click the run button before preview, and
+- Symmetrise tab has changed so you can no longer click the run button before preview, and
preview will not run even if clicked unless the max or min bars on the top graph have changed
from their default.
- A bug where the output reduced files had large file sizes depending on the size of the batch
@@ -170,7 +170,7 @@ Bugfixes
interface would cause an error has been fixed.
- A bug where specifying a custom detector grouping for OSIRIS was not working has been fixed.
- A crash caused by data being loaded multiple times on the transmission tab has been fixed, as
- part of this fix the preview now shows a preview of the plot on run being clicked and not
+ part of this fix the preview now shows a preview of the plot on run being clicked and not
before as this was the cause of the issue.
- A bug caused by incorrect masked detectors during a reduction of an individual runs has been
fixed. This could sometimes cause unexpected peaks in the output plots.
@@ -222,14 +222,14 @@ Diffraction Interface
Improvements
############
-- Any zeros within the vanadium file are replaced with a substitute value of 10% the minimum
- y value found within that file. This prevents infinity values being produced when dividing the
+- Any zeros within the vanadium file are replaced with a substitute value of 10% the minimum
+ y value found within that file. This prevents infinity values being produced when dividing the
input file by the vanadium file.
Bugfixes
########
- An unexpected error when using manual grouping has been fixed.
-
+
Algorithms
----------
diff --git a/docs/source/release/v4.0.0/kafka.rst b/docs/source/release/v4.0.0/kafka.rst
index 79933fa552d1fa9b26829840d61979ea07c19f4c..d13f50aceaf0f347d46597943e349efb78cca724 100644
--- a/docs/source/release/v4.0.0/kafka.rst
+++ b/docs/source/release/v4.0.0/kafka.rst
@@ -4,10 +4,10 @@ Kafka Live Listeners
.. contents:: Table of Contents
:local:
-
+
Event and Histogram Listeners
-----------------------------
-There are two new mechanisms for listening to live data in Mantid using the Apache Kafka distributed streaming platform. The **KafkaEventListener** and the **KafkaHistoListener** allow users to
+There are two new mechanisms for listening to live data in Mantid using the Apache Kafka distributed streaming platform. The **KafkaEventListener** and the **KafkaHistoListener** allow users to
listen on a kafka stream for event and histogram data respectively. The process for using the listeners can be found in the documentation for `StartLiveData <http://docs.mantidproject.org/nightly/algorithms/StartLiveData-v1.html>`_.
Example Usage
@@ -16,8 +16,8 @@ Below is an example of using the **KafkaEventListener** from a python script in
.. code-block:: python
- StartLiveData(FromNow=False, FromStartOfRun=True, UpdateEvery=2, Instrument='SANS2D',
- Listener='KafkaEventListener', Address='sakura:9092', ProcessingAlgorithm='Rebin',
+ StartLiveData(FromNow=False, FromStartOfRun=True, UpdateEvery=2, Instrument='SANS2D',
+ Listener='KafkaEventListener', Address='sakura:9092', ProcessingAlgorithm='Rebin',
ProcessingProperties='Params=0,1000,100000', AccumulationMethod='Replace',
RunTransitionBehavior='Restart', OutputWorkspace='testout')
diff --git a/docs/source/release/v4.0.0/muon.rst b/docs/source/release/v4.0.0/muon.rst
index badd5f8d83ec8bab024a5434b2605dbc28aeacf2..d75a37b7016b3d3bd82f2b1a36bd7dd0f7e63a7a 100644
--- a/docs/source/release/v4.0.0/muon.rst
+++ b/docs/source/release/v4.0.0/muon.rst
@@ -15,7 +15,7 @@ Muon Changes
.. contents:: Table of Contents
:local:
-
+
Interface
---------
@@ -40,7 +40,7 @@ Bugfixes
- Results table now includes all logs that are common to all of the loaded files.
- When turning TF Asymmetry mode off it no longer resets the global options.
- Results table will produce correct values for co-added runs.
-- The x limits on the settings tab will now correct themselves if bad values are entered.
+- The x limits on the settings tab will now correct themselves if bad values are entered.
- The `load current run` button now works for CHRONUS in muon analysis.
- ALC interface now removes all of the fitting regions for the baseline modelling when the data changes.
- ALC interface now produces a warning if the custom grouping is not valid.
diff --git a/docs/source/release/v4.0.0/reflectometry.rst b/docs/source/release/v4.0.0/reflectometry.rst
index 5c7b4a7371bae06952f2760d8546eab218d68256..8eefff45cbc25e4361e8eddc61be1451a2ee9839 100644
--- a/docs/source/release/v4.0.0/reflectometry.rst
+++ b/docs/source/release/v4.0.0/reflectometry.rst
@@ -33,7 +33,7 @@ Improvements
- :ref:`algm-ReflectometryReductionOne` and :ref:`algm-ReflectometryReductionOneAuto` now take a parameter to pass processing instructions to the transmission workspace algorithms and no longer accept strict spectrum checking.
- Common naming of slit component name and size properties across algorithms.
- :ref:`algm-SpecularReflectionPositionCorrect` is now compatible with the reflectometers at ILL.
-- :ref:`algm-CreateTransmissionWorkspace` and :ref:`algm-CreateTransmissionWorkspaceAuto` now use NormalizeByIntegratedMontitors instead of using MonitorIntegrationWavelengthMin and MonitorIntegrationWavelengthMax being defined, to determine how to normalize.
+- :ref:`algm-CreateTransmissionWorkspace` and :ref:`algm-CreateTransmissionWorkspaceAuto` now use NormalizeByIntegratedMontitors instead of using MonitorIntegrationWavelengthMin and MonitorIntegrationWavelengthMax being defined, to determine how to normalize.
- ILL reflectometry algorithms name changes: *LinePosition* replaces *BeamCentre*, *DirectLineWorkspace* replaces *DirectBeamWorkspace*, and *TwoTheta* is the preferred input property which replaces *BraggAngle*.
- :ref:`algm-ReflectometryILLPreprocess` does not accept and will not output an `OutputBeamPositionWorkspace`. The peak position and two theta scattering anlge are now present in the SampleLog information as documented.
- ILL's D17 and Figaro instrument definition files are modified to let the detector ID's begin with index 0 instead of 1.
diff --git a/docs/source/release/v4.1.0/mantidplot.rst b/docs/source/release/v4.1.0/mantidplot.rst
index 8be945f3a7033ca6839895a1f97df94b1bfd9393..4923a19a702d3b45a486f815716de20a63366661 100644
--- a/docs/source/release/v4.1.0/mantidplot.rst
+++ b/docs/source/release/v4.1.0/mantidplot.rst
@@ -9,7 +9,7 @@ MantidPlot Changes
:class: screenshot
:width: 500px
:align: right
-
+
Improvements
############
diff --git a/docs/source/release/v4.2.0/index.rst b/docs/source/release/v4.2.0/index.rst
index 29a8dafa78622ece4743bccfeff6dcc2102463c6..cce20df2186e935e85dd0ab1d0206a0922ed0297 100644
--- a/docs/source/release/v4.2.0/index.rst
+++ b/docs/source/release/v4.2.0/index.rst
@@ -16,12 +16,12 @@ We are proud to announce version 4.2.0 of Mantid.
**THIS IS THE LAST RELEASE THAT WILL SUPPORT Python 2**
-| From v4.3 onwards Mantid will no longer support Python 2 and scripts run in Mantid will have to change to reflect this. `Time is Ticking <https://pythonclock.org/>`_!
+| From v4.3 onwards Mantid will no longer support Python 2 and scripts run in Mantid will have to change to reflect this. `Time is Ticking <https://pythonclock.org/>`_!
| NB. Mantid v4.3 will be released near the End of February 2020.
| *Interfaces, interfaces, interfaces*! Hard to say but Easy to use!
-| One of the major changes for this release is the new Direct :ref:`ALF View <ALF_View-ref>` GUI for aligning samples on the ALF Instrument. There have also been serious developments in the :doc:`Indirect <indirect_geometry>` Interfaces:
-| The Analysis and Bayes Interfaces have been introduced to Mantid Workbench and all interfaces will accept lists to plot multiple spectra.
+| One of the major changes for this release is the new Direct :ref:`ALF View <ALF_View-ref>` GUI for aligning samples on the ALF Instrument. There have also been serious developments in the :doc:`Indirect <indirect_geometry>` Interfaces:
+| The Analysis and Bayes Interfaces have been introduced to Mantid Workbench and all interfaces will accept lists to plot multiple spectra.
| Generally usuability has been improved, such as the cleaner :doc:`ISIS SANS <sans>` Interface and the multiple improvements in Workbench. The Script Repository has even been added into :doc:`Workbench <mantidworkbench>`!
These are just a few of the many improvements in this release, so please take a
diff --git a/docs/source/release/v4.2.0/mantidworkbench.rst b/docs/source/release/v4.2.0/mantidworkbench.rst
index 1778098dea309d6354c7a707f80a715e704a4999..429f942b557f5ed27310eedc4cdad642a06c312a 100644
--- a/docs/source/release/v4.2.0/mantidworkbench.rst
+++ b/docs/source/release/v4.2.0/mantidworkbench.rst
@@ -54,7 +54,7 @@ Scripting
:class: screenshot
:width: 900px
:align: center
-
+
*Tiled Plots in Workbench!!!*
|
@@ -118,15 +118,15 @@ Bugfixes
- Workspaces contained within groups are no longer duplicated when saving a project.
- The button to "Remove" a curve in Figure Options is now the same size as the drop-down list of curves.
- "MantidPlot" in window titles have been removed.
-- If multiple plots of the same workspace are open, the fit property browser will change the default output name so any output workspaces are not overridden.
+- If multiple plots of the same workspace are open, the fit property browser will change the default output name so any output workspaces are not overridden.
- When showing the data table for a sqw workspace the vertical header now shows the bin center value and unit.
- Fixes an issue where opening any help menu after previously opening the help menu in the Manage User Directories window would crash Workbench.
Known Issues
#############
-- Changing the scale of a Colorbar to Logarithmic may result in no tick labels being added. This is an issue with how matplotlib tries to deal with a Min Colorbar value of 0. Hopefully we will find a way around this for a future release.
- For now, in Figure Options (Gear Icon on a Colorfill plot), under the Images Tab, change the Min value to 1 or a small positive value. The logarithmic tick marks should now appear and the Min and Max values can be altered appropriately to produce the best plot for the data. See the Images below for an example of before and after this change:
+- Changing the scale of a Colorbar to Logarithmic may result in no tick labels being added. This is an issue with how matplotlib tries to deal with a Min Colorbar value of 0. Hopefully we will find a way around this for a future release.
+ For now, in Figure Options (Gear Icon on a Colorfill plot), under the Images Tab, change the Min value to 1 or a small positive value. The logarithmic tick marks should now appear and the Min and Max values can be altered appropriately to produce the best plot for the data. See the Images below for an example of before and after this change:
|
@@ -134,7 +134,7 @@ Known Issues
:class: screenshot
:width: 900px
:align: center
-
+
*Before: Min is 0 and no Colorbar Tick Marks; After: Min is changed to 1 snf Colorbar Tick Marks Appear!!!*
|
diff --git a/docs/source/release/v4.2.0/muon.rst b/docs/source/release/v4.2.0/muon.rst
index 47eb9edb86a4565eb6583458d5c5f80132c88b3d..0e89c47fa5954d80b77eda64c7d2f97876d487d7 100644
--- a/docs/source/release/v4.2.0/muon.rst
+++ b/docs/source/release/v4.2.0/muon.rst
@@ -42,7 +42,7 @@ New
- :ref:`ZFdipole <func-ZFdipole>`
- :ref:`ZFelectronDipole <func-ZFelectronDipole>`
- :ref:`ZFMuonium <func-ZFMuonium>`
- - :ref:`ZFprotonDipole <func-ZFprotonDipole>`
+ - :ref:`ZFprotonDipole <func-ZFprotonDipole>`
Improvements
############
@@ -72,8 +72,8 @@ Muon Analysis 2 and Frequency Domain Interfaces
- When switching between Data Sets, Groups selected to fit are remembered.
- The Frequency Domain>Transform>FFT tab now uses Group Pair Selection to guess at the User's selection for workspaces.
- Can now plot FFT's of PhaseQuad data.
-- Both interfaces work with Project Recovery.
-- The original Muon Analysis GUI has been renamed "Muon Analysis Old" and has been deprecated.
+- Both interfaces work with Project Recovery.
+- The original Muon Analysis GUI has been renamed "Muon Analysis Old" and has been deprecated.
- \* **The new Muon Analysis GUI has been renamed Muon Analysis.** \*
Bug Fixes
diff --git a/docs/source/release/v4.2.0/reflectometry.rst b/docs/source/release/v4.2.0/reflectometry.rst
index dc5f8581b9421148784ea37f76bd84293e2f2b19..fe178f615c961eb78b9c7269f93c3b3e2f1b7220 100644
--- a/docs/source/release/v4.2.0/reflectometry.rst
+++ b/docs/source/release/v4.2.0/reflectometry.rst
@@ -4,7 +4,7 @@ Reflectometry Changes
.. contents:: Table of Contents
:local:
-
+
ISIS Reflectometry Interface
----------------------------
@@ -14,7 +14,7 @@ ISIS Reflectometry Interface
:width: 500px
:align: right
:alt: New features on the ISIS Reflectometry interface
-
+
*New features on the ISIS Reflectometry interface*
New
diff --git a/docs/source/release/v4.2.0/sans.rst b/docs/source/release/v4.2.0/sans.rst
index d3c7eb7efc92c5adc12839d834bae87b647ffaf7..1c57cb3350b9fd50e0411ff31030e4006a094614 100644
--- a/docs/source/release/v4.2.0/sans.rst
+++ b/docs/source/release/v4.2.0/sans.rst
@@ -8,7 +8,7 @@ SANS Changes
New
###
-- Support for shifting both monitor 4 and 5 on Zoom including a new setting in the
+- Support for shifting both monitor 4 and 5 on Zoom including a new setting in the
ISIS SANS GUI. A new user file command has also been added to
perform monitor shifts without changing the selected transmission spectrum.
- New :ref:`HFIRSANS2Wavelength <algm-HFIRSANS2Wavelength-v1>` algorithm to "convert" CG2 event files
diff --git a/docs/source/release/v5.0.0/diffraction.rst b/docs/source/release/v5.0.0/diffraction.rst
index b2c48927723113c3a961dd5d52c37b9b97b04adf..1dcf5e2c1e10ffa642b905f133da266ff9a58623 100644
--- a/docs/source/release/v5.0.0/diffraction.rst
+++ b/docs/source/release/v5.0.0/diffraction.rst
@@ -52,7 +52,7 @@ Single Crystal Diffraction
:class: screenshot
:width: 500px
-- The output peak workspace from :ref:`PredictFractionalPeaks<algm-PredictFractionalPeaks-v1>` now keeps the same lattice parameters as the input workspace.
+- The output peak workspace from :ref:`PredictFractionalPeaks<algm-PredictFractionalPeaks-v1>` now keeps the same lattice parameters as the input workspace.
- :ref:`SaveReflections <algm-SaveReflections>` now has the option to save peaks to separate files based on their associated modulation vectors when using the Jana format.
- ``IndexPeaksWithSatellites`` has been deleted as it had been deprecated and superseded by :ref:`IndexPeaks <algm-IndexPeaks-v1>`.
diff --git a/docs/source/release/v5.0.0/framework.rst b/docs/source/release/v5.0.0/framework.rst
index c8c7f1e7f711219239128fab61b2d1f8d68e77b3..44b0fcfd68da24b351b4321eff1daa5628dc98cf 100644
--- a/docs/source/release/v5.0.0/framework.rst
+++ b/docs/source/release/v5.0.0/framework.rst
@@ -42,7 +42,7 @@ Algorithms
- :ref:`MonteCarloAbsorption <algm-MonteCarloAbsorption>` Sampling of scattering points during MC simulation now takes into account relative volume of sample and environment components. The calculation also now reuses the same set of simulated tracks to calculate the attenuation for different wavelengths. A new parameter ResimulateTracksForDifferentWavelengths has been added to control this behaviour with a default value of false. NOTE: This has been inserted in the middle of the parameter list so any usage of positional parameters with this algorithm will need to be adjusted.
- :ref:`AddSampleLogMultiple <algm-AddSampleLogMultiple>` Add parameter LogTypes to specify the type of each log value.
- :ref:`ApplyCalibration <algm-ApplyCalibration>` can now independently change the pixel heights, widths, and Y-coordinate. Property "PositionTable" has been deprecated and property "CalibrationTable" should be used in its place.
-- :ref:`FilterEvents <algm-FilterEvents>` Now has an accurate algorithm to calculate duration of each split-out workspace and add the duration value to split-out workspace as a single value property named "duration".
+- :ref:`FilterEvents <algm-FilterEvents>` Now has an accurate algorithm to calculate duration of each split-out workspace and add the duration value to split-out workspace as a single value property named "duration".
Data Handling
diff --git a/docs/source/release/v5.0.0/index.rst b/docs/source/release/v5.0.0/index.rst
index 89f0ea5f4e27a6420cc6081fe491e8dff03aa502..658d206c416e19ac489783ba87fc35d46f3619fb 100644
--- a/docs/source/release/v5.0.0/index.rst
+++ b/docs/source/release/v5.0.0/index.rst
@@ -24,7 +24,7 @@ For this release we have fully migrated all scripts in the Mantid Script Reposit
Other highlights include:
- *Waterfall Plots* in Workbench
-- *Settings menu* in Workbench, with options to set your plot preferences, such as Marker Style and Errorbar Capsize
+- *Settings menu* in Workbench, with options to set your plot preferences, such as Marker Style and Errorbar Capsize
- *Brand new Engineering Diffraction interface*
- Several performance improvements, in particular relating to scripts.
- Redesign of the Muon Analysis and Frequency Domain Interfaces.
diff --git a/docs/source/release/v5.0.0/reflectometry.rst b/docs/source/release/v5.0.0/reflectometry.rst
index 665d8dbad30024eec7214e1b837a5b073d4cb5e0..9f950fc98e8f06130b47bd9c25f7eaebcd29fee3 100644
--- a/docs/source/release/v5.0.0/reflectometry.rst
+++ b/docs/source/release/v5.0.0/reflectometry.rst
@@ -33,18 +33,18 @@ New
- **Note that this may break existing scripts if you assign outputs directly to a python list:**
e.g. if previously you called an algorithm as:
-
+
``qbin, q = ReflectometryReductionOneAuto(InputWorkspace=run, FirstTransmissionRun=trans, ThetaIn=0.7)``
-
+
then this will now need to be as follows (note that the optional ``IvsLam`` also needs to be added here because it is declared before the transmission output and the list must always be in the same order):
-
+
``qbin, q, lam, trans = ReflectometryReductionOneAuto(InputWorkspace=run, FirstTransmissionRun=trans, ThetaIn=0.7)``
If your scripts use the output property instead then they will not be affected, e.g. calls like this will still work as before:
-
+
``ReflectometryReductionOneAuto(InputWorkspace=run, FirstTransmissionRun=trans, ThetaIn=0.7, OutputWorkspaceBinned='qbin')``
-
+
Bug fixes
---------
diff --git a/docs/source/release/v5.1.0/framework.rst b/docs/source/release/v5.1.0/framework.rst
index 27d59e1f46f0d8ab63b64e07aec571528a5b8ddd..db2ef8b3289fd770b52468c843d27b3aa0b0841a 100644
--- a/docs/source/release/v5.1.0/framework.rst
+++ b/docs/source/release/v5.1.0/framework.rst
@@ -45,7 +45,7 @@ Algorithms
ClearMaskedSpectra has been removed as it no longer has a use,
and :ref:`MaskInstrument <algm-MaskInstrument>` is now deprecated and you should use :ref:`MaskDetectors <algm-MaskDetectors>` instead.
-- Enhanced :ref:`LoadNGEM <algm-LoadNGEM>` to handle partially written events in the data file.
+- Enhanced :ref:`LoadNGEM <algm-LoadNGEM>` to handle partially written events in the data file.
When such incomplete data is encountered, it is skipped until the next valid data is encountered and a warning is printed at algorithm completion of the total number of data bytes discarded.
- Added specialization to :ref:`SetUncertainties <algm-SetUncertainties>` for the
@@ -73,7 +73,7 @@ Data Handling
:align: right
:alt: An example of a CAD 3D Geometry
:width: 600 px
-
+
An example of a CAD 3D Geometry - Not typically found on beamlines
- **The sample environment xml file now supports the geometry being supplied in the form of a .3mf format file (so far on the Windows platform only). Previously it only supported** ``.stl`` **files. The** ``.3mf`` **format is a 3D printing format that allows multiple mesh objects to be stored in a single file that can be generated from many popular CAD applications. As part of this change the algorithms** :ref:`LoadSampleEnvironment <algm-LoadSampleEnvironment>` **and** :ref:`SaveSampleEnvironmentAndShape <algm-SaveSampleEnvironmentAndShape>` **have been updated to also support the .3mf format.**
diff --git a/docs/source/release/v5.1.0/index.rst b/docs/source/release/v5.1.0/index.rst
index df0ad321865451f0790d45ac1b649881ec131da2..f0cf778f7d7cfba5ee1e504fa6f2f2eaacb4d214 100644
--- a/docs/source/release/v5.1.0/index.rst
+++ b/docs/source/release/v5.1.0/index.rst
@@ -17,10 +17,10 @@ We are proud to announce version 5.1.0 of Mantid.
:doc:`MantidWorkbench <mantidworkbench>` **is replacing MantidPlot**. While :doc:`MantidPlot <mantidplot>` is still fully functional for this release,
**MantidPlot will not be included in future releases**.
-:doc:`Sliceviewer <sliceviewer>` has been majorly updated this release, with advanced features for peak finding in Single Crystal Diffraction data.
+:doc:`Sliceviewer <sliceviewer>` has been majorly updated this release, with advanced features for peak finding in Single Crystal Diffraction data.
On top of this, taking slices of data is now possible and there is an interactive data table last seen in the Spectrum Viewer in MantidPlot. **Workbench now also supports 3D and Advanced plotting!**
-Check out the brand new :ref:`DrILL interface <DrILL-ref>` for Workbench, that currently supports SANS and Reflectometry at ILL.
+Check out the brand new :ref:`DrILL interface <DrILL-ref>` for Workbench, that currently supports SANS and Reflectometry at ILL.
There have also been many upgrades to our existing interfaces, such as providing background subtraction for ISIS Reflectometry and significant speed up for the Muon and Indirect interfaces.
These are just some of the many improvements in this release, so please take a
diff --git a/docs/source/release/v5.1.0/muon.rst b/docs/source/release/v5.1.0/muon.rst
index a7ede25252f3c13ddfbda1687f06e0f945db48a3..3ce2c18bb4edea24d27c887205e4154e636b6370 100644
--- a/docs/source/release/v5.1.0/muon.rst
+++ b/docs/source/release/v5.1.0/muon.rst
@@ -83,7 +83,7 @@ Bug fixes
- Fixed a bug in simultaneous TF asymmetry mode fitting, which would cause a crash when the run
was incremented. Note that currently the single fitting tab will not update with the new normalization
constants after a new run is loaded.
-- Fixed a bug were fitting in TF asymmetry mode for group data, then switching instrument and
+- Fixed a bug were fitting in TF asymmetry mode for group data, then switching instrument and
loading pair data would cause mantid to crash.
ALC
@@ -99,13 +99,13 @@ Improvements
############
- The ALC interface in workbench will now show errors by default. The error bars can also be
turned on/off using the right-click plot menu.
-
+
Bug fixes
##########
- Fixed an issue in the ALC interface baseline fit where corrected data from all fits were plotted at
the same time in the corrected data tab. Now only corrected data from the most recent fit is plotted.
-Elemental Analysis
+Elemental Analysis
------------------
New Features
diff --git a/docs/source/release/v5.1.0/reflectometry.rst b/docs/source/release/v5.1.0/reflectometry.rst
index 20ce6c973a5184e42367f2f9da4089afad1ba2ed..59a6066ecf601ba17a2c92073c193b96e1ca2847 100644
--- a/docs/source/release/v5.1.0/reflectometry.rst
+++ b/docs/source/release/v5.1.0/reflectometry.rst
@@ -30,7 +30,7 @@ Improvements
- The leading separator is no longer included for Custom and ANSTO formats in the
:ref:`algm-SaveReflectometryAscii` algorithm; Custom format header now uses the same separator as the
columns and includes the 4th column header if applicable.
-
+
Bug fixes
#########
@@ -45,7 +45,7 @@ Removed
- The following deprecated algorithms have been removed: ``SaveANSTOAscii``, ``SaveILLCosmosAscii``,
``SaveReflCustomAscii``, and ``SaveReflThreeColumnAscii``. They have been replaced by :ref:`algm-SaveReflectometryAscii`.
-
+
ISIS Reflectometry Interface
----------------------------
diff --git a/docs/source/release/v5.1.1/index.rst b/docs/source/release/v5.1.1/index.rst
index 53e2bc518da77fb78d88378aa9598441f5def6d0..e9425b87c294adc2ed31624582118abb9eeac3c2 100644
--- a/docs/source/release/v5.1.1/index.rst
+++ b/docs/source/release/v5.1.1/index.rst
@@ -26,7 +26,7 @@ The main changes are:
- fixed an unhandled exception when marking columns in a table workspace for plotting or deleting rows
from a PeaksWorkspace
-
+
- updated ALC documentation to clarify instrument used for data loading
- avoid error reporter on entering comma in scale box in MSlice
diff --git a/docs/source/techniques/Calibration_implementation.rst b/docs/source/techniques/Calibration_implementation.rst
index c180d7584186fa2a56bef7164c0c402a2d07cef2..89757daf5953fd20609f1f79a05b9bffdb991157 100644
--- a/docs/source/techniques/Calibration_implementation.rst
+++ b/docs/source/techniques/Calibration_implementation.rst
@@ -9,19 +9,19 @@ TubeSpec
------------------
.. autoclass:: tube_spec.TubeSpec
- :members:
+ :members:
TubeCalibFitParams
------------------
.. autoclass:: tube_calib_fit_params.TubeCalibFitParams
- :members:
+ :members:
IdealTube
---------
.. autoclass:: ideal_tube.IdealTube
- :members:
+ :members:
.. categories:: Techniques
diff --git a/docs/source/techniques/CrystalField.rst b/docs/source/techniques/CrystalField.rst
index 927fb76522cde1dbeb67d9183bb6adf8be230f49..a7f3f9dda64f784a8e9525775b8b8cfda74be1af 100644
--- a/docs/source/techniques/CrystalField.rst
+++ b/docs/source/techniques/CrystalField.rst
@@ -10,10 +10,10 @@ This page contains specific worked examples. The data files can be found `here <
.. contents:: Table of contents
:local:
-
+
Fitting INS spectrum
====================
-
+
.. code-block:: python
from CrystalField import CrystalField, CrystalFieldFit
@@ -21,7 +21,7 @@ Fitting INS spectrum
data_ws1 = Load('NdOs2Al10_5K35meV_Ecut_0to3ang_bp15V1.xye')
# Set up the crystal field model.
- cf = CrystalField('Nd', 'C2v', Temperature=5, FWHM=1,
+ cf = CrystalField('Nd', 'C2v', Temperature=5, FWHM=1,
B20=0.19, B22=0.11, B40=-0.0004, B42=-0.002, B44=-0.012, B60=5.e-05, B62=0.00054, B64=-0.0006, B66=0.0008)
cf.PeakShape = 'Lorentzian'
cf.IntensityScaling = 2 # Scale factor if data is not in absolute units (mbarn/sr/f.u./meV), will be fitted.
@@ -40,8 +40,8 @@ Fitting INS spectrum
table = mtd['fit_Parameters']
print ('Cost function value = '+str(table.row(table.rowCount()-1)['Value']))
-
-
+
+
|FittingINSSpectrum.png|
@@ -52,7 +52,7 @@ Fitting with resolution function
from CrystalField import CrystalField, CrystalFieldFit, Background, Function, ResolutionModel
from PyChop import PyChop2
-
+
# load the data
data_ws1 = Load('MER38435_10p22meV.txt')
data_ws2 = Load('MER38436_10p22meV.txt')
@@ -61,7 +61,7 @@ Fitting with resolution function
merlin = PyChop2('MERLIN', 'G', 250.)
merlin.setEi(10.)
resmod = ResolutionModel(merlin.getResolution, xstart=-10, xend=9.0, accuracy=0.01)
-
+
Kelvin_to_meV = 1./11.6
# Parameters from https://doi.org/10.1016/0921-4526(91)90575-Y
@@ -96,13 +96,13 @@ Fitting with resolution function
axs[0].set_xlabel('')
fig.tight_layout()
fig.show()
-
+
|FittingWithResolutionFunction.png|
-
+
Fitting magnetic susceptibility
===============================
-
+
.. code-block:: python
from CrystalField import CrystalField, CrystalFieldFit, PhysicalProperties
@@ -112,7 +112,7 @@ Fitting magnetic susceptibility
sus_b = Load('NdOs2Al10_sus_b.txt')
sus_c = Load('NdOs2Al10_sus_c.txt')
- cf = CrystalField('Nd', 'C2v',
+ cf = CrystalField('Nd', 'C2v',
B20=0.19, B22=0.11, B40=-0.0004, B42=-0.002, B44=-0.012, B60=5.e-05, B62=0.00054, B64=-0.0006, B66=0.0008)
# Simultaneously fit data measured in a, b and c directions
@@ -142,10 +142,10 @@ Fitting magnetic susceptibility
plt.xlabel('Temperature (K)')
plt.ylabel('Inverse Susceptibility (mol/emu)')
plt.show()
-
-
+
+
|FittingMagneticSusceptibility.png|
-
+
.. Avoid Fitting INS spectrum and susceptibility simultaneously
.. Avoid ======================================================
@@ -163,7 +163,7 @@ Fitting multiple INS spectra
data_ws3=Load(datadir+'cecuga3Mlacuga3fp824_15meV100K0to2p5angbp2V1.xye')
# Set up the crystal field model for multiple spectra.
- # This is indicated by the number of elements in the list of temperatures.
+ # This is indicated by the number of elements in the list of temperatures.
# Optionally other parameters like FWHM and IntensityScaling can be lists if these initial parameters for each
# spectra should differ.
cf = CrystalField('Ce', 'C4v', Temperature=[5,50,100], FWHM=[1,1,1], B20=0.0633, B40=0.01097, B44=0.09985)
@@ -210,11 +210,11 @@ Fitting multiple INS spectra
.. |FittingWithResolutionFunction.png| image:: /images/FittingWithResolutionFunction.png
-.. |FittingMagneticSusceptibility.png| image:: /images/FittingMagneticSusceptibility.png
+.. |FittingMagneticSusceptibility.png| image:: /images/FittingMagneticSusceptibility.png
.. |FittingMultipleINSSpectra_0.png| image:: /images/FittingMultipleINSSpectra_0.png
:width: 33%
-
+
.. |FittingMultipleINSSpectra_1.png| image:: /images/FittingMultipleINSSpectra_1.png
:width: 33%
diff --git a/docs/source/techniques/DirectILL.rst b/docs/source/techniques/DirectILL.rst
index be2b4685aa0bf6ddfb64f15119e7f60e86703f6a..5b45482c8a2ba297e1bd571af80a00098d8e6231 100644
--- a/docs/source/techniques/DirectILL.rst
+++ b/docs/source/techniques/DirectILL.rst
@@ -71,7 +71,7 @@ On instruments like IN4 and IN6, these steps would translate to something like t
# Uncomment to add a temporary data search directory.
#mantid.config.appendDataSearchDir('/data/')
-
+
# Vanadium
DirectILLCollectData(
Run='ILL/IN4/085801-085802.nxs',
@@ -118,7 +118,7 @@ The basic reduction for IN5 and PANTHER differs slightly with regards to the dia
# Uncomment to add a temporary data search directory.
#mantid.config.appendDataSearchDir('/data/')
-
+
# Vanadium
DirectILLCollectData(
Run='085801-085802',
@@ -274,7 +274,7 @@ The above workflow would translate to this kind of Python script for IN4 and IN6
# Uncomment to add a temporary data search directory.
#mantid.config.appendDataSearchDir('/data/')
-
+
# Vanadium
DirectILLCollectData(
Run='ILL/IN4/085801-085801.nxs',
@@ -417,7 +417,7 @@ A corresponding Python script follows.
# Uncomment to add a temporary data search directory.
#mantid.config.appendDataSearchDir('/data/')
-
+
# Vanadium
DirectILLCollectData(
Run='ILL/IN4/085801-085802.nxs',
@@ -586,7 +586,7 @@ Lets put it all together into a complex Python script. The script below reduces
# Uncomment to add a temporary data search directory.
#mantid.config.appendDataSearchDir('/data/')
-
+
# Vanadium
DirectILLCollectData(
Run='ILL/IN4/085801-085802.nxs',
@@ -627,7 +627,7 @@ Lets put it all together into a complex Python script. The script below reduces
Run='ILL/IN4/087311-087314.nxs',
OutputWorkspace='container_100K',
IncidentEnergyWorkspace='Ei' # Ensure common TOF axis
- )
+ )
# Sample self-shielding and container subtraction.
geometry = {
'Shape': 'HollowCylinder',
diff --git a/docs/source/techniques/DirecttoolsPythonModule.rst b/docs/source/techniques/DirecttoolsPythonModule.rst
index 625c6bbfef5fe1d1add7d6b15fea57662bd4b9af..0c095c560bb03cf2ae914dc0c164f9ad18c70f6d 100644
--- a/docs/source/techniques/DirecttoolsPythonModule.rst
+++ b/docs/source/techniques/DirecttoolsPythonModule.rst
@@ -61,10 +61,10 @@ An important aspect of examining the :math:`S(Q,E)` workspace is to plot cuts at
import directtools as dt
from mantid.simpleapi import *
import warnings
-
+
DirectILLCollectData(Run='ILL/IN4/084447.nxs', OutputWorkspace='data')
DirectILLReduction(InputWorkspace='data', OutputWorkspace='SofQW')
-
+
Q = 2.
dQ = 0.2
# plotconstQ produces a warning on some versions of numpy.
@@ -82,10 +82,10 @@ Any of the workspace, cut centre or cut width arguments can be a :class:`list` i
import directtools as dt
from mantid.simpleapi import *
-
+
DirectILLCollectData(Run='ILL/IN4/084447.nxs', OutputWorkspace='data')
DirectILLReduction(InputWorkspace='data', OutputWorkspace='SofQW')
-
+
Q1 = 2.
Q2 = 3.
dQ = 0.2
@@ -101,10 +101,10 @@ If a line profile already exists, it can be plotted using :func:`directtools.plo
import directtools as dt
from mantid.simpleapi import *
-
+
DirectILLCollectData(Run='ILL/IN4/084447.nxs', OutputWorkspace='data')
DirectILLReduction(InputWorkspace='data', OutputWorkspace='SofQW')
-
+
E1 = 8.
dE = 2.
cut1 = LineProfile('SofQW', E1, dE, 'Horizontal')
@@ -143,10 +143,10 @@ Convenience tools
import directtools as dt
from mantid.simpleapi import *
-
+
DirectILLCollectData(Run='ILL/IN4/084447.nxs', OutputWorkspace='data')
DirectILLReduction(InputWorkspace='data', OutputWorkspace='SofQW')
-
+
# Works on any workspace, not just S(Q,E).
logs = dt.SampleLogs('SofQW')
print(logs.instrument.name)
diff --git a/docs/source/techniques/ISISPowder-GEM-v1.rst b/docs/source/techniques/ISISPowder-GEM-v1.rst
index b53adf8d08f5c81e056c78d7bfd952a74aeb74a6..0b7679dc1e8172f6642608e2e6a8885751ccc261 100644
--- a/docs/source/techniques/ISISPowder-GEM-v1.rst
+++ b/docs/source/techniques/ISISPowder-GEM-v1.rst
@@ -195,8 +195,8 @@ Example
# Notice how the filename ends with .yaml
cal_mapping_file = r"C:\path\to\cal_mapping.yaml"
-
- gem_example.create_cal(run_number=87618,
+
+ gem_example.create_cal(run_number=87618,
calibration_mapping_file=cal_mapping_file)
@@ -267,7 +267,7 @@ calibration_to_adjust
^^^^^^^^^^^^^^^^^^^^^
*Optional*
-This Parameter contains the path to an offsets .cal file to adjust using
+This Parameter contains the path to an offsets .cal file to adjust using
the automatic cal file generation.
.. _calibration_directory_gem_isis-powder-diffraction-ref:
@@ -567,7 +567,7 @@ save_all
*Optional*
This parameter specifies whether or not all files should be saved on
-texture mode, if this is set to false then the .nxs and .gsas files will not be
+texture mode, if this is set to false then the .nxs and .gsas files will not be
saved out. If unset then this defaults to True.
Example Input:
@@ -725,7 +725,7 @@ set to the following:
cross_corr_reference_spectra: 5000
-
+
.. _cross_corr_ws_index_max_gem_isis-powder-diffraction-ref:
cross_corr_ws_index_max
@@ -739,7 +739,7 @@ set to the following:
cross_corr_ws_index_max: 6450
-
+
.. _cross_corr_ws_index_min_gem_isis-powder-diffraction-ref:
cross_corr_ws_index_min
@@ -753,7 +753,7 @@ set to the following:
cross_corr_ws_index_min: 11
-
+
.. _cros_cor_x_max_gem_isis-powder-diffraction-ref:
cross_cor_x_max
@@ -817,7 +817,7 @@ is set to the following:
get_det_offsets_x_max: 200
-
+
.. _get_det_offsets_x_min_gem_isis-powder-diffraction-ref:
get_det_offsets_x_min
@@ -829,7 +829,7 @@ is set to the following:
.. code-block:: python
get_det_offsets_x_min: -200
-
+
.. _focused_cropping_values_gem_isis-powder-diffraction-ref:
diff --git a/docs/source/techniques/ISISPowder-HRPD-v1.rst b/docs/source/techniques/ISISPowder-HRPD-v1.rst
index 0429344d295ad2e1340b0321937a5f02e2c8b2ee..d9eef9a38dcf5f349609bf49d91a50aa1e8ff945 100644
--- a/docs/source/techniques/ISISPowder-HRPD-v1.rst
+++ b/docs/source/techniques/ISISPowder-HRPD-v1.rst
@@ -55,7 +55,7 @@ The following methods can be executed on an HRPD object:
- :ref:`create_vanadium_hrpd_isis-powder-diffraction-ref`
- :ref:`focus_hrpd_isis-powder-diffraction-ref`
- :ref:`set_sample_hrpd_isis-powder-diffraction-ref`
-
+
.. _create_vanadium_hrpd_isis-powder-diffraction-ref:
create_vanadium
@@ -73,7 +73,7 @@ On HRPD the following parameters are required when executing
- :ref:`do_absorb_corrections_hrpd_isis-powder-diffraction-ref`
- :ref:`first_cycle_run_no_hrpd_isis-powder-diffraction-ref`
- :ref:`window_hrpd_isis-powder-diffraction-ref`
-
+
If :ref:`do_absorb_corrections_hrpd_isis-powder-diffraction-ref` is set to
**True** the following parameter is required in addition to the above:
@@ -95,7 +95,7 @@ Example
first_cycle_run_no=66058, window="10-110",
do_absorb_correction=True,
multiple_scattering=False)
-
+
.. _focus_hrpd_isis-powder-diffraction-ref:
focus
@@ -142,7 +142,7 @@ Example
vanadium_normalisation=True, do_absorb_corrections=True,
sample_empty=66829, sample_empty_scale=1,
multiple_scattering=False, window="10-110")
-
+
.. _set_sample_hrpd_isis-powder-diffraction-ref:
set_sample
@@ -171,8 +171,8 @@ Example
hrpd_example.set_sample(sample=sample_obj)
-.. _calibration_mapping_hrpd_isis-powder-diffraction-ref:
-
+.. _calibration_mapping_hrpd_isis-powder-diffraction-ref:
+
Calibration Mapping File
------------------------
The calibration mapping file holds the mapping between run numbers,
@@ -290,7 +290,7 @@ Example Input:
hrpd_example.create_vanadium(do_absorb_corrections=True, ...)
# Or (this assumes sample details have already been set)
hrpd_example.focus(do_absorb_corrections=True, ...)
-
+
.. _first_cycle_run_no_hrpd_isis-powder-diffraction-ref:
first_cycle_run_no
@@ -355,13 +355,13 @@ run_number
Specifies the run number(s) to process when calling the
:ref:`focus_hrpd_isis-powder-diffraction-ref` method.
-This parameter accepts a single value or a range
+This parameter accepts a single value or a range
of values with the following syntax:
-**-** : Indicates a range of runs inclusive
+**-** : Indicates a range of runs inclusive
(e.g. *1-10* would process 1, 2, 3....8, 9, 10)
-**,** : Indicates a gap between runs
+**,** : Indicates a gap between runs
(e.g. *1, 3, 5, 7* would process run numbers 1, 3, 5, 7)
These can be combined like so:
@@ -393,7 +393,7 @@ This input uses the same syntax as
*Note: If this is set to anything other than* **False**,
:ref:`sample_empty_scale_hrpd_isis-powder-diffraction-ref` *must also
be specified*
-
+
Example Input:
.. code-block:: python
@@ -466,8 +466,8 @@ Example Input
..code-block:: python
- hrpd_example.create_vanadium(do_solid_angle_corrections=True, ...)
- hrpd_example.focus(do_solid_angle_corrections=True, ...)
+ hrpd_example.create_vanadium(do_solid_angle_corrections=True, ...)
+ hrpd_example.focus(do_solid_angle_corrections=True, ...)
.. _user_name_hrpd_isis-powder-diffraction-ref:
@@ -502,7 +502,7 @@ Example Input:
.. code-block:: python
hrpd_example.focus(do_van_normalisation=True, ...)
-
+
.. _window_hrpd_isis-powder-diffraction-ref:
window
@@ -551,7 +551,7 @@ On HRPD this is set to the following:
-0.0007, # Bank 2
-0.0012 # Bank 3
]
-
+
focused_cropping_values
^^^^^^^^^^^^^^^^^^^^^^^
@@ -574,14 +574,14 @@ On HRPD this is set to the following:
(1e4, 1.2e5), # Bank 2
(1.1e4, 1.15e5) # Bank 3
]
-
+
# window = "30-130"
focused_cropping_values = [
(3e4, 1.3e5), # Bank 1
(2.84e4, 1.42e5), # Bank 2
(3e4, 1.37e5) # Bank 3
]
-
+
# window = "100-200"
focused_cropping_values = [
(1e5, 2.02e5), # Bank 1
@@ -597,7 +597,7 @@ On HRPD this is set to the following:
]
.. _grouping_file_name_hrpd_isis-powder-diffraction-ref:
-
+
grouping_file_name
^^^^^^^^^^^^^^^^^^
The name of the grouping calibration file which is located within the
@@ -610,7 +610,7 @@ is used when focusing the spectra into banks.
On HRPD this is set to the following:
.. code-block:: python
-
+
grouping_file_name = "hrpd_new_072_01_corr.cal"
.. _nxs_filename_hrpd_isis-powder-diffraction-ref:
@@ -674,7 +674,7 @@ On HRPD this is set to the following:
spline_coefficient = 70
-
+
vanadium_tof_cropping
^^^^^^^^^^^^^^^^^^^^^
diff --git a/docs/source/techniques/ISISPowder-Index-v1.rst b/docs/source/techniques/ISISPowder-Index-v1.rst
index 02b1f4a3ac4090c1e6ba5b4fcdd8a179c9bc20e0..2455be0472f1265d7ba9dfd9a14831d32f56bbe8 100644
--- a/docs/source/techniques/ISISPowder-Index-v1.rst
+++ b/docs/source/techniques/ISISPowder-Index-v1.rst
@@ -21,12 +21,12 @@ This documentation assumes the user is familiar with the concepts
behind diffraction reduction and understand how cycles at ISIS work.
It also assumes the user has a basic knowledge of Python.
-This documentation also avoids discussing the implementation or design of
+This documentation also avoids discussing the implementation or design of
the scripts as it is beyond the scope of this documentation.
.. _prerequisites_isis-powder-diffraction-ref:
-Prerequisites
+Prerequisites
---------------
Users must setup their input directories so Mantid can find the input files. Instructions
on completing this are located `here <http://www.mantidproject.org/ManageUserDirectories>`_.
@@ -40,7 +40,7 @@ network to automatically handle finding the files whilst it is on the network.
Tutorials
----------
The links below will take you to the relevant part of a tutorial.
-These will help you setup your scripts and get you familiar with
+These will help you setup your scripts and get you familiar with
their usage.
:ref:`isis-powder-diffraction-Tutorials-ref`
diff --git a/docs/source/techniques/ISISPowder-Pearl-v1.rst b/docs/source/techniques/ISISPowder-Pearl-v1.rst
index e47dd88737435940df82d019199467145ec5ec8e..3a3a2a7d3502c7648a1c0e76380d6d9ba8733cb9 100644
--- a/docs/source/techniques/ISISPowder-Pearl-v1.rst
+++ b/docs/source/techniques/ISISPowder-Pearl-v1.rst
@@ -115,7 +115,7 @@ The following parameters may also be optionally set:
- :ref:`file_ext_pearl_isis-powder-diffraction-ref`
- :ref:`suffix_pearl_isis-powder-diffraction-ref`
-
+
Example
=======
@@ -150,8 +150,8 @@ Example
# Notice how the filename ends with .yaml
cal_mapping_file = r"C:\path\to\cal_mapping.yaml"
-
- pearl_example.create_cal(run_number=95671,
+
+ pearl_example.create_cal(run_number=95671,
tt_mode="tt70",
long_mode=True,
calibration_mapping_file=cal_mapping_file)
@@ -684,11 +684,11 @@ set to the following:
# Long mode OFF:
create_cal_rebin_1_params: "100,-0.0006,19950"
-
+
# Long mode ON:
create_cal_rebin_1_params: "20300,-0.0006,39990"
-
+
.. _create_cal_rebin_2_params_pearl_isis-powder-diffraction-ref:
create_cal_rebin_2_params
@@ -715,7 +715,7 @@ set to the following:
cross_corr_reference_spectra: 20
-
+
.. _cross_corr_ws_index_max_pearl_isis-powder-diffraction-ref:
cross_corr_ws_index_max
@@ -729,7 +729,7 @@ set to the following:
cross_corr_ws_index_max: 1063
-
+
.. _cross_corr_ws_index_min_pearl_isis-powder-diffraction-ref:
cross_corr_ws_index_min
@@ -743,7 +743,7 @@ set to the following:
cross_corr_ws_index_min: 9
-
+
.. _cros_cor_x_max_pearl_isis-powder-diffraction-ref:
cross_cor_x_max
@@ -879,7 +879,7 @@ is set to the following:
get_det_offsets_x_max: -200
-
+
.. _get_det_offsets_x_min_pearl_isis-powder-diffraction-ref:
get_det_offsets_x_min
@@ -891,7 +891,7 @@ is set to the following:
.. code-block:: python
get_det_offsets_x_min: -200
-
+
.. _monitor_lambda_crop_range_pearl_isis-powder-diffraction-ref:
@@ -952,7 +952,7 @@ On PEARL this is set to the following:
monitor_mask_regions: [[3.45, 2.96, 2.1, 1.73],
[3.7, 3.2, 2.26, 1.98]]
-
+
.. _monitor_spectrum_number_pearl_isis-powder-diffraction-ref:
monitor_spectrum_number
@@ -1028,7 +1028,7 @@ On PEARL this is set to the following:
# Long mode OFF:
spline_coefficient: 60
-
+
# Long mode ON:
spline_coefficient: 5
diff --git a/docs/source/techniques/ISISPowder-Polaris-v1.rst b/docs/source/techniques/ISISPowder-Polaris-v1.rst
index c1184771976209781273b7c1a0478d80e27aa475..60fecfa62bbf1ff5d8eea7b701cd9fc8ea0fc179 100644
--- a/docs/source/techniques/ISISPowder-Polaris-v1.rst
+++ b/docs/source/techniques/ISISPowder-Polaris-v1.rst
@@ -16,11 +16,11 @@ If not more details can be read here: :ref:`intro_to_objects-isis-powder-diffrac
To create a POLARIS object the following parameters are required:
-- :ref:`calibration_directory_polaris_isis-powder-diffraction-ref`
-- :ref:`output_directory_polaris_isis-powder-diffraction-ref`
-- :ref:`user_name_polaris_isis-powder-diffraction-ref`
+- :ref:`calibration_directory_polaris_isis-powder-diffraction-ref`
+- :ref:`output_directory_polaris_isis-powder-diffraction-ref`
+- :ref:`user_name_polaris_isis-powder-diffraction-ref`
-Optionally a configuration file may be specified if one exists
+Optionally a configuration file may be specified if one exists
using the following parameter:
- :ref:`config_file_polaris_isis-powder-diffraction-ref`
@@ -34,10 +34,10 @@ Example
.. code-block:: python
from isis_powder import Polaris
-
+
calibration_dir = r"C:\path\to\calibration_dir"
output_dir = r"C:\path\to\output_dir"
-
+
polaris_example = Polaris(calibration_directory=calibration_dir,
output_directory=output_dir,
user_name="Mantid")
@@ -56,7 +56,7 @@ The following methods can be executed on a POLARIS object:
- :ref:`focus_polaris_isis-powder-diffraction-ref`
- :ref:`set_sample_polaris_isis-powder-diffraction-ref`
-For information on creating a POLARIS object see:
+For information on creating a POLARIS object see:
:ref:`creating_polaris_object_isis-powder-diffraction-ref`
.. _create_vanadium_polaris_isis-powder-diffraction-ref:
@@ -218,7 +218,7 @@ Example
Calibration Mapping File
-------------------------
The calibration mapping file holds the mapping between
-run numbers, current label, offset filename and the empty
+run numbers, current label, offset filename and the empty
and vanadium numbers.
For more details on the calibration mapping file see:
@@ -287,7 +287,7 @@ Within the folder the following should be present:
The script will also save out vanadium splines into the relevant
label folder which are subsequently loaded and used within the
-:ref:`focus_polaris_isis-powder-diffraction-ref` method.
+:ref:`focus_polaris_isis-powder-diffraction-ref` method.
Example Input:
@@ -299,7 +299,7 @@ Example Input:
calibration_mapping_file
^^^^^^^^^^^^^^^^^^^^^^^^^
-This parameter gives the full path to the YAML file containing the
+This parameter gives the full path to the YAML file containing the
calibration mapping. For more details on this file see:
:ref:`calibration_mapping_polaris-isis-powder-ref`
@@ -318,7 +318,7 @@ mode
^^^^^^^^^^
*optional*
-The current chopper mode to use in the
+The current chopper mode to use in the
:ref:`create_vanadium_polaris_isis-powder-diffraction-ref`
and :ref:`focus_polaris_isis-powder-diffraction-ref` method.
This determines which vanadium and empty run numbers
@@ -343,10 +343,10 @@ Example Input:
config_file
^^^^^^^^^^^
-The full path to the YAML configuration file. This file is
+The full path to the YAML configuration file. This file is
described in detail here: :ref:`configuration_files_isis-powder-diffraction-ref`
It is recommended to set this parameter at object creation instead
-of on a method as it will warn if any parameters are overridden
+of on a method as it will warn if any parameters are overridden
in the scripting window.
*Note: This should be the full path to the file including extension*
@@ -362,12 +362,12 @@ Example Input:
do_absorb_corrections
^^^^^^^^^^^^^^^^^^^^^
-Indicates whether to perform vanadium absorption corrections
+Indicates whether to perform vanadium absorption corrections
in :ref:`create_vanadium_polaris_isis-powder-diffraction-ref` mode.
In :ref:`focus_polaris_isis-powder-diffraction-ref` mode
sample absorption corrections require the sample be
set first with the :ref:`set_sample_polaris_isis-powder-diffraction-ref`
-method.
+method.
Accepted values are: **True** or **False**
@@ -384,9 +384,9 @@ Example Input:
do_van_normalisation
^^^^^^^^^^^^^^^^^^^^
-Indicates whether to divide the focused workspace within
+Indicates whether to divide the focused workspace within
:ref:`focus_polaris_isis-powder-diffraction-ref` mode with a
-previously generated vanadium spline.
+previously generated vanadium spline.
This requires a vanadium to have been previously created
with the :ref:`create_vanadium_polaris_isis-powder-diffraction-ref`
@@ -406,15 +406,15 @@ file_ext
^^^^^^^^
*Optional*
-Specifies a file extension to use when using the
+Specifies a file extension to use when using the
:ref:`focus_polaris_isis-powder-diffraction-ref` method.
-This should be used to process partial runs. When
+This should be used to process partial runs. When
processing full runs (i.e. completed runs) it should not
be specified as Mantid will automatically determine the
best extension to use.
-*Note: A leading dot (.) is not required but
+*Note: A leading dot (.) is not required but
is preferred for readability*
Example Input:
@@ -432,7 +432,7 @@ Indicates a run from the current cycle to use when calling
:ref:`create_vanadium_polaris_isis-powder-diffraction-ref`.
This does not have the be the first run of the cycle or
the run number corresponding to the vanadium. However it
-must be in the correct cycle according to the
+must be in the correct cycle according to the
:ref:`calibration_mapping_polaris-isis-powder-ref`.
Example Input:
@@ -447,7 +447,7 @@ Example Input:
input_mode
^^^^^^^^^^
-Indicates how to interpret the parameter
+Indicates how to interpret the parameter
:ref:`run_number_polaris_isis_powder-diffraction-ref` whilst
calling the :ref:`focus_polaris_isis-powder-diffraction-ref`
method.
@@ -473,7 +473,7 @@ multiple_scattering
*optional*
Indicates whether to account for the effects of multiple scattering
-when calculating absorption corrections.
+when calculating absorption corrections.
Accepted values are: **True** or **False**
@@ -495,10 +495,10 @@ output_directory
^^^^^^^^^^^^^^^^
Specifies the path to the output directory to save resulting files
into. The script will automatically create a folder
-with the label determined from the
+with the label determined from the
:ref:`calibration_mapping_file_polaris_isis-powder-diffraction-ref`
and within that create another folder for the current
-:ref:`user_name_polaris_isis-powder-diffraction-ref`.
+:ref:`user_name_polaris_isis-powder-diffraction-ref`.
Within this folder processed data will be saved out in
several formats.
@@ -516,13 +516,13 @@ run_number
Specifies the run number(s) to process when calling the
:ref:`focus_polaris_isis-powder-diffraction-ref` method.
-This parameter accepts a single value or a range
+This parameter accepts a single value or a range
of values with the following syntax:
-**-** : Indicates a range of runs inclusive
+**-** : Indicates a range of runs inclusive
(e.g. *1-10* would process 1, 2, 3....8, 9, 10)
-**,** : Indicates a gap between runs
+**,** : Indicates a gap between runs
(e.g. *1, 3, 5, 7* would process run numbers 1, 3, 5, 7)
These can be combined like so:
@@ -548,10 +548,10 @@ sample_empty
*Optional*
This parameter specifies a/several sample empty run(s)
-to subtract from the run in the
-:ref:`focus_polaris_isis-powder-diffraction-ref` method.
+to subtract from the run in the
+:ref:`focus_polaris_isis-powder-diffraction-ref` method.
If multiple runs are specified it will sum these runs
-before subtracting the result.
+before subtracting the result.
This input uses the same syntax as
:ref:`run_number_polaris_isis_powder-diffraction-ref`.
@@ -571,7 +571,7 @@ Example Input:
polaris_example.focus(sample_empty="100-110", ...)
.. _suffix_polaris_isis-powder-diffraction-ref:
-
+
suffix
^^^^^^
*Optional*
@@ -583,15 +583,15 @@ Example Input:
.. code-block:: python
- polaris_example.focus(suffix="-corr", ...)
+ polaris_example.focus(suffix="-corr", ...)
.. _user_name_polaris_isis-powder-diffraction-ref:
user_name
^^^^^^^^^
-Specifies the name of the current user when creating a
+Specifies the name of the current user when creating a
new POLARIS object. This is only used when saving data to
-sort data into respective user folders.
+sort data into respective user folders.
See :ref:`output_directory_polaris_isis-powder-diffraction-ref`
for more details.
@@ -606,14 +606,14 @@ Advanced Parameters
--------------------
.. warning:: These values are not intended to be changed and should
reflect optimal defaults for the instrument. For more
- details please read:
+ details please read:
:ref:`instrument_advanced_properties_isis-powder-diffraction-ref`
-
+
This section is mainly intended to act as reference of the
current settings distributed with Mantid
All values changed in the advanced configuration file
-requires the user to restart Mantid for the new values to take effect.
+requires the user to restart Mantid for the new values to take effect.
Please read :ref:`instrument_advanced_properties_isis-powder-diffraction-ref`
before proceeding to change values within the advanced configuration file.
@@ -625,7 +625,7 @@ Indicates a list of TOF values to crop the focused workspace
which was created by :ref:`focus_polaris_isis-powder-diffraction-ref`
on a bank by bank basis.
-This parameter is a list of bank cropping values with
+This parameter is a list of bank cropping values with
one list entry per bank. The values **must** have a smaller
TOF window than the :ref:`vanadium_cropping_values_polaris_isis-powder-diffraction-ref`
@@ -661,8 +661,8 @@ On POLARIS this is set to the following:
vanadium_peaks_masking_file
^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Determines the name of the masking file containing the
-masks to remove Bragg peaks on Polaris. This file must
+Determines the name of the masking file containing the
+masks to remove Bragg peaks on Polaris. This file must
be located within the top level of the
:ref:`calibration_directory_polaris_isis-powder-diffraction-ref`.
@@ -706,11 +706,11 @@ A template for the filename of the generated dSpacing XYE file.
sample_empty_scale
^^^^^^^^^^^^^^^^^^
-Required if :ref:`sample_empty_polaris_isis_powder-diffraction-ref`
+Required if :ref:`sample_empty_polaris_isis_powder-diffraction-ref`
is set to **True**
Sets a factor to scale the sample empty run(s) to before
-subtracting. This value is multiplied after summing the
+subtracting. This value is multiplied after summing the
sample empty runs and before subtracting the empty from
the data set. For more details see: :ref:`Scale <algm-Scale-v1>`.
@@ -725,12 +725,12 @@ Example Input:
raw_data_cropping_values
^^^^^^^^^^^^^^^^^^^^^^^^^
-Determines the TOF window to crop all spectra down to before any
+Determines the TOF window to crop all spectra down to before any
processing in the :ref:`create_vanadium_polaris_isis-powder-diffraction-ref`
-and :ref:`focus_polaris_isis-powder-diffraction-ref` methods.
+and :ref:`focus_polaris_isis-powder-diffraction-ref` methods.
This helps remove negative counts where at very low TOF
-the empty counts can exceed the captured neutron counts
+the empty counts can exceed the captured neutron counts
of the run to process.
On POLARIS this is set to the following:
@@ -753,7 +753,7 @@ will need to be called again.*
On POLARIS this is set to the following:
.. code-block:: python
-
+
spline_coefficient: 100
@@ -761,14 +761,14 @@ On POLARIS this is set to the following:
vanadium_cropping_values
^^^^^^^^^^^^^^^^^^^^^^^^
-Determines the TOF windows to crop to on a bank by bank basis
+Determines the TOF windows to crop to on a bank by bank basis
within the :ref:`create_vanadium_polaris_isis-powder-diffraction-ref`
method. This is applied after focusing and before a spline is taken.
It is used to remove low counts at the start and end of the vanadium run
-to produce a spline which better matches the data.
+to produce a spline which better matches the data.
-This parameter is a list of bank cropping values with
+This parameter is a list of bank cropping values with
one list entry per bank. The values **must** have a larger
TOF window than the :ref:`focused_cropping_values_polaris_isis-powder-diffraction-ref`
and a smaller window than :ref:`raw_data_cropping_values_polaris_isis-powder-diffraction-ref`.
@@ -785,7 +785,7 @@ On POLARIS this is set to the following:
]
.. _vanadium_sample_details_polaris_isis-powder-diffraction-ref:
-
+
Vanadium sample details
^^^^^^^^^^^^^^^^^^^^^^^
@@ -800,7 +800,7 @@ On POLARIS this is set to the following:
.. code-block:: python
chemical_formula = "V"
-
+
cylinder_sample_height
======================
@@ -809,7 +809,7 @@ The height of the Vanadium rod.
On POLARIS this is set to the following:
.. code-block:: python
-
+
cylinder_sample_height = 4.0
cylinder_sample_radius
@@ -820,7 +820,7 @@ The radius of the Vanadium rod.
On POLARIS this is set to the following:
.. code-block:: python
-
+
cylinder_sample_radius = 0.25
cylinder_position
@@ -834,5 +834,5 @@ On POLARIS this is set to the following:
cylinder_position = [0.0, 0.0, 0.0]
-
+
.. categories:: Techniques
diff --git a/docs/source/techniques/ISISPowder-Tutorials.rst b/docs/source/techniques/ISISPowder-Tutorials.rst
index 8639e872ab0d07c24a7c18e0e30ce9951d78bbb1..b634dff499367da1d99ffca83b0ed0424fdefe9f 100644
--- a/docs/source/techniques/ISISPowder-Tutorials.rst
+++ b/docs/source/techniques/ISISPowder-Tutorials.rst
@@ -24,7 +24,7 @@ clearly documented.
Obtaining tutorial data
^^^^^^^^^^^^^^^^^^^^^^^
-These tutorials will use the data found in the
+These tutorials will use the data found in the
ISIS example data sets. The data sets can be downloaded
from the `Mantid download page <https://download.mantidproject.org/>`_,
under *Sample datasets* - *ISIS*. Users may also use their own
@@ -52,7 +52,7 @@ will be `C:\\MantidInstall` on Windows, `/opt/Mantid` on Linux, and `/Applicatio
Open *scripts* > *Diffraction* > *isis_powder*.
In these tutorials we will be using Polaris examples and data
-however you may set-up a different instrument.
+however you may set-up a different instrument.
Open *polaris_routines* (or *'instName'_routines*), there will
be a folder called *Examples*. Copy the contents (all files and folders)
@@ -80,7 +80,7 @@ A quick introduction to objects
with object orientation. If you feel comfortable with the concept of
objects holding state you may skip onto the next section.*
-The ISIS Powder scripts use objects to hold a state, an object is
+The ISIS Powder scripts use objects to hold a state, an object is
best illustrated with the below example:
.. code-block:: python
@@ -89,7 +89,7 @@ best illustrated with the below example:
red_duck = Duck(type="Rubber duck")
On lines 1 and 2 we create a new duck object. Each
-object has a name we choose (in this case ``blue_duck`` and
+object has a name we choose (in this case ``blue_duck`` and
``red_duck``) and a separate state, but the actions we
can perform on each are the same. For example
@@ -103,17 +103,17 @@ is still hungry in this example.
Because objects have their own state you can create multiple objects
in your script to perform different actions, such as processing half
-your data with one set of options and the other half of the data
+your data with one set of options and the other half of the data
with another set of options.
.. _paths_to_setup_files_isis-powder-diffraction-ref:
Paths to the required files
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Navigate back to the files copied from this section of the
+Navigate back to the files copied from this section of the
tutorial :ref:`copying_example_files_isis-powder-diffraction-ref`.
There should be two files and a folder. If you are using the
-ISIS example data set
+ISIS example data set
(see :ref:`obtaining_example_data_isis-powder-diffraction-ref`)
you will not need to modify anything at this point.
@@ -125,23 +125,23 @@ Take notes of the following paths as we will need them later:
- The path to the folder you are currently in
- The name of the 'calibration' folder
-- The name of the cycle mapping file
+- The name of the cycle mapping file
For example in the POLARIS example folder these filenames will be:
- Name of 'calibration' folder: **Calibration**
- Name of cycle mapping file: **polaris_cycle_map_example.YAML**
- *Note*: you may not have file extensions showing, in that case you
- will see 'polaris_cycle_map_example' and need to insert
+ will see 'polaris_cycle_map_example' and need to insert
**.YAML** after the filename
.. _creating_inst_object_isis-powder-diffraction-ref:
Creating the instrument object
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Having introduced objects in:
+Having introduced objects in:
:ref:`intro_to_objects-isis-powder-diffraction-ref` we can now
-go ahead and create an instrument object.
+go ahead and create an instrument object.
.. code-block:: python
@@ -163,7 +163,7 @@ a list of these can be found in the relevant instrument reference:
:ref:`instrument_doc_links_isis-powder-diffraction-ref` for example
all instruments require a cycle mapping file. On HRPD, GEM and POLARIS
this is called the ``calibration_mapping_file``, on PEARL this is the
-``calibration_config_path``.
+``calibration_config_path``.
Using the above information we can start to populate the required
parameters (see :ref:`paths_to_setup_files_isis-powder-diffraction-ref`
@@ -173,17 +173,17 @@ for where these paths came from):
from isis_powder import Polaris
- a_pol_obj = Polaris(user_name="Your name here",
+ a_pol_obj = Polaris(user_name="Your name here",
calibration_directory=*Path to calibration directory*,
calibration_config_path=*Path to folder*\\*cycle mapping name.YAML*,
....etc.)
-Each time we execute the code it will inform us if a parameter is
+Each time we execute the code it will inform us if a parameter is
required at that point and we have forgotten to enter it. When you see
``Script execution finished`` it means we have enough information to
-create the instrument object.
+create the instrument object.
-In the next tutorial we will focus a vanadium run and use that to
+In the next tutorial we will focus a vanadium run and use that to
focus a standard sample.
Focusing first data set
@@ -193,8 +193,8 @@ tutorial :ref:`setup_tutorials_isis-powder-diffraction-ref` and
have created an instrument object successfully.
We now have an object for the instrument we specified, if you followed
-the previous tutorial this will be a Polaris object.
-These objects have methods we can access using their ``.`` operator.
+the previous tutorial this will be a Polaris object.
+These objects have methods we can access using their ``.`` operator.
We will use this to create a vanadium run on Polaris:
.. code-block:: python
@@ -221,7 +221,7 @@ How objects hold state in ISIS Powder
Additionally as the objects hold state we can set a parameter
anywhere. For example on Polaris the ``mode`` parameter indicates
-the chopper state for this/these run(s). This can either be set
+the chopper state for this/these run(s). This can either be set
when we create the object like this:
.. code-block:: python
@@ -251,12 +251,12 @@ example:
a_pol_obj = Polaris(mode="PDF", ...)
# The following line will warn us we changed the chopper
- # status from PDF to Rietveld. It will also remain
+ # status from PDF to Rietveld. It will also remain
# in Rietveld mode from now on till we change it again
a_pol_obj.create_vanadium(mode="Rietveld", ...)
-
+
# Mode is still Rietveld on the following line
- a_pol_obj.create_vanadium(...)
+ a_pol_obj.create_vanadium(...)
For these reasons it is recommended to create multiple objects
when you need to switch between different settings within a script:
@@ -271,16 +271,16 @@ when you need to switch between different settings within a script:
# Runs with the chopper set to PDF mode:
pol_PDF.create_vanadium(...)
# Runs with the chopper set to Rietveld mode:
- pol_Rietveld.create_vanadium(...)
+ pol_Rietveld.create_vanadium(...)
.. _creating_first_vanadium_run_isis-powder-diffraction-ref:
Creating the vanadium run
^^^^^^^^^^^^^^^^^^^^^^^^^^
-Because of the way objects hold state in ISIS Powder
+Because of the way objects hold state in ISIS Powder
(see: :ref:`how_objects_hold_state_isis-powder-diffraction-ref`)
-it is up to the reader of this tutorial where they set different
-parameters.
+it is up to the reader of this tutorial where they set different
+parameters.
As previously mentioned each instrument has bespoke parameters
and can be found in the individual instrument reference document:
@@ -289,7 +289,7 @@ and can be found in the individual instrument reference document:
Additionally as noted previously this tutorial assumes the user
is using the example ISIS data set (
see: :ref:`obtaining_example_data_isis-powder-diffraction-ref`).
-If they are not they will need to setup their cycle mapping to their
+If they are not they will need to setup their cycle mapping to their
data detailed here: :ref:`cycle_mapping_files_isis-powder-diffraction-ref`
For Polaris we require the following parameters in addition to the
@@ -299,14 +299,14 @@ parameters discussed to create the object (see
- ``do_absorb_corrections`` - Indicates whether to account for absorption when processing
the vanadium data. It is recommended to have this set to ``True``
- ``first_cycle_run_no`` - Used to determine which cycle to create a vanadium for.
- For example on a cycle with runs 100-120 this value can be any value from 100-120
+ For example on a cycle with runs 100-120 this value can be any value from 100-120
(e.g. 111)
- ``mode`` - Indicates what the chopper state was for this run
- ``multiple_scattering`` - Indicates whether to account for the effects of
multiple scattering. For the tutorial it is highly recommended to set this to ``False``
as it will increase the script run time from seconds to 10-30 minutes.
-*Note: Due to the complexity of the Polaris instrument definition it will take
+*Note: Due to the complexity of the Polaris instrument definition it will take
Mantid up to 10 minutes to load your first data set for this instrument.*
As we will be later focusing run number 98533 we can use that to ensure
@@ -316,7 +316,7 @@ the correct cycle is selected for the ``first_cycle_run_no`` input.
from isis_powder import Polaris
- # This should be set from the previous tutorial.
+ # This should be set from the previous tutorial.
a_pol_obj = Polaris(....)
a_pol_obj.create_vanadium(first_cycle_run_no=98533,
do_absorb_corrections=True,
@@ -324,7 +324,7 @@ the correct cycle is selected for the ``first_cycle_run_no`` input.
multiple_scattering=False)
Executing the above should now successfully process the vanadium run,
-you should have two resulting workspaces for the vanadium run in
+you should have two resulting workspaces for the vanadium run in
dSpacing and TOF. Additionally there will be another workspace containing
the splines which will be used when focusing future data.
@@ -332,7 +332,7 @@ the splines which will be used when focusing future data.
Focusing a data set
^^^^^^^^^^^^^^^^^^^^
-Having successfully processed a vanadium run (see:
+Having successfully processed a vanadium run (see:
:ref:`creating_first_vanadium_run_isis-powder-diffraction-ref`)
we are now able to focus a data set. For this tutorial we will
be focusing a sample of Silicon.
@@ -341,21 +341,21 @@ be focusing a sample of Silicon.
focusing data, this ensures the vanadium is not reprocessed
every time data is focused.*
-To focus data we can call the ``focus`` method present on all
-instruments. As previously mentioned each instrument has
-bespoke parameters, these can be found in the individual
-instrument reference document:
+To focus data we can call the ``focus`` method present on all
+instruments. As previously mentioned each instrument has
+bespoke parameters, these can be found in the individual
+instrument reference document:
:ref:`instrument_doc_links_isis-powder-diffraction-ref`
.. code-block:: python
from isis_powder import Polaris
- # This should be set from the previous tutorial.
+ # This should be set from the previous tutorial.
a_pol_obj = Polaris(....)
a_pol_obj.focus(...)
-To focus the Si sample included in the ISIS data set we
+To focus the Si sample included in the ISIS data set we
require the following parameters:
- ``do_absorb_corrections`` - This will be covered in a later tutorial.
@@ -363,9 +363,9 @@ require the following parameters:
instruments which support this correction. For this tutorial please
ensure it is set to ``False``
- ``do_van_normalisation`` - Determines whether to divide the data
- set by the processed vanadium splines. This should be set to
+ set by the processed vanadium splines. This should be set to
``True``.
-- ``input_mode`` - Some instruments will not have this
+- ``input_mode`` - Some instruments will not have this
(in which case the data will always be summed). Acceptable values
are ``"Individual"`` or ``"Summed"``. When set to individual each run
will be loaded and processed separately, in summed all runs specified
@@ -373,8 +373,8 @@ require the following parameters:
- ``mode`` - Indicates what the chopper state was for this run (eg
``"Rietveld"``)
- ``run_number`` - The run number or range of run numbers. This can
- either be a string or integer (plain number). For example
- ``"100-105, 107, 109-111"`` will process
+ either be a string or integer (plain number). For example
+ ``"100-105, 107, 109-111"`` will process
100, 101, 102..., 105, 107, 109, 110, 111.
@@ -386,7 +386,7 @@ the example data you could focus 98534 (YAG sample) too.
from isis_powder import Polaris
- # This should be set from the previous tutorial.
+ # This should be set from the previous tutorial.
a_pol_obj = Polaris(....)
a_pol_obj.focus(input_mode="Individual", run_number=98533,
mode="Rietveld",
@@ -404,14 +404,14 @@ Congratulations you have now focused a data set using ISIS Powder.
Output files
^^^^^^^^^^^^^
After focusing the data it is saved in a variety of formats which
-suits the instrument. These can be found in the user specified
+suits the instrument. These can be found in the user specified
output directory. The scripts will automatically create the
label for the current cycle (covered in additional detail later
:ref:`cycle_mapping_files_isis-powder-diffraction-ref`).
Within the label folder a new folder will be created or used
matching the ``user_name`` specified. Within that folder will
-be the output data in the various formats that is used on
+be the output data in the various formats that is used on
that instrument to perform data analysis.
.. _configuration_files_isis-powder-diffraction-ref:
@@ -421,14 +421,14 @@ Using configuration files
This tutorial assumes you have successfully created an instrument
object as described here: :ref:`creating_inst_object_isis-powder-diffraction-ref`.
-You have probably noticed that a lot of the parameters set do not
-change whenever you create an instrument object and a warning
+You have probably noticed that a lot of the parameters set do not
+change whenever you create an instrument object and a warning
is emitted stating you are not using a configuration file.
The rational behind a configuration file is to move settings which
rarely change but are machine specific to a separate file you can
load in instead. For example the output directory or calibration
-directory do not change often.
+directory do not change often.
Creating a configuration file
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -454,7 +454,7 @@ For example if we currently have the output directory as follows:
We can instead move it to the YAML file so it reads as follows:
.. code-block:: yaml
-
+
# YAML FILE:
# Note the single quotes on a path in a YAML file
output_directory: 'C:\path\to\your\output_dir'
@@ -481,9 +481,9 @@ You will need to make a note of the full path to the configuration
file. Note that the filename entered must end with .YAML (even if it
is not shown when browsing the files on your OS).
-Setting the configuration file from the previous example we
+Setting the configuration file from the previous example we
now have a default output directory and perform vanadium normalisation
-by default too.
+by default too.
.. code-block:: python
@@ -505,7 +505,7 @@ you can still use the original configuration file.
config_file_path = r"C:\path\to\your\config_file.YAML"
- # Output directory changed to our own output directory,
+ # Output directory changed to our own output directory,
# and warning emitted informing us this has happened
a_pol_obj = Polaris(config_file=config_file_path,
output_dir=r"C:\path\to\new\output_dir", ...)
@@ -515,7 +515,7 @@ you can still use the original configuration file.
# restating it
a_pol_obj.focus(...)
-It is recommended instrument scientists move optimal defaults
+It is recommended instrument scientists move optimal defaults
(such as performing vanadium normalisation) into a configuration
file which the scripts use.
@@ -529,7 +529,7 @@ current label and offset filename.
The *label* is used to separate output data into its various cycle numbers,
Mantid will correctly handle the cycle on input data. The goal of the label
-is to ensure runs end up in the output folder the user wants them in,
+is to ensure runs end up in the output folder the user wants them in,
regardless of which cycle ISIS is on.
Examples
@@ -544,7 +544,7 @@ The simplest example of the calibration file is used on Pearl as the
empty, label and vanadium are the same regardless of mode.
.. code-block:: yaml
-
+
# This is the layout used on PEARL
# NB this example is not representative of actual run numbers
123-200:
@@ -553,14 +553,14 @@ empty, label and vanadium are the same regardless of mode.
label : "1_2"
vanadium_run_numbers : "150"
empty_run_numbers : "160"
- offset_file_name : "pearl_offset_1_2.cal"
+ offset_file_name : "pearl_offset_1_2.cal"
On GEM the two chopper modes ``"PDF"`` and ``""Rietveld""`` affect the
empty and vanadium run numbers used. In this case the additional
indentation underneath the respective mode is used.
Fields can be left blank until a later date
-if runs in different modes have not been collected yet.
+if runs in different modes have not been collected yet.
.. code-block:: yaml
@@ -589,7 +589,7 @@ The mapping also allows unbounded runs, this is useful for a cycle that
is in progress as the final run number of a cycle is unknown
.. code-block:: yaml
-
+
1-122:
label : "1_1"
...
@@ -602,30 +602,30 @@ All runs from 1-122 inclusive will go use the details associated with label
``1_1``, whilst any runs after 123 will use label ``1_2``. These values also
have validation to ensure that there is only one unbounded range and no values
come after the starting interval. For example in the above example adding a section
-for runs ``200-`` or ``200-210`` would fail validation.
+for runs ``200-`` or ``200-210`` would fail validation.
Relation to calibration directory
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
The user specified calibration directory directly relates to a cycle mapping
-file. After writing or adapting a cycle mapping file for your instrument
+file. After writing or adapting a cycle mapping file for your instrument
you must update the calibration directory. Using the cycle mapping from Peal:
.. code-block:: yaml
-
+
# NB this example is not representative of actual run numbers
123-200:
label : "1_2"
vanadium_run_numbers : "150"
empty_run_numbers : "160"
- offset_file_name : "pearl_offset_1_2.cal"
+ offset_file_name : "pearl_offset_1_2.cal"
-The relevant fields from the cycle mapping are the ``label`` and
+The relevant fields from the cycle mapping are the ``label`` and
``offset_file_name``. Within the calibration directory a folder
with the ``label`` name must exist. ``offset_file_name`` must either
be the name of a cal file within that folder, or the full path to a
cal file elsewhere.
-In this example we need a folder within the calibration
+In this example we need a folder within the calibration
directory called *1_2* which holds a
cal file called *pearl_offset_1_2.cal*.
@@ -637,20 +637,20 @@ it. Because of this we can have two sets of details corresponding
to the same cycle.
.. code-block:: yaml
-
+
# NB this example is not representative of actual run numbers
123-150:
label : "1_2"
vanadium_run_numbers : "150"
empty_run_numbers : "152"
- offset_file_name : "pearl_offset_1_2.cal"
+ offset_file_name : "pearl_offset_1_2.cal"
151-200:
label : "1_2"
# Notice the changed details for runs 151 onwards
vanadium_run_numbers : "170"
empty_run_numbers : "160"
- offset_file_name : "pearl_offset_1_2-second.cal"
+ offset_file_name : "pearl_offset_1_2-second.cal"
Processing intermediate files
------------------------------
@@ -659,10 +659,10 @@ tutorial assumes you have successfully focused data
previously as detailed here: :ref:`focusing_data_isis-powder-diffraction-ref`.
To process intermediate runs for example *.s01* or *.s02* files
-you must ensure the user directories are setup to
-include the folder where these files are located.
+you must ensure the user directories are setup to
+include the folder where these files are located.
-The instructions for this can be found here:
+The instructions for this can be found here:
:ref:`prerequisites_isis-powder-diffraction-ref`.
*Note: The 'Search Data Archive' option will not locate
intermediate runs as only completed runs are published to the data archive.*
@@ -682,10 +682,10 @@ like so:
This will locate a .s01 file for that run number and focus
it like a normal run. The output filename will also reflect that
-this is a partial file. For run number 123 and file extension s01
+this is a partial file. For run number 123 and file extension s01
the output filename will be *s01<InstrumentName>123.nxs*.
-This allows users to easily distinguish between full runs and
-partial runs in the output folder. (For more details about the
+This allows users to easily distinguish between full runs and
+partial runs in the output folder. (For more details about the
output folder see :ref:`output_folder_isis-powder-diffraction-ref`)
Absorption corrections on sample
@@ -698,16 +698,16 @@ the chemical properties of the sample by creating a sample properties
object. (See :ref:`intro_to_objects-isis-powder-diffraction-ref`.)
*Note*: Not all instruments support sample absorption corrections.
-Please check the instrument reference:
+Please check the instrument reference:
:ref:`instrument_doc_links_isis-powder-diffraction-ref`. If the
-instrument has a ``set_sample_details`` method it supports sample
+instrument has a ``set_sample_details`` method it supports sample
absorption corrections
.. _create_sampleDetails_isis-powder-diffraction-ref:
Create SampleDetails object
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-First we need to import the sample details object from ISIS Powder.
+First we need to import the sample details object from ISIS Powder.
The properties required when creating a SampleDetails
object is the geometry of the sample.
@@ -734,7 +734,7 @@ For more details see :ref:`algm-SetSample-v1`.
Setting the material details
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Having set the sample geometry we can now set the chemical
+Having set the sample geometry we can now set the chemical
material and optionally the number density. If the chemical
formula is not a single element the number density must be
entered as it cannot be calculated.
@@ -752,7 +752,7 @@ be calculated for a sample.*
... snip from previous example ...
my_sample = SampleDetails(height=3.0, radius=2.0, center=position)
-
+
my_sample.set_material(chemical_formula="V")
# OR
my_sample.set_material(chemical_formula="VNb", number_density=123)
@@ -760,7 +760,7 @@ be calculated for a sample.*
Setting material properties
^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Advanced material properties can be optionally set instead of letting
+Advanced material properties can be optionally set instead of letting
Mantid calculate them. These properties are:
- ``absorption_cross_section`` - Absorption Cross Section
@@ -774,17 +774,17 @@ values based on the chemical formula entered if this is not set*
... snip from previous example ...
my_sample = SampleDetails(height=3.0, radius=2.0, center=position)
my_sample.set_material(chemical_formula="VNb", number_density=123)
-
+
# Setting individual properties:
- my_sample.set_material_properties(absorption_cross_section=123,
+ my_sample.set_material_properties(absorption_cross_section=123,
scattering_cross_section=456)
Using the new SampleDetails object
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Having created a new SampleDetails object
+Having created a new SampleDetails object
(:ref:`create_sampleDetails_isis-powder-diffraction-ref`) and then
set the chemical material (:ref:`set_material_sampleDetails_isis-powder-diffraction-ref`)
-we can instruct the scripts to use these details whilst focusing.
+we can instruct the scripts to use these details whilst focusing.
This is done by calling ``set_sample_details`` on the instrument object,
this will then use those sample details each time absorption corrections
@@ -805,23 +805,23 @@ are applied to the sample. (See :ref:`how_objects_hold_state_isis-powder-diffrac
Changing sample properties
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-.. warning:: This method is not recommended for changing multiple samples.
+.. warning:: This method is not recommended for changing multiple samples.
Instead it is recommended you create a new sample details object
- if you need to change properties mid way through a script.
+ if you need to change properties mid way through a script.
See :ref:`create_sampleDetails_isis-powder-diffraction-ref`
and :ref:`intro_to_objects-isis-powder-diffraction-ref`.
-*Note: The geometry of a sample cannot be changed without creating a new
+*Note: The geometry of a sample cannot be changed without creating a new
sample details object*
-Once you have set a material by calling ``set_material`` or set
-the properties by calling ``set_material_properties`` you will
+Once you have set a material by calling ``set_material`` or set
+the properties by calling ``set_material_properties`` you will
not be able to change (or set) these details without first
-resetting the object. This is to enforce the sample properties
-being set only once so that users are guaranteed of the state.
+resetting the object. This is to enforce the sample properties
+being set only once so that users are guaranteed of the state.
If you wish to change the chemical material or its advanced properties
-without creating a new sample details object you can call
+without creating a new sample details object you can call
``reset_sample_material``. This will reset **all** details (i.e
advanced properties and chemical properties)
@@ -872,13 +872,13 @@ of runs (such as the cropping values) please set the value in the scripting
window or configuration file instead
(see: :ref:`configuration_files_isis-powder-diffraction-ref`).
-The advanced configuration file provides optimal defaults for
+The advanced configuration file provides optimal defaults for
an instrument and applies to all runs unless otherwise specified. If
this file is modified Mantid will **not** remove it on uninstall or
reinstall, or upgrade. *(Note: This behavior is not guaranteed and
should not be relied on)*
-It is highly recommended you read the instrument reference
+It is highly recommended you read the instrument reference
found here: :ref:`instrument_doc_links_isis-powder-diffraction-ref`
to understand the purpose of each property and the effect changing
it may have.
@@ -909,11 +909,11 @@ For example to test a different spline coefficient value
This will create a new vanadium run with the spline coefficient
set to 80. Note that until create_vanadium is run again
-in this example any future data will implicitly use the
+in this example any future data will implicitly use the
splines with a coefficient of 80.
If you wish to change or view the advanced configuration files
-these can be found under
+these can be found under
*MantidInstall*/scripts/diffraction/isis_powder/**inst** _routines
and will be called **inst** _advanced_config.py
diff --git a/docs/source/techniques/ISISPowder-Workflows-v1.rst b/docs/source/techniques/ISISPowder-Workflows-v1.rst
index 75e07bec9982f0f58d5bc3e392d4bbc546a76ddd..8a5a59627f2200c8781ce31c75ad6fd25f535671 100644
--- a/docs/source/techniques/ISISPowder-Workflows-v1.rst
+++ b/docs/source/techniques/ISISPowder-Workflows-v1.rst
@@ -15,7 +15,7 @@ create_vanadium
.. diagram:: ISISPowderCreateVanadium_wkflw.dot
-focus
+focus
^^^^^^
.. diagram:: ISISPowderFocus_wkflw.dot
@@ -44,7 +44,7 @@ Save Focused Banks
.. diagram:: ISISPowderSaveFocusedBanks_wkflw.dot
-Instrument Specific
+Instrument Specific
-------------------
PEARL
diff --git a/docs/source/techniques/PolarisedDiffractionILL.rst b/docs/source/techniques/PolarisedDiffractionILL.rst
index 6ef0723b80c05d6cfb95b73af6b0e03c7c30768a..b27f010c758f12949a79517f5d5412fbe0606750 100644
--- a/docs/source/techniques/PolarisedDiffractionILL.rst
+++ b/docs/source/techniques/PolarisedDiffractionILL.rst
@@ -10,7 +10,7 @@ Data reduction for D7 instrument at the ILL
There are three workflow algorithms supporting data reduction at ILL's D7 polarised diffraction and spectroscopy instrument. These algorithms are:
:ref:`algm-D7YIGPOsitionCalibration`
- Performs wavelength and position calibraiton for D7 instrument banks and individual detectors in banks.
+ Performs wavelength and position calibraiton for D7 instrument banks and individual detectors in banks.
:ref:`algm-PolDiffILLReduction`
Performs data reduction and produces the unnormalised sample cross-sections in one of the available units.
@@ -51,7 +51,7 @@ A very basic reduction would include a vanadium reference and a sample, without
# Define vanadium properties:
vanadiumProperties = {'FormulaUnits': 1, 'SampleMass': 8.54, 'FormulaUnitMass': 50.94}
-
+
# Vanadium reduction
PolDiffILLReduction(Run='396993', ProcessAs='Vanadium', OutputTreatment='Sum',
OutputWorkspace='reduced_vanadium',
@@ -78,7 +78,7 @@ Output:
dS/dOmega (TwoTheta) detector position range: 13.14...144.06 (degrees)
-
+
Wavelength and position calibration
===================================
@@ -126,7 +126,7 @@ It is strongly advised to first run the :ref:`D7YIGPositionCalibration <algm-D7Y
print('The bank4 gradient is: {0:.3f}'.format(1.0 / mtd['shortWavelength'].column(1)[352]))
-
+
Transmission calculation
========================
@@ -223,7 +223,7 @@ is not a problem, as the correction is given by a ratio and there is no spin-fli
are calculated from ratios of non-spin-flip to spin-flip scattering, hence absolute numbers are not necessary.
First, the data is normalised to monitor 1 (M1). Then, if the necessary inputs of container and absorber (please note this is a different measurement
-than mentioned in the `Transmission` section) measurements are provided, the background can be subtracted from the data:
+than mentioned in the `Transmission` section) measurements are provided, the background can be subtracted from the data:
.. math:: \dot{I_{B}} = \dot{I} - T\dot{E} - (1-T) \dot{C},
diff --git a/docs/source/tutorials/index.rst b/docs/source/tutorials/index.rst
index fff12367a51243a04111c7d44f9f6d12281d77cd..2b33a0c493c611bfd3bf1f87075e1effa22223ea 100644
--- a/docs/source/tutorials/index.rst
+++ b/docs/source/tutorials/index.rst
@@ -14,8 +14,8 @@ At the end of this course you can start to use Mantid independently.
*Python introduction* is a crash course in the Python that you need for scripting in Mantid.
-*Muon GUI course* focuses on the reduction and analysis of Muon data collected from any of the ISIS
-muon instruments via a Graphical User Interface (GUI). This interface has been specifically designed
+*Muon GUI course* focuses on the reduction and analysis of Muon data collected from any of the ISIS
+muon instruments via a Graphical User Interface (GUI). This interface has been specifically designed
to guide the user through the data reduction and analysis procedure.
*Python in Mantid* introduces how to interact with Mantid through Python. Some knowledge of
diff --git a/docs/source/tutorials/introduction_to_python/basic_language_principles.rst b/docs/source/tutorials/introduction_to_python/basic_language_principles.rst
index 8dc6d6c1b21be4647332b8c6d07c66a02acaf9e9..aef553a49be14d7ba85736b4e107e54cea39558a 100644
--- a/docs/source/tutorials/introduction_to_python/basic_language_principles.rst
+++ b/docs/source/tutorials/introduction_to_python/basic_language_principles.rst
@@ -1,7 +1,7 @@
.. _basic_language_principles:
=========================
-Basic Language Principles
+Basic Language Principles
=========================
- Python is an interpreted language meaning there is no explicit
@@ -16,7 +16,7 @@ Basic Language Principles
support for various operations upon them. The table below summarises
how to use them in Python:
-|
+|
+---------+------------+------------------------------+
| Type | Example | Python code |
@@ -48,7 +48,7 @@ Basic Language Principles
# Later on it can be used for something else
# x is a string and adding a number produces an error
- x = "a string"
+ x = "a string"
x + 5
#will give you an error
diff --git a/docs/source/tutorials/introduction_to_python/basic_python_exercises_1-2.rst b/docs/source/tutorials/introduction_to_python/basic_python_exercises_1-2.rst
index 6ceec411fcd6d01a2792a1ed1f16914a247ed554..6d3e5f88cbd8b3d54ddc21eefac7cee5c9b42736 100644
--- a/docs/source/tutorials/introduction_to_python/basic_python_exercises_1-2.rst
+++ b/docs/source/tutorials/introduction_to_python/basic_python_exercises_1-2.rst
@@ -1,7 +1,7 @@
.. _basic_python_exercises_1-2:
=======================
-Basic Python Exercises
+Basic Python Exercises
=======================
- Here we will try some exercises to get to grips with the basics of
diff --git a/docs/source/tutorials/introduction_to_python/basic_python_exercises_3-4.rst b/docs/source/tutorials/introduction_to_python/basic_python_exercises_3-4.rst
index e5db7eef71373dc7c6e4e44e8d17a728a2519f6c..e9c3a122145f0029a6b34e9fa7feb37bdf6ce00f 100644
--- a/docs/source/tutorials/introduction_to_python/basic_python_exercises_3-4.rst
+++ b/docs/source/tutorials/introduction_to_python/basic_python_exercises_3-4.rst
@@ -1,7 +1,7 @@
.. _basic_python_exercises_3-4:
=======================
-Basic Python Exercises
+Basic Python Exercises
=======================
Exercise 3
diff --git a/docs/source/tutorials/introduction_to_python/basic_python_exercises_5.rst b/docs/source/tutorials/introduction_to_python/basic_python_exercises_5.rst
index 2b428082cdf522471a7c0d31f58ce21eaaf9900e..805a1fa174f0cc03610f06fff5d0c0c49833b1c2 100644
--- a/docs/source/tutorials/introduction_to_python/basic_python_exercises_5.rst
+++ b/docs/source/tutorials/introduction_to_python/basic_python_exercises_5.rst
@@ -1,7 +1,7 @@
.. _basic_python_exercises_5:
=======================
-Basic Python Exercises
+Basic Python Exercises
=======================
- This exercise aims to perform a moderately complicated set of
diff --git a/docs/source/tutorials/introduction_to_python/control_structures.rst b/docs/source/tutorials/introduction_to_python/control_structures.rst
index 2a9cd90e2785308fd9e60a0f9ba6f19ca349e78c..07996ef6f25e79e987a007f8570b524397e166e9 100644
--- a/docs/source/tutorials/introduction_to_python/control_structures.rst
+++ b/docs/source/tutorials/introduction_to_python/control_structures.rst
@@ -1,7 +1,7 @@
.. _control_structures:
==================
-Control Structures
+Control Structures
==================
- As in any programming language there are mechanisms to control
@@ -21,7 +21,7 @@ Comparisons testing
- ``<=`` Tests if lhs is less than or equal to rhs, e.g. ``x <= 2``
- ``>=`` Tests if lhs is greater than or equal rhs, e.g. ``x >= 2``
-|
+|
Control blocks
==============
diff --git a/docs/source/tutorials/introduction_to_python/error_handling.rst b/docs/source/tutorials/introduction_to_python/error_handling.rst
index f36d078d355ac629dfeaf016bce6455e70dd3bc8..bc2a99be6e1241feca78e55dcf2c83cbdb560aed 100644
--- a/docs/source/tutorials/introduction_to_python/error_handling.rst
+++ b/docs/source/tutorials/introduction_to_python/error_handling.rst
@@ -1,7 +1,7 @@
.. _error_handling:
==============
-Error Handling
+Error Handling
==============
- As we saw earlier Python can give error messages under certain
@@ -113,7 +113,7 @@ gives the output
gives the output
.. testoutput:: tryExcept4
-
+
Something went wrong but I don't know what
`Category:Tested Examples <Category:Tested_Examples>`__
diff --git a/docs/source/tutorials/introduction_to_python/index.rst b/docs/source/tutorials/introduction_to_python/index.rst
index 506cb6d50b41fbcde717ea2c9e09cfb2ce602ef6..deba1c09918e55246096fd7b8587db1d6bb00649 100644
--- a/docs/source/tutorials/introduction_to_python/index.rst
+++ b/docs/source/tutorials/introduction_to_python/index.rst
@@ -1,20 +1,20 @@
-.. _introduction_to_python:
+.. _introduction_to_python:
======================
Introduction to Python
======================
-The following set of slides provides an introduction to the Python language.
-It is designed for those with some programming experience and does not cover
-advanced material such as object oriented programming. For information regarding
-these topics see other references, e.g. "Core Python Programming", W. J. Chun,
-Prentice-Hall 2008; `"Learning Python", M. Lutz, O'Reilly, 2007;
+The following set of slides provides an introduction to the Python language.
+It is designed for those with some programming experience and does not cover
+advanced material such as object oriented programming. For information regarding
+these topics see other references, e.g. "Core Python Programming", W. J. Chun,
+Prentice-Hall 2008; `"Learning Python", M. Lutz, O'Reilly, 2007;
<http://docs.python.org/tutorial/>`_.
-.. toctree::
- :hidden:
- :glob:
- :maxdepth: 1
+.. toctree::
+ :hidden:
+ :glob:
+ :maxdepth: 1
basic_language_principles
type_conversions
@@ -32,7 +32,7 @@ Prentice-Hall 2008; `"Learning Python", M. Lutz, O'Reilly, 2007;
basic_python_exercises_5
solutions_to_exercises
-**Sections**
+**Sections**
* :ref:`basic_language_principles`
* :ref:`type_conversions`
diff --git a/docs/source/tutorials/introduction_to_python/looping.rst b/docs/source/tutorials/introduction_to_python/looping.rst
index a8aaf0b29f80cf715d644ef7eb3d38e43f00b9e5..57e7b47dc549f1837546c01871f2033f4a0a11a2 100644
--- a/docs/source/tutorials/introduction_to_python/looping.rst
+++ b/docs/source/tutorials/introduction_to_python/looping.rst
@@ -1,7 +1,7 @@
.. _looping:
=======
-Looping
+Looping
=======
- Executing a given block of code a number of times is achieved using
@@ -158,7 +158,7 @@ While
sum = 0
while sum < 10:
sum += 1 # ALWAYS remember to update the loop test or it will
- # run forever!!
+ # run forever!!
print(sum) # Gives value 10
diff --git a/docs/source/tutorials/introduction_to_python/more_sequence_types.rst b/docs/source/tutorials/introduction_to_python/more_sequence_types.rst
index e36684c7c7011867a3a216e6ab49afaa5765a1a2..7ef25c973c0f576b2d6d2d3912bfb9dc553a0667 100644
--- a/docs/source/tutorials/introduction_to_python/more_sequence_types.rst
+++ b/docs/source/tutorials/introduction_to_python/more_sequence_types.rst
@@ -1,7 +1,7 @@
.. _more_sequence_types:
===================
-More Sequence Types
+More Sequence Types
===================
Tuples
@@ -68,7 +68,7 @@ Dictionaries
empty_dict = {} # Empty dictionary
my_lookup = {'a' : 1, 'b' : 2} # A dictionary with two keys, each
# mapped to the respective value
- print(my_lookup['b'])
+ print(my_lookup['b'])
Gives the output:
@@ -129,10 +129,10 @@ Sets
.. code:: python
values = set([1,1,3])
- print(values)
+ print(values)
values.add(4)
values.remove(1)
- print(values)
+ print(values)
Gives the output:
@@ -162,13 +162,13 @@ Common Operations
.. testcode:: operations1
- s = [1,2,3,4,5,6] # Also works with all other sequence types
- print(len(s))
-
+ s = [1,2,3,4,5,6] # Also works with all other sequence types
+ print(len(s))
+
test = 3 in s
- print(test)
+ print(test)
test = 7 not in s
- print(test)
+ print(test)
Gives the output:
diff --git a/docs/source/tutorials/introduction_to_python/pattern_matching_with_regular_expressions.rst b/docs/source/tutorials/introduction_to_python/pattern_matching_with_regular_expressions.rst
index 9c89ba0494cbcb7dbd92d21059cba46eaaed1b61..3932ecd50f401856a3b90df4855e5b0cd84428d6 100644
--- a/docs/source/tutorials/introduction_to_python/pattern_matching_with_regular_expressions.rst
+++ b/docs/source/tutorials/introduction_to_python/pattern_matching_with_regular_expressions.rst
@@ -1,7 +1,7 @@
.. _pattern_matching_with_regular_expressions:
=========================================
-Pattern Matching With Regular Expressions
+Pattern Matching With Regular Expressions
=========================================
- A common file processing requirement is to match strings within the
@@ -43,7 +43,7 @@ Special Characters
- An asterisk ``*`` specifies that the character preceding it can
appear zero or more times, e.g,
-.. code::
+.. code::
regex: 'a*b'
test: 'b' # Matches as there are no occurrences of 'a'
@@ -55,7 +55,7 @@ Special Characters
- A range of characters, or a "character class" is defined using square
brackets ``[]``, e.g.
-.. code::
+.. code::
regex: '[a-z]'
test: 'm' # Matches as it is a lower case letter
@@ -64,7 +64,7 @@ Special Characters
- Several ranges can be specified such that they are all checked, e.g.
-.. code::
+.. code::
regex: '[a-z,A-Z,0-9]'
test: 'm' # Matches!
@@ -75,7 +75,7 @@ Special Characters
- Combining ranges and the asterisk allows us to specify any number of
alphanumeric characters!, e.g.
-.. code::
+.. code::
regex: '[a-z,A-Z,0-9]*'
test: 'mm' # Matches
@@ -83,7 +83,7 @@ Special Characters
- To specify an exact number of characters use braces ``{}``, e.g.
-.. code::
+.. code::
regex: 'a{2}'
test: 'abab' # Fails as there is not two consecutive a's in the string
@@ -123,12 +123,12 @@ Regular Expressions in Python
# End of function definition
checker = re.compile('[a-z]')
- checkForMatch(checker, 'a')
- checkForMatch(checker, '9')
+ checkForMatch(checker, 'a')
+ checkForMatch(checker, '9')
checker = re.compile('[a-z]', re.IGNORECASE)
- checkForMatch(checker, 'a')
- checkForMatch(checker, 'A')
+ checkForMatch(checker, 'a')
+ checkForMatch(checker, 'A')
Gives the output:
@@ -179,7 +179,7 @@ word 'OK!' or the test is considered a failure.
failCount -= 1
failCount += int(m.group(1))
testsPass = False
-
+
f.close()
print("Tests Passed: {}".format(testsPass))
diff --git a/docs/source/tutorials/introduction_to_python/sequence_data_types.rst b/docs/source/tutorials/introduction_to_python/sequence_data_types.rst
index bc422578330c633805bad5f601259b615a80ac95..6cfbfe5d4e7fa85bed6e8571cbc6d9883a738d34 100644
--- a/docs/source/tutorials/introduction_to_python/sequence_data_types.rst
+++ b/docs/source/tutorials/introduction_to_python/sequence_data_types.rst
@@ -1,7 +1,7 @@
.. _sequence_data_types:
===================
-Sequence Data Types
+Sequence Data Types
===================
- Python supports a range of types to store sequences. Here we will
@@ -34,13 +34,13 @@ Sequence Data Types
lottery_numbers.append(bonus)
# print the first element
- print(lottery_numbers[0])
+ print(lottery_numbers[0])
# print the last element
- print(lottery_numbers[6])
- print(lottery_numbers)
+ print(lottery_numbers[6])
+ print(lottery_numbers)
lottery_numbers.remove(5) # Removes first occurrence of value 5 in list
del lottery_numbers[0] # Removes the 0th element of the list
- print(lottery_numbers)
+ print(lottery_numbers)
lottery_numbers[3] = 42
print(lottery_numbers)
@@ -78,10 +78,10 @@ Givest the output:
.. testcode:: slice1
my_list = ['M','A', 'N', 'T', 'I', 'D']
- print(my_list[1:4])
+ print(my_list[1:4])
my_string = 'MANTID'
- print(my_string[1:4])
+ print(my_string[1:4])
Gives the output:
@@ -96,9 +96,9 @@ Gives the output:
.. testcode:: sort1
my_list = [5,4,3,2,7]
- print(my_list)
+ print(my_list)
my_list.sort()
- print(my_list)
+ print(my_list)
Gives the output:
@@ -115,7 +115,7 @@ Gives the output:
l = [5,4,3,2,7]
l.sort(reverse=True)
- print(l) #prints list in descending order
+ print(l) #prints list in descending order
Gives the output:
diff --git a/docs/source/tutorials/introduction_to_python/solutions_to_exercises.rst b/docs/source/tutorials/introduction_to_python/solutions_to_exercises.rst
index 32f26a15c6f175af6fb7d942feb56ad4c405d17f..c77b0ae9b6c82a4f7ab0415014fc2aacbdcc455c 100644
--- a/docs/source/tutorials/introduction_to_python/solutions_to_exercises.rst
+++ b/docs/source/tutorials/introduction_to_python/solutions_to_exercises.rst
@@ -1,7 +1,7 @@
.. _solutions_to_exercises:
======================
-Solutions To Exercises
+Solutions To Exercises
======================
Exercise 1
@@ -75,7 +75,7 @@ Exercise 3
## Use the list to print out the value of the ratio of successive numbers of the sequence,
## printing out the final value.
## Extend the program so that the Fibonacci list is calculated in a function that takes the
- ## number of required values as a parameter and returns the list.
+ ## number of required values as a parameter and returns the list.
# Function to calculate the first n fibonacci numbers
# and return them as a list
@@ -146,14 +146,14 @@ Exercise 4
# Write a program that creates a dictionary and initializes it with 5 names/ID pairs.
## Create a function that prints out the dictionary in a nicely formatted table;
## Update the dictionary with another 5 name/values and reprint the table,
- ## making sure you understand the ordering within the map.
+ ## making sure you understand the ordering within the map.
def formatLine(cola, colb, width):
return cola.center(width) + '|' + colb.center(width)
# A simple two cloumn print out
def outputStore(store):
- print('Phonebook contains {} entries:'.format(len(store)))
+ print('Phonebook contains {} entries:'.format(len(store)))
# Do a quick sweep to find out the longest name
col_width = 0
@@ -183,26 +183,26 @@ Exercise 4
#Phonebook contains 5 entries:
#------------------------------------------
- # Name | Ext.
+ # Name | Ext.
#------------------------------------------
- # Bob | 2314
- # Joe Bloggs | 1233
- # Linus Torvalds | 4132
- # Guido Van Rossum | 4321
- # Martyn Gigg | 1234
+ # Bob | 2314
+ # Joe Bloggs | 1233
+ # Linus Torvalds | 4132
+ # Guido Van Rossum | 4321
+ # Martyn Gigg | 1234
#Phonebook contains 9 entries:
#------------------------------------------
- # Name | Ext.
+ # Name | Ext.
#------------------------------------------
- # Guido Van Rossum | 4321
- # Martyn Gigg | 1234
- # Steve Jobs | 7898
- # Bjarne Strousoup | 9876
- # Joe Bloggs | 1233
- # Linus Torvalds | 4132
- # Dave | 7098
- # Bill Gates | 9898
- # Bob | 9871
+ # Guido Van Rossum | 4321
+ # Martyn Gigg | 1234
+ # Steve Jobs | 7898
+ # Bjarne Strousoup | 9876
+ # Joe Bloggs | 1233
+ # Linus Torvalds | 4132
+ # Dave | 7098
+ # Bill Gates | 9898
+ # Bob | 9871
Exercise 5
==========
@@ -240,8 +240,8 @@ Exercise 5
# 3. Split the line up into sections (Hint: The string has a .split() function that splits the string on
# whitespace and gives back a list with each section as an element of the list)
# 4. Convert the second column value into an integer
- # 5. Keep track of the values for each line and compute an average for the file.
- # 4. Finally, print out a list of file,average-value pairs
+ # 5. Keep track of the values for each line and compute an average for the file.
+ # 4. Finally, print out a list of file,average-value pairs
import os
file_dir = "C:\\MantidInstall\\data\\"
diff --git a/docs/source/tutorials/introduction_to_python/type_conversions.rst b/docs/source/tutorials/introduction_to_python/type_conversions.rst
index c8d8e8bba964ec8fc96f6a4f6f57e116cdc2d130..2d5a945a70a9a3b4b94f9bc92ad5ae08b914397a 100644
--- a/docs/source/tutorials/introduction_to_python/type_conversions.rst
+++ b/docs/source/tutorials/introduction_to_python/type_conversions.rst
@@ -1,7 +1,7 @@
.. _type_conversions:
================
-Type Conversions
+Type Conversions
================
- In many circumstances we want to be able to perform operations on
@@ -17,7 +17,7 @@ Type Conversions
answer = 42
y = x + str(answer) # This converts the number 42 to a string and joins
# it with the first string and then assigns y to a
- # new string containing the concatenated string
+ # new string containing the concatenated string
Printing
========
@@ -108,12 +108,12 @@ Converting Between Types
.. testcode:: types3
x = 1.0/2.0
- print(x)
+ print(x)
- # or using the float function float()
+ # or using the float function float()
x = 1
y = 2
- print(float(x)/float(y))
+ print(float(x)/float(y))
Gives the output:
diff --git a/docs/source/tutorials/introduction_to_python/using_modules.rst b/docs/source/tutorials/introduction_to_python/using_modules.rst
index 71dd34a2eb300ffebc044723f41e3d1fc11324f7..59e1b787c0b8deb8d920e614815bfebb6a7253f7 100644
--- a/docs/source/tutorials/introduction_to_python/using_modules.rst
+++ b/docs/source/tutorials/introduction_to_python/using_modules.rst
@@ -1,7 +1,7 @@
.. _using_modules:
=============
-Using Modules
+Using Modules
=============
- Functions allow blocks of code to be separated into reusable parts
@@ -28,7 +28,7 @@ Using Modules
nvals = len(values)
sum = 0.0
for v in values:
- sum += v
+ sum += v
return float(sum)/nvals
- To use this module from a user script we need to tell the script
@@ -40,7 +40,7 @@ Using Modules
## My script using the math module ##
import mymath # Note no .py
-
+
values = [2,4,6,8,10]
print('Squares:')
for v in values:
@@ -179,7 +179,7 @@ os.path
print(os.path.dirname(fullpath)) # prints 'C:\Users\Files'
# A userful function is expanduser which can expand the '~' token to a
- # user's directory (Documents and Settings\username on WinXP and
+ # user's directory (Documents and Settings\username on WinXP and
# /home/username on Linux/OSX)
print(os.path.expanduser('~/test')) # prints /home/[MYUSERNAME]/test on
# this machine where [MYUSERNAME] is
@@ -269,9 +269,9 @@ Gives the output:
.. testcode:: numpy2
import numpy
- a = numpy.array( [20, 30, 40, 50] )
- b = numpy.arange( 4 )
- c = a-b
+ a = numpy.array( [20, 30, 40, 50] )
+ b = numpy.arange( 4 )
+ c = a-b
print(c)
Gives the output:
diff --git a/docs/source/tutorials/introduction_to_python/working_with_files.rst b/docs/source/tutorials/introduction_to_python/working_with_files.rst
index 82b25d11c6929a4c9b9d1dc777426ce0e6ba143c..2aeac5b748c8ff3c1a2f803e1f4338ba45124e9e 100644
--- a/docs/source/tutorials/introduction_to_python/working_with_files.rst
+++ b/docs/source/tutorials/introduction_to_python/working_with_files.rst
@@ -1,7 +1,7 @@
.. _working_with_files:
==================
-Working With Files
+Working With Files
==================
- Reading/writing files in Python is made quite simple and both are
diff --git a/docs/source/tutorials/introduction_to_python/working_with_functions.rst b/docs/source/tutorials/introduction_to_python/working_with_functions.rst
index e8884319210c3a1e0cb5bc940814ccc66f783532..275f8e19a1c99f8d5d23163f9eda78706456cd56 100644
--- a/docs/source/tutorials/introduction_to_python/working_with_functions.rst
+++ b/docs/source/tutorials/introduction_to_python/working_with_functions.rst
@@ -1,7 +1,7 @@
.. _working_with_functions:
======================
-Working With Functions
+Working With Functions
======================
- Functions are useful for splitting out common code that can be reused
@@ -72,10 +72,10 @@ more useful.
def foo(A, B, C, D, E):
# ... Do something
return
-
+
foo(1, 2, 3, 4, 5) # Correct, no names given
foo(1, 2, 3, D=4, E=5) # Correct as the first 3 get assigned to the first
- # 3 of the function and then the last two are
+ # 3 of the function and then the last two are
# specified by name
foo(C=3, 1, 2, 4, 5) # Incorrect and will fail as a name has been
# specified first but then Python doesn't know
@@ -91,14 +91,14 @@ Default Arguments
- In some situations extra function parameters maybe required for extra
functionality but a user may want a certain default value to be
specified so that the majority of the time the function call can be
- executed without specifying the parameter,where the second argument is
- now optional and will be assigned the given value if the function is
+ executed without specifying the parameter,where the second argument is
+ now optional and will be assigned the given value if the function is
called without it.
.. testcode:: function2
def printSquare(n, verbose = False):
-
+
if verbose == True:
print( 'The square of ' + str(n) + ' is: ' + str(n*n))
elif verbose == False:
@@ -151,7 +151,7 @@ Gives the output:
return x*x, y*y
t = square(2,3)
- print(t)
+ print(t)
# Now access the tuple with usual operations
Gives the output:
@@ -172,7 +172,7 @@ Gives the output:
xsq, ysq = square(2,3)
print(xsq) # Prints 4
- print(ysq) # Prints 9
+ print(ysq) # Prints 9
# Tuple has vanished!
Gives the output:
diff --git a/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/01_introduction.rst b/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/01_introduction.rst
index 6996b4cba7410270fb0c446203ac17117fa5ab53..234a1bdeb3d8f6f1e801f4304e1b51759a64e5ca 100644
--- a/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/01_introduction.rst
+++ b/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/01_introduction.rst
@@ -1,7 +1,7 @@
.. _01_introduction_awh:
============
-Introduction
+Introduction
============
Workspaces are the data storage units of Mantid. If you
diff --git a/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/02_algorithms.rst b/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/02_algorithms.rst
index e1b313143a53c175892284e548c7f9fffa9ed06c..fafba6a5f3ed70ea8d4f4ce13d0a768362b09c0a 100644
--- a/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/02_algorithms.rst
+++ b/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/02_algorithms.rst
@@ -2,15 +2,15 @@
==========
-Algorithms
+Algorithms
==========
.. raw:: html
<style> .red {color:#FF0000; font-weight:bold} </style>
- <style> .green {color:#008000; font-weight:bold} </style>
- <style> .blue {color:#0000FF; font-weight:bold} </style>
- <style> .orange {color:#FF8C00; font-weight:bold} </style>
+ <style> .green {color:#008000; font-weight:bold} </style>
+ <style> .blue {color:#0000FF; font-weight:bold} </style>
+ <style> .orange {color:#FF8C00; font-weight:bold} </style>
.. role:: red
.. role:: blue
@@ -34,12 +34,12 @@ In Mantid Workbench, your primary source for Algorithms is the Algorithm Toolbox
shown on the right. The panel should be visible by default on the bottom
left of the Workbench window. You may have to click the Algorithm Tab on the very bottom corner of the main window.
-Find an Algorithm by looking through the :red:`Categories available` or :green:`Searching for its name`.
+Find an Algorithm by looking through the :red:`Categories available` or :green:`Searching for its name`.
In the :green:`search box`, start writing the algorithm name, and it will
filter algorithms by name as you continue typing.
-Bring up the relevant Algorithm Dialog by either clicking :green:`"Execute" on a searched Algorithm` or
+Bring up the relevant Algorithm Dialog by either clicking :green:`"Execute" on a searched Algorithm` or
:red:`double-clicking on its name in the category box`.
.. figure:: /images/MBC_AlgorithmDialog.png
@@ -51,15 +51,15 @@ Algorithm Help
--------------
Once you have an algorithm selected, you can get additional information
-such as what it does, its inputs, outputs, and how to use it.
-Click the :blue:`Help button [?]` on the algorithm dialog box for information
+such as what it does, its inputs, outputs, and how to use it.
+Click the :blue:`Help button [?]` on the algorithm dialog box for information
specific to this algorithm in our documentation.
Validation of Inputs
--------------------
Many algorithms have mandatory input properties. Others have constraints
-on the inputs, such as numbers that are bounded. The red asterisk `*` indicates
+on the inputs, such as numbers that are bounded. The red asterisk `*` indicates
required or incorrect inputs. Hover over the asterisk to see
what is wrong with the input.
@@ -70,15 +70,15 @@ not appear as a possible workspace to use as an input.
Overwriting InputWorkspace
--------------------------
-The :orange:`Match button` next to the OutputWorkspace entry will name
-the OutputWorkspace the same as the InputWorkspace, overwriting it in the process.
+The :orange:`Match button` next to the OutputWorkspace entry will name
+the OutputWorkspace the same as the InputWorkspace, overwriting it in the process.
Be careful that this is what you want to do. It can be a very useful tool!
Running Algorithms
------------------
On the Algorithm dialog, the run button will execute the algorithm. If
-successful, new output workspaces will appear in the Workspace Toolbox.
-Algorithm outputs are sent to the Messages Box, on the right of the main
+successful, new output workspaces will appear in the Workspace Toolbox.
+Algorithm outputs are sent to the Messages Box, on the right of the main
Mantid Workbench window. If the
algorithm fails to complete, the error should appear in the Messages Box.
\ No newline at end of file
diff --git a/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/03_workspaces.rst b/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/03_workspaces.rst
index ffa6674a2082625825420cafe19e955f2a08f647..09a61fed5ec2b4c7a29ffc2cf90e154387b066e8 100644
--- a/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/03_workspaces.rst
+++ b/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/03_workspaces.rst
@@ -1,17 +1,17 @@
.. _03_workspaces:
===========================================================
-What is a Bin?, What is a Workspace? and the Power of Rebin
+What is a Bin?, What is a Workspace? and the Power of Rebin
===========================================================
-Most data within Mantid are Histogram-like, so imagine a plot: There is an X-axis with a measured/calculated
-unit, such as Time-of-Flight (TOF) in μs. The Y-axis is the Counts (How many neutrons / positrons were detected
+Most data within Mantid are Histogram-like, so imagine a plot: There is an X-axis with a measured/calculated
+unit, such as Time-of-Flight (TOF) in μs. The Y-axis is the Counts (How many neutrons / positrons were detected
at each TOF value?) and will have the inverse unit of the X-axis, such as (μs):sup:`-1`.
-But in a Histogram we cut the X-axis into set range blocks, and plot the Total Count (Y) within each block (range in X). Each set range or block is referred to as a "Bin". The Bins may be of equal length or varying length (see right).
+But in a Histogram we cut the X-axis into set range blocks, and plot the Total Count (Y) within each block (range in X). Each set range or block is referred to as a "Bin". The Bins may be of equal length or varying length (see right).
-If Algorithms are the verbs of Mantid, then Workspaces are the nouns.
-Workspaces are used to store data within Mantid, and when you manipulate data,
+If Algorithms are the verbs of Mantid, then Workspaces are the nouns.
+Workspaces are used to store data within Mantid, and when you manipulate data,
you output to a new Workspace.
Workspaces come in several forms, but the most common two are the :ref:`Workspace2D` and the :ref:`EventWorkspace`. Their data are in an XYE format (the general Mantid term is :ref:`MatrixWorkspace`)
@@ -22,7 +22,7 @@ Workspace2D
===========
A :ref:`Workspace2D` is histogrammed data, with one or more spectra. For each spectrum X, Y (counts) and E
-(error) data is stored.
+(error) data is stored.
.. figure:: /images/MBC_Workspace2D.png
:width: 600px
@@ -30,7 +30,7 @@ A :ref:`Workspace2D` is histogrammed data, with one or more spectra. For each sp
:align: center
When the Matrix table of a Workspace is displayed (via right-click > "Show Data"):
-- Each row is a different Spectra.
+- Each row is a different Spectra.
- Each vertical column in X-data is (usually) the edges of each Bin
- Each vertical column in Y-data is the number of Counts in that Bin
- Each vertical column in E-data is the Error of the Y-data for that Bin
@@ -42,15 +42,15 @@ Note as the X-data refers to the Bin boundaries, there is one more column in the
Correct Binning
---------------
-Where bin boundaries are set along the X-axis determines, how long or short bins are. The overall arrangement
-of bins for a spectrum is called its **binning**. Converting units can lead to a *ragged workspace*, with inconsistent binning
-between different spectra! A Colorfill plot of ragged data looks poor and often algorithms will not accept a ragged input.
+Where bin boundaries are set along the X-axis determines, how long or short bins are. The overall arrangement
+of bins for a spectrum is called its **binning**. Converting units can lead to a *ragged workspace*, with inconsistent binning
+between different spectra! A Colorfill plot of ragged data looks poor and often algorithms will not accept a ragged input.
To fix this **Rebin** the ragged workspace with regular binning:
1. **Load** the *GEM38370_Focussed.nxs* file, naming the **OutputWorkspace** to be *ws*
2. Execute the Algorithm **ConvertUnits** with *ws* as the InputWorkspace, *ws_lambda* as the **OutputWorkspace**,
- **Target**\ =\ *Wavelength*, **EMode**\ =\ *Elastic*.
+ **Target**\ =\ *Wavelength*, **EMode**\ =\ *Elastic*.
3. Plotting the *ws_lambda* Workspace as a Colorfill demonstrates the ragged X-bins :-( .
( You may need to alter the max value of the colorbar to around 300 by double-click on the right of the colorbar)
@@ -103,7 +103,7 @@ Binning of Event Workspaces
:align: center
This extra information that Event Data has over Workspace2D (histogram) data
-means that rebinning is simply moving the Bin edges and summing the number of Counts
+means that rebinning is simply moving the Bin edges and summing the number of Counts
within the new Bin. While this can be done for Workspace2D (histogram) data, any split bins are averaged.
On the other hand, EventWorkspaces know (to a certain precision) exactly the Time of Arrival value for each particle
@@ -127,8 +127,8 @@ Example of Workspace usage
==========================
#. Load the event data HYS_11388_event.nxs
-#. Execute the **SumSpectra** algorithm and output to a sensible workspace name such as "HYS_sum"
-#. Rebin this summed Workspace with Params=10 (the width of each bin) with the box ticked to Preserve Events.
+#. Execute the **SumSpectra** algorithm and output to a sensible workspace name such as "HYS_sum"
+#. Rebin this summed Workspace with Params=10 (the width of each bin) with the box ticked to Preserve Events.
#. Rebin again to binwidths of 100, 300 and 1000.
#. Observe, on the plots below, that as the bins get larger, finer detail is "lost". It's nice to see rebinning graphically.
diff --git a/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/04_algorithm_histories.rst b/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/04_algorithm_histories.rst
index 61e3473bee94edeb1a71bb62dc5cfc99a97cec7c..818781aa67a3ced2a88297d0125938e37f31af3c 100644
--- a/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/04_algorithm_histories.rst
+++ b/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/04_algorithm_histories.rst
@@ -1,7 +1,7 @@
.. _04_algorithm_histories:
===================
-Algorithm Histories
+Algorithm Histories
===================
Algorithm History
@@ -13,7 +13,7 @@ it also provides the means to extract a re-executable python script from
the GUI.
#. Right click on the Workspace *Rebin300* and select 'Show History'. This will
- open up the Algorithm History window. In the list of Algorithms,
+ open up the Algorithm History window. In the list of Algorithms,
click on Rebin v.1 and you should see the following:
.. figure:: /images/HistoryRebinOfHYS_11388_event.png
diff --git a/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/05_interfaces.rst b/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/05_interfaces.rst
index 163009f0717e17af4b2ca9401ee506eb81906244..5c03416561ceb81226d6280db774720644962e61 100644
--- a/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/05_interfaces.rst
+++ b/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/05_interfaces.rst
@@ -1,14 +1,14 @@
.. _05_interfaces:
==========
-Interfaces
+Interfaces
==========
-Some analysis workflows are too complex, need more
-user input or need a better way to present the results than a single
-algorithm interface can provide. For this reason Mantid Workbench has specific interfaces
-for specific data analysis. Several interfaces have now been developed to handle different
-aspects of the reduction and analysis workflow for data from various
+Some analysis workflows are too complex, need more
+user input or need a better way to present the results than a single
+algorithm interface can provide. For this reason Mantid Workbench has specific interfaces
+for specific data analysis. Several interfaces have now been developed to handle different
+aspects of the reduction and analysis workflow for data from various
scientific techniques.
@@ -29,7 +29,7 @@ A simple walkthrough
#. Now click on the *Load User File* button and browse to "MaskFile.txt" in the loqdemo folder
#. Similarly, Load the batch file called "batch_mode_reduction.csv"
#. Some pre-set values will have populated the Run table and the **Settings** tab
-#. Back on the **Run** tab, notice that the Run table is editable and in the lower-right corner, there are several
+#. Back on the **Run** tab, notice that the Run table is editable and in the lower-right corner, there are several
options for Reducing and Saving data. Leave these as default for now.
#. In the top-right, click *Process All*, and notice in the main Mantid window, Workspaces will appear in the Workspaces Toolbox.
#. Plot the *second_time_main_1D_2.2_10.0* Workspace to produce the plot seen below.
diff --git a/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/06_exercises_a.rst b/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/06_exercises_a.rst
index 60c06ba3cccc8e1ed34098af4d4fe6e2276554a2..f425f2ce8fc33341f74179ef2658bc17bc0806e0 100644
--- a/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/06_exercises_a.rst
+++ b/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/06_exercises_a.rst
@@ -1,7 +1,7 @@
.. _06_exercises_a:
=========
-Exercises
+Exercises
=========
Exercise 1
@@ -52,7 +52,7 @@ Exercise 2
Exercise 3 - now you choose the OutputWorkspace names!
======================================================
-#. **Load** *HYS_11388_event.nxs* as in Exercise 1, but this time perform
+#. **Load** *HYS_11388_event.nxs* as in Exercise 1, but this time perform
the filtering as part of the Loading, by setting **FilterByTimeStart**\ =\ *4000*
#. **SumSpectra** on your new workspace
#. Use **RebinToWorkspace** to achieve the same binning as the existing
diff --git a/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/index.rst b/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/index.rst
index c393dfecd785c07dcc0a12c28a4526044745c2c9..44bfe7d74b2e584e42ce451fede11d1ac202ac46 100644
--- a/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/index.rst
+++ b/docs/source/tutorials/mantid_basic_course/algorithms_workspaces_and_histories/index.rst
@@ -1,15 +1,15 @@
-.. _algorithms_workspaces_and_histories:
+.. _algorithms_workspaces_and_histories:
====================================
-Algorithms, Workspaces and Histories
+Algorithms, Workspaces and Histories
====================================
The word Algorithm comes from the Latinised name of a Persian mathematician named al-KhwÄrizmÄ«. He has been described as the father of algebra.
-.. toctree::
- :hidden:
- :glob:
- :maxdepth: 1
+.. toctree::
+ :hidden:
+ :glob:
+ :maxdepth: 1
01_introduction
02_algorithms
@@ -18,7 +18,7 @@ The word Algorithm comes from the Latinised name of a Persian mathematician name
05_interfaces
06_exercises_a
-**Sections**
+**Sections**
* :ref:`01_introduction_awh`
* :ref:`02_algorithms`
diff --git a/docs/source/tutorials/mantid_basic_course/fitting_data/01_fitting_models_to_data.rst b/docs/source/tutorials/mantid_basic_course/fitting_data/01_fitting_models_to_data.rst
index 8fafcbb2ab3cd1690e69b4b2dc4a8f0ba554f6b1..0f412a3c33791fad7414401e55ccee8459f380dc 100644
--- a/docs/source/tutorials/mantid_basic_course/fitting_data/01_fitting_models_to_data.rst
+++ b/docs/source/tutorials/mantid_basic_course/fitting_data/01_fitting_models_to_data.rst
@@ -1,15 +1,15 @@
.. _01_fitting_models_to_data:
======================
-Fitting Models To Data
+Fitting Models To Data
======================
.. raw:: html
<style> .red {color:#FF0000; font-weight:bold} </style>
- <style> .green {color:#008000; font-weight:bold} </style>
- <style> .blue {color:#0000FF; font-weight:bold} </style>
- <style> .orange {color:#FF8C00; font-weight:bold} </style>
+ <style> .green {color:#008000; font-weight:bold} </style>
+ <style> .blue {color:#0000FF; font-weight:bold} </style>
+ <style> .orange {color:#FF8C00; font-weight:bold} </style>
.. role:: red
.. role:: blue
@@ -55,15 +55,15 @@ For now, just click on the drop-down menu "Fit" and run a normal Fit.
:alt: RunFitOption
:align: center
-6. Examine the results...
+6. Examine the results...
Fit results
===========
After a successful fit the results can be examined in three ways.
-A. A **plot of the fitted model** will be added to the graph which now
- shows the :blue:`Original data`, the :orange:`Calculated fit` and the :green:`Difference between them`.
+A. A **plot of the fitted model** will be added to the graph which now
+ shows the :blue:`Original data`, the :orange:`Calculated fit` and the :green:`Difference between them`.
B. The Fit Function property browser will show the **fitted parameters**
instead of their initial values. If you click on the :red:`triangle` beside `fo-ExpDecay` in the Functions list, it will reveal the Output fit parameters (Height and Lifetime values). Also the :red:`Chi-Squared value` is displayed at the top of the Fitting tab.
diff --git a/docs/source/tutorials/mantid_basic_course/fitting_data/02_complex_case.rst b/docs/source/tutorials/mantid_basic_course/fitting_data/02_complex_case.rst
index 88caab9ccdd57fbe8eb1079cf1b2c89d309a1ea1..765425162c648e257e9fc290269fb70aa169f883 100644
--- a/docs/source/tutorials/mantid_basic_course/fitting_data/02_complex_case.rst
+++ b/docs/source/tutorials/mantid_basic_course/fitting_data/02_complex_case.rst
@@ -7,9 +7,9 @@ A more Complex case
.. raw:: html
<style> .red {color:#FF0000; font-weight:bold} </style>
- <style> .green {color:#008000; font-weight:bold} </style>
- <style> .blue {color:#0000FF; font-weight:bold} </style>
- <style> .orange {color:#FF8C00; font-weight:bold} </style>
+ <style> .green {color:#008000; font-weight:bold} </style>
+ <style> .blue {color:#0000FF; font-weight:bold} </style>
+ <style> .orange {color:#FF8C00; font-weight:bold} </style>
.. role:: red
.. role:: blue
@@ -44,9 +44,9 @@ The fitting range is the region of the data where you will attempt to do
a fit, represented by the green vertical dashed lines. These
match the :green:`StartX and EndX values` in the Fit Property Browser.
-A. You can click and drag the vertical dashed lines to alter the range,
+A. You can click and drag the vertical dashed lines to alter the range,
which will update the StartX and EndX values.
-B. You can click on the StartX/EndX values and type in new ones,
+B. You can click on the StartX/EndX values and type in new ones,
which will update the dashed lines on the plot.
@@ -65,14 +65,14 @@ setting properties including:
More documentation of these is available from :ref:`Fitting`.
-Functions properties: Setting up a fit model
+Functions properties: Setting up a fit model
============================================
Let's build a model consisting of a peak and a background function.
-1. Right-click on the plot, and choose 'Select peak type' --> select *Gaussian*.
+1. Right-click on the plot, and choose 'Select peak type' --> select *Gaussian*.
Move the mouse cursor to click near the top of the peak.
-2. Click on the central solid red line and drag it sideways and upwards to set the initial peak centre and height. Drag either one of the dashed red lines to set the initial
+2. Click on the central solid red line and drag it sideways and upwards to set the initial peak centre and height. Drag either one of the dashed red lines to set the initial
Full Width Half Maximum (FWHM) of the peak.
.. figure:: /images/ChangePeakWidth.png
@@ -91,7 +91,7 @@ Just as with the StartX/EndX values, dragging on the plot and changing these val
:align: center
Now you have created a **CompositeFunction** model, which is the sum of a Gaussian and a
-Flat-background
+Flat-background
i.e. ``f0-Gaussian + f1-FlatBackground``
@@ -136,7 +136,7 @@ Tying and constraining fit parameters
The Mantid fitting framework allows you to tie or constrain parameters.
**Tying** sets a parameter equal to an expression
-of other parameters (from any of the selected functions).
+of other parameters (from any of the selected functions).
**Fixing** is basically tying a parameter to a number (constant).
diff --git a/docs/source/tutorials/mantid_basic_course/fitting_data/03_fit_model_choices.rst b/docs/source/tutorials/mantid_basic_course/fitting_data/03_fit_model_choices.rst
index 87e41dc5fc0f6acfba7d438f21900506cdf3495e..a791bba78958ea6381faaa4e2c8273bf7bda7e8c 100644
--- a/docs/source/tutorials/mantid_basic_course/fitting_data/03_fit_model_choices.rst
+++ b/docs/source/tutorials/mantid_basic_course/fitting_data/03_fit_model_choices.rst
@@ -1,13 +1,13 @@
.. _03_fit_model_choices:
=================
-Fit Model Choices
+Fit Model Choices
=================
Mantid contains an increasing catalog of predefined fitting
function, which can be used to create a model. Some are
-demonstrated here.
+demonstrated here.
In addition, it is possible to create new fitting
functions using the User Function toolbox.
@@ -59,7 +59,7 @@ Browser or with the help of the User Function Dialog:
:align: center
Type your function in the large lower text field. Browse the built-in functions above and add (|AddButton.png|) them
-to your formula. The fitting parameters are displayed in the Parameters
+to your formula. The fitting parameters are displayed in the Parameters
field (read-only). If the field is empty then your formula contains errors.
You can save the function you have defined, for future use. Click
diff --git a/docs/source/tutorials/mantid_basic_course/fitting_data/04_intelligent_fitting.rst b/docs/source/tutorials/mantid_basic_course/fitting_data/04_intelligent_fitting.rst
index 3f1c5c5ffc019525a70f20031c9d80a9c4cc6bb3..c0eb9cfd19e1f274e9dc900a488c1e518c053ae7 100644
--- a/docs/source/tutorials/mantid_basic_course/fitting_data/04_intelligent_fitting.rst
+++ b/docs/source/tutorials/mantid_basic_course/fitting_data/04_intelligent_fitting.rst
@@ -1,12 +1,12 @@
.. _04_intelligent_fitting:
===================
-Intelligent Fitting
+Intelligent Fitting
===================
-Here we will tackle a more advanced aspect of Mantid fitting:
+Here we will tackle a more advanced aspect of Mantid fitting:
an Asymmetric peak!
Load the file GEM63437_focussed.nxs file and plot the *GEM63437_focussed_3*
@@ -22,11 +22,11 @@ Try to fit it with a Gaussian (plus LinearBackground):
:alt: GEMGaussianFit.png
:align: center
-That's not a very good fit!
+That's not a very good fit!
-The Ikeda-Carpenter function is a better choice here.
+The Ikeda-Carpenter function is a better choice here.
But this is a difficult function to work with, it requires
-very good initial parameter values for the fit to converge.
+very good initial parameter values for the fit to converge.
Mantid uses pre-set values in a different way for each instrument. For example, when the Ikeda-Carpenter function is applied on data from the GEM instrument, the fitting tools take this into account when setting the initial values, hopefully resulting in a better fit.
diff --git a/docs/source/tutorials/mantid_basic_course/fitting_data/05_fitting_exercises.rst b/docs/source/tutorials/mantid_basic_course/fitting_data/05_fitting_exercises.rst
index 2a1ed03ed99be3675c39e4e06c0d4e91ff1f44b1..36b1e67da8393bfd224f4d815592af2cbaeb2589 100644
--- a/docs/source/tutorials/mantid_basic_course/fitting_data/05_fitting_exercises.rst
+++ b/docs/source/tutorials/mantid_basic_course/fitting_data/05_fitting_exercises.rst
@@ -1,7 +1,7 @@
.. _05_fitting_exercises:
=========
-Exercises
+Exercises
=========
@@ -56,12 +56,12 @@ Exercise 2
to be between approximately 2270 and 5000 microseconds
5. Right click on plot and select "Add background", then
LinearBackground
-6. Change the peak type to IkedaCarpenterPV.
-
+6. Change the peak type to IkedaCarpenterPV.
+
Remember, this is a peak function where
some parameters are set based on the relevant instrument
geometry. This is evident from the starting guess of the peak width
- but also by inspecting this function in the Fit Function panel.
+ but also by inspecting this function in the Fit Function panel.
7. Add an IkedaCarpenterPV peak to each of the three peaks, remembering to change the peak width (at least for the first one!)
8. Display > "Plot guess" and what you should see is something similar to
diff --git a/docs/source/tutorials/mantid_basic_course/fitting_data/index.rst b/docs/source/tutorials/mantid_basic_course/fitting_data/index.rst
index 7fc04da37ac20184ce75a4d8533bffac30a0e4fd..8d932bfd4acd46c6f4596c2a2dd1f0029f79965b 100644
--- a/docs/source/tutorials/mantid_basic_course/fitting_data/index.rst
+++ b/docs/source/tutorials/mantid_basic_course/fitting_data/index.rst
@@ -1,15 +1,15 @@
-.. _fitting_data:
+.. _fitting_data:
============
-Fitting Data
+Fitting Data
============
Regression analysis was developed throughout the 18th Century, leading to the first descriptions of Least Squares fitting by Legendre in 1805 and Gauss in 1809.
-.. toctree::
- :hidden:
- :glob:
- :maxdepth: 1
+.. toctree::
+ :hidden:
+ :glob:
+ :maxdepth: 1
01_fitting_models_to_data
02_complex_case
@@ -17,7 +17,7 @@ Regression analysis was developed throughout the 18th Century, leading to the fi
04_intelligent_fitting
05_fitting_exercises
-**Sections**
+**Sections**
* :ref:`01_fitting_models_to_data`
* :ref:`02_complex_case`
diff --git a/docs/source/tutorials/mantid_basic_course/getting_started/index.rst b/docs/source/tutorials/mantid_basic_course/getting_started/index.rst
index 1fa6f7426e8141319ad7f9df319f5afd9ffc2253..83e8da6319c2c6fe8b67ca67540fa627f9c3187c 100644
--- a/docs/source/tutorials/mantid_basic_course/getting_started/index.rst
+++ b/docs/source/tutorials/mantid_basic_course/getting_started/index.rst
@@ -1,18 +1,18 @@
-.. _getting_started_index:
+.. _getting_started_index:
===============
Getting Started
===============
-.. toctree::
- :hidden:
- :glob:
+.. toctree::
+ :hidden:
+ :glob:
:maxdepth: 1
getting_started
main_window
-**Sections**
+**Sections**
* :ref:`getting started`
* :ref:`main_window`
diff --git a/docs/source/tutorials/mantid_basic_course/getting_started/main_window.rst b/docs/source/tutorials/mantid_basic_course/getting_started/main_window.rst
index 8198bbdd14523c9685eace744a7132b96482021d..b69ba8276c26ff28512bd786f6bf4ee9ef6f4492 100644
--- a/docs/source/tutorials/mantid_basic_course/getting_started/main_window.rst
+++ b/docs/source/tutorials/mantid_basic_course/getting_started/main_window.rst
@@ -7,10 +7,10 @@ Workbench Main Window
.. raw:: html
<style> .red {color:#FF0000; font-weight:bold} </style>
- <style> .green {color:#008000; font-weight:bold} </style>
- <style> .blue {color:#0000FF; font-weight:bold} </style>
- <style> .orange {color:#FF8C00; font-weight:bold} </style>
- <style> .purple {color:#A431E6; font-weight:bold} </style>
+ <style> .green {color:#008000; font-weight:bold} </style>
+ <style> .blue {color:#0000FF; font-weight:bold} </style>
+ <style> .orange {color:#FF8C00; font-weight:bold} </style>
+ <style> .purple {color:#A431E6; font-weight:bold} </style>
.. role:: red
.. role:: blue
@@ -41,12 +41,12 @@ Quick Intro to Workspaces and Bins
==================================
A workspace is data stored within Mantid. It will appear in the Workspaces Toolbox.
-When you load a data file, it will create a Workspace. Likewise you can save a Workspace to a file.
-Many of the features of Mantid change Workspaces into other Workspaces. There are even different types of Workspaces in Mantid, which hold data in different formats.
+When you load a data file, it will create a Workspace. Likewise you can save a Workspace to a file.
+Many of the features of Mantid change Workspaces into other Workspaces. There are even different types of Workspaces in Mantid, which hold data in different formats.
A usual Workspace consists of a number of spectra, each cut into blocks called bins (more about spectra later). Mantid sums the number of counts in each bin and the line we plot connects the top of these bins.
-(Note that the bins can have different widths (defined by the instrument set-up)), such as below the bin-widths change from 10 to 20).
+(Note that the bins can have different widths (defined by the instrument set-up)), such as below the bin-widths change from 10 to 20).
.. plot::
:align: center
@@ -74,6 +74,6 @@ A usual Workspace consists of a number of spectra, each cut into blocks called b
plt.xlabel("X data eg. Time ($\mu s$)")
plt.ylabel("Y data eg. Counts ($\mu s$)$^{-1}$")
plt.title("Bins and Line Plots")
- plt.xticks(bin_edges)
+ plt.xticks(bin_edges)
plt.legend()
plt.show()
\ No newline at end of file
diff --git a/docs/source/tutorials/mantid_basic_course/index.rst b/docs/source/tutorials/mantid_basic_course/index.rst
index ec4e2d4d5a741895e0353756fd216768c92d9497..8172b679a1d1a654ccfae724edfb0a2d82043ddb 100644
--- a/docs/source/tutorials/mantid_basic_course/index.rst
+++ b/docs/source/tutorials/mantid_basic_course/index.rst
@@ -1,12 +1,12 @@
-.. _mantid_basic_course:
+.. _mantid_basic_course:
===================
Mantid Basic Course
===================
-.. toctree::
- :hidden:
- :glob:
+.. toctree::
+ :hidden:
+ :glob:
:maxdepth: 2
getting_started/index
@@ -20,12 +20,12 @@ Mantid Basic Course
This course gives a hands-on introduction to many of the important features of Mantid.
You will learn how to load, process, visualise and analyse data using Mantid.
-**Sections**
+**Sections**
* :ref:`getting_started_index`
* :ref:`loading_and_displaying_data`
* :ref:`algorithms_workspaces_and_histories`
-* :ref:`connecting_data_to_instruments`
+* :ref:`connecting_data_to_instruments`
* :ref:`fitting_data`
* :ref:`using_plot`
* :ref:`useful`
diff --git a/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/01_loading_data.rst b/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/01_loading_data.rst
index 2eda409f6c11ebb5d1c02eac373c44bc55d1bd8a..ee704087f5b071f98efb4f15e5fe982a76e45906 100644
--- a/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/01_loading_data.rst
+++ b/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/01_loading_data.rst
@@ -1,7 +1,7 @@
.. _01_loading_data:
============
-Loading Data
+Loading Data
============
.. figure:: /images/ShowLoadandWorkspaceAreaInMantidWB.png
@@ -17,7 +17,7 @@ instrument:
red), and select "File". This will open the Load Dialog window.
#. Browse to the location of the file MAR11060.raw.
- - If you successfully added the "TrainingCourseData" directory
+ - If you successfully added the "TrainingCourseData" directory
to the data search directories (see
:ref:`getting_started`) then you can simply
enter the filename "MAR11060.raw" in the File textbox.
diff --git a/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/02_the_matrix_workspace.rst b/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/02_the_matrix_workspace.rst
index 35dcc736145a31ce0479ca4551f35a79ab61e3ed..3d4b280b42c36416d18046402fcc7a229e4cd81b 100644
--- a/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/02_the_matrix_workspace.rst
+++ b/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/02_the_matrix_workspace.rst
@@ -1,7 +1,7 @@
.. _02_the_matrix_workspace:
============
-Viewing Data
+Viewing Data
============
@@ -48,12 +48,12 @@ flipping between the tabs you can see the X, Y and E values.
The Index number refers to the bin it relates to. On the "Y values" and "E values" tabs there is another number (above displayed with the unit 'μs').
-The first number at the left of each row we call the "Workspace Index" and
+The first number at the left of each row we call the "Workspace Index" and
is simply the row number as data is read into the
workspace; in the same way as a spreadsheet program like Excel uses row
-numbers. This always starts from zero, but the corresponding Spectrum
-Number is displayed as 'sp 1'.
-Often it is the case that the Spectrum Number is one greater than the
+numbers. This always starts from zero, but the corresponding Spectrum
+Number is displayed as 'sp 1'.
+Often it is the case that the Spectrum Number is one greater than the
Workspace Index, but this is not always the case. If you only load part
of a file, for example spectra 100 - 200, then the Workspace Indices
will still be 0-100, but Mantid will remember the original Spectra
diff --git a/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/03_displaying_1D_data.rst b/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/03_displaying_1D_data.rst
index 700fa10179dc38ff1d881e3953f7ea05273e35a1..48acb06ccb1863461d44eafb966c6b93cf045f21 100644
--- a/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/03_displaying_1D_data.rst
+++ b/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/03_displaying_1D_data.rst
@@ -1,7 +1,7 @@
.. _03_displaying_1D_data:
==================
-Displaying 1D Data
+Displaying 1D Data
==================
.. figure:: /images/SimpleGraph.png
@@ -68,11 +68,11 @@ Adding a curve to an existing plot
There are two ways to add spectra to an already existing graph, either
from the same workspace or from another.
-A. Drag the Workspace from the Workspace List and drop it onto the
+A. Drag the Workspace from the Workspace List and drop it onto the
graph you want to add the curve to.
B. Right-click the Workspace from the Workspace list and Select "Plot > Overplot spectrum ...". This will attach your additional spectra to your last active plot.
-* In both cases, if the Workspace contains more than one spectra you will
+* In both cases, if the Workspace contains more than one spectra you will
be asked which spectra you wish to add to the plot.
diff --git a/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/04_displaying_2D_data.rst b/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/04_displaying_2D_data.rst
index 6280bd5c18d49e62076929609faa75d85f4f6add..1cf235fbbcc8983bfa4636c064a09b17aec1ef65 100644
--- a/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/04_displaying_2D_data.rst
+++ b/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/04_displaying_2D_data.rst
@@ -1,7 +1,7 @@
.. _04_displaying_2D_data:
==================
-Displaying 2D Data
+Displaying 2D Data
==================
Plotting All Spectra
@@ -11,7 +11,7 @@ We have previously seen how to plot one or more rows from a dataset.
Here we will show how to visually inspect entire datasets.
#. Reload the MAR11060 dataset, but this time with no SpectraMin/Max limits.
-#. Right click the workspace in the workspace list and select "Plot >
+#. Right click the workspace in the workspace list and select "Plot >
Colorfill". This will create a fairly boring purple display of the
data, because one spectrum contains much higher counts than any of
the other spectra, and the color scale has adjusted accordingly.
diff --git a/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/05_plotting_advanced.rst b/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/05_plotting_advanced.rst
index e5fbd5419210e32803926e21563c3ae63b5ebba7..f2567177caf10e2eb965b757773e8827157d610c 100644
--- a/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/05_plotting_advanced.rst
+++ b/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/05_plotting_advanced.rst
@@ -1,7 +1,7 @@
.. _05_plotting_advanced:
=================
-Advanced Plotting
+Advanced Plotting
=================
.. This should be updated as Mantid Workbench gains more Plot Advanced features.
@@ -32,7 +32,7 @@ Tiled Plots
Tiled Plots can be done in a similar manner to
Waterfall plots, but with the appropriate choice of "Plot Type".
-If you produce a Tiled plot with more than about 4 tiles, you may need to
+If you produce a Tiled plot with more than about 4 tiles, you may need to
enlarge plot window or set it to full screen to appreciate all of the spectra.
.. figure:: /images/EMUTiledplot.png
diff --git a/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/06_formatting_plots.rst b/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/06_formatting_plots.rst
index d7c35e5a4633604db4e320e3313fe7785212109c..45a74196a92ba35a64189084f20a4021a8a1efe4 100644
--- a/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/06_formatting_plots.rst
+++ b/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/06_formatting_plots.rst
@@ -64,7 +64,7 @@ Click Menus
:align: center
-| **TIP**: Change a Legend entry by editing `Set curve label` on the Curves tab.
+| **TIP**: Change a Legend entry by editing `Set curve label` on the Curves tab.
Then on the Legend tab there are Color and Font options.
|
|
diff --git a/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/07_exercises.rst b/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/07_exercises.rst
index 13d922b09bdad6c8fce587ba644e4f4937048b9d..9a9bdceadaa07e22bfde08622ecb1c8baeae72b8 100644
--- a/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/07_exercises.rst
+++ b/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/07_exercises.rst
@@ -1,7 +1,7 @@
.. _07_exercises:
=========
-Exercises
+Exercises
=========
Part 1
@@ -48,8 +48,8 @@ below. Note it contains spectra 2 and 3 of both Workspaces
:alt: center
:width: 600px
-As a bonus part. Click the 'Generate a Script' button in the Plot Toolbar and save this script to file as "My_MARI_Plot.py". Close this plot and in the main Mantid window, select "File > Open Script" and navigate to your saved script. This script will open in the "Editor" window.
+As a bonus part. Click the 'Generate a Script' button in the Plot Toolbar and save this script to file as "My_MARI_Plot.py". Close this plot and in the main Mantid window, select "File > Open Script" and navigate to your saved script. This script will open in the "Editor" window.
-Use of Python within Mantid is saved for a follow-up course as it is not required, but here is a little preview of how it can be used, and more importantly how you can create a useful script for producing a plot!
+Use of Python within Mantid is saved for a follow-up course as it is not required, but here is a little preview of how it can be used, and more importantly how you can create a useful script for producing a plot!
Now you've got the script loaded, click the green arrow button to run this script, and your plot will appear!
diff --git a/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/index.rst b/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/index.rst
index c63173a494e972d0887c5cf25549b730a64fe6b9..98ce49e500ff2af22af10ecddb52b1e1c928003e 100644
--- a/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/index.rst
+++ b/docs/source/tutorials/mantid_basic_course/loading_and_displaying_data/index.rst
@@ -1,19 +1,19 @@
-.. _loading_and_displaying_data:
+.. _loading_and_displaying_data:
===========================
-Loading and Displaying Data
+Loading and Displaying Data
===========================
-“A picture is worth a thousand wordsâ€, para-phrased from Henrik Ibsen: "A thousand words leave not the same deep impression as does a single deed."
+“A picture is worth a thousand wordsâ€, para-phrased from Henrik Ibsen: "A thousand words leave not the same deep impression as does a single deed."
Many others have written similar sentiments: Leonardo Da Vinci wrote that a poet would be "overcome by sleep and hunger before [being able to] describe with words what a painter is able to in an instant."
And so the use of Plotting your Data!
-.. toctree::
- :hidden:
- :glob:
- :maxdepth: 1
+.. toctree::
+ :hidden:
+ :glob:
+ :maxdepth: 1
01_loading_data
02_the_matrix_workspace
@@ -23,7 +23,7 @@ And so the use of Plotting your Data!
06_formatting_plots
07_exercises
-**Sections**
+**Sections**
* :ref:`01_loading_data`
* :ref:`02_the_matrix_workspace`
diff --git a/docs/source/tutorials/mantid_basic_course/useful/01_save_settings.rst b/docs/source/tutorials/mantid_basic_course/useful/01_save_settings.rst
index 466608a3103119a50adbf7236be9be2474981017..79f73e2b5569de7de92184ae8bd92bbab7cc02dc 100644
--- a/docs/source/tutorials/mantid_basic_course/useful/01_save_settings.rst
+++ b/docs/source/tutorials/mantid_basic_course/useful/01_save_settings.rst
@@ -14,7 +14,7 @@ Saving and Settings
Saving
------
-You have learnt how to fit data, which produces its results as output workspaces.
+You have learnt how to fit data, which produces its results as output workspaces.
You have also learnt how to manipulate data with algorithms, and you will do more of this when analysing your data.
But it it is important to be able to save these outputs!
@@ -30,7 +30,7 @@ These are equivalent to Executing the Algorithms :ref:`SaveAscii2 <algm-SaveAsci
You can also save your current session of Mantid as a Project. A Project is saved to a folder (worth creating a new one!) with a (.nxs) file for each workspace and a mantidproject file (ending in :red:`.mtdproj` for Workbench) that has information such as what workspaces were loaded and what plots you had open.
-Opening a project will reload the Workspaces in the Workspaces Toolbox and reopen any plots or data tables. It will not, for instance, reopen Interfaces.
+Opening a project will reload the Workspaces in the Workspaces Toolbox and reopen any plots or data tables. It will not, for instance, reopen Interfaces.
**Note**: MantidPlot projects will not open in Mantid Workbench and vice versa. You can simply reload all of the workspaces from their (.nxs) files (in the same folder as the project file), but plots will not be reproduced!
diff --git a/docs/source/tutorials/mantid_basic_course/useful/02_scripts.rst b/docs/source/tutorials/mantid_basic_course/useful/02_scripts.rst
index e4da0c0dd6d9f33ee59a217310d12e98124ad69b..90ff08b03602a3eb3371a0e1ce2c22ffc8cf13f2 100644
--- a/docs/source/tutorials/mantid_basic_course/useful/02_scripts.rst
+++ b/docs/source/tutorials/mantid_basic_course/useful/02_scripts.rst
@@ -6,7 +6,7 @@ Working with Python
This is a quick summary of how to use python scripts in Workbench. To learn more about this, see the further tutorials on the `home page <https://www.mantidproject.org/Main_Page>`_. Even if you are a novice at Python, it is useful to know how to run a script as you can produce one within Mantid: from the "Generate a script" button on a plot toolbar, or from project recovery when you reopen Mantid after a crash.
-Within the Mantid you can make use of the script window or IPython prompt to manipulate data and build plots exactly to your specifications in ways that you would not
+Within the Mantid you can make use of the script window or IPython prompt to manipulate data and build plots exactly to your specifications in ways that you would not
be able to with the interface alone.
.. figure:: /images/Workbench_script_new.png
@@ -14,7 +14,7 @@ be able to with the interface alone.
:alt: A view of the Workbench script window
:align: center
-You can also use the IPython tab below the script editor to change to an inline Python interpreter. Both the python interpreter and scripts run through Mantid are able to interact
+You can also use the IPython tab below the script editor to change to an inline Python interpreter. Both the python interpreter and scripts run through Mantid are able to interact
with Mantid workspaces, plot and algorithms.
1. Default imports
@@ -25,7 +25,7 @@ By default any new script opened in Workbench will come with some default import
.. code-block:: python
from mantid.simpleapi import *
-
+
This imports all the algorithms from Mantid to be used within your Python script.
.. code-block:: python
@@ -65,7 +65,7 @@ The toggle whitespace visible option is global and will affect the appearance of
4. Status
=========
-The status bar tells you if the code in the currently open tab is running or not. If the code has been run previously the status bar will give details of the previous run including
+The status bar tells you if the code in the currently open tab is running or not. If the code has been run previously the status bar will give details of the previous run including
runtime, and whether the code ran without errors.
Useful Links
diff --git a/docs/source/tutorials/mantid_basic_course/useful/03_user_support.rst b/docs/source/tutorials/mantid_basic_course/useful/03_user_support.rst
index 4e6c9d29f723b800c04c1f9f30b65b7e722fefb3..d1db31a5079415c2c95f08a6c9143088aa6a917e 100644
--- a/docs/source/tutorials/mantid_basic_course/useful/03_user_support.rst
+++ b/docs/source/tutorials/mantid_basic_course/useful/03_user_support.rst
@@ -4,15 +4,15 @@
User Support
============
-Mantid is actively developed and as part of that we offer some User Support. While often your Instrument Scientist is your first port of call, you can contact us in a number of ways.
+Mantid is actively developed and as part of that we offer some User Support. While often your Instrument Scientist is your first port of call, you can contact us in a number of ways.
Contact Us
----------
-We are always keen for feedback, so if you have any suggestions for improving Mantid, then please contact us.
+We are always keen for feedback, so if you have any suggestions for improving Mantid, then please contact us.
-1. Through the `Mantid Help Forum <https://forum.mantidproject.org/>`_. Report a problem or ask for help. Remember to tag an appropriate topic.
+1. Through the `Mantid Help Forum <https://forum.mantidproject.org/>`_. Report a problem or ask for help. Remember to tag an appropriate topic.
This is quickly accessible through the top Toolbar in Mantid "Help > Mantid Forum"
@@ -20,7 +20,7 @@ This is quickly accessible through the top Toolbar in Mantid "Help > Mantid Foru
:alt: Mantid Help Forum
:align: center
-2. Mantid Help email: mantid-help@mantidproject.org
+2. Mantid Help email: mantid-help@mantidproject.org
Both of these methods go straight to our User Support Officer.
diff --git a/docs/source/tutorials/mantid_basic_course/useful/index.rst b/docs/source/tutorials/mantid_basic_course/useful/index.rst
index 523e2e7fd4a3338e7088d29a5c8df80de01fec58..ec79f7d82b0e22b3b25ca9999cc4f93c36b746ab 100644
--- a/docs/source/tutorials/mantid_basic_course/useful/index.rst
+++ b/docs/source/tutorials/mantid_basic_course/useful/index.rst
@@ -18,7 +18,7 @@ A few final tips!
04_the_end
-**Sections**
+**Sections**
* :ref:`01_save_settings`
* :ref:`02_scripts`
diff --git a/docs/source/tutorials/mantid_basic_course/using_MantidPlot/01_opening_mantid_plot.rst b/docs/source/tutorials/mantid_basic_course/using_MantidPlot/01_opening_mantid_plot.rst
index d1c59c670a4d4af3f76f0ea5a4294cab70b08aaa..c56ee7da77f9e79a8702bca01f50449f48439d46 100644
--- a/docs/source/tutorials/mantid_basic_course/using_MantidPlot/01_opening_mantid_plot.rst
+++ b/docs/source/tutorials/mantid_basic_course/using_MantidPlot/01_opening_mantid_plot.rst
@@ -7,11 +7,11 @@ Opening Mantid Plot
MantidPlot was built
on Qt4, but as Qt4 is no longer being supported, the Mantid Workbench was made using Matplotlib as the underlying tool for generating plots.
-Currently Mantid Workbench does not have all the functionality of MantidPlot, but it is getting very close and Workbench will replace MantidPlot ~ 2021.
+Currently Mantid Workbench does not have all the functionality of MantidPlot, but it is getting very close and Workbench will replace MantidPlot ~ 2021.
At that stage MantidPlot will no longer be distributed. Currently all development work is on Workbench and we only solve minor bug fixes in Plot.
-In this chapter we highlight some of the differences, as well as the features
-from MantidPlot that are not yet integrated into Workbench.
+In this chapter we highlight some of the differences, as well as the features
+from MantidPlot that are not yet integrated into Workbench.
Launching Mantid Plot
==========================
@@ -36,7 +36,7 @@ MantidPlot and the Mantid Workbench are visually different. Mantid Workbench has
You can tell the difference by the name in the top left corner, and the icon on the taskbar.
-Most of the basic functionality you have covered in Workbench is available to you in Plot, with a few extras in Plot.
+Most of the basic functionality you have covered in Workbench is available to you in Plot, with a few extras in Plot.
You still load workspaces as you did before but the workspaces right-click menu is different.
.. figure:: /images/Workbench_workspace_context_menu.png
diff --git a/docs/source/tutorials/mantid_basic_course/using_MantidPlot/02_lost_the_plot.rst b/docs/source/tutorials/mantid_basic_course/using_MantidPlot/02_lost_the_plot.rst
index b0c76367aef38d54a2cc508ad5270bdad2e2ff6a..cbbdf92da8001a47f69520319edc8842a3b4bdc7 100644
--- a/docs/source/tutorials/mantid_basic_course/using_MantidPlot/02_lost_the_plot.rst
+++ b/docs/source/tutorials/mantid_basic_course/using_MantidPlot/02_lost_the_plot.rst
@@ -4,7 +4,7 @@
Have I lost the Plot?
=====================
-If you've made it this far, then you already know how to Load Data, Execute an Algorithm on it, produce a Plot, open Slice Viewer or Instrument Viewer to Display your data and how to fit an appropriate model.
+If you've made it this far, then you already know how to Load Data, Execute an Algorithm on it, produce a Plot, open Slice Viewer or Instrument Viewer to Display your data and how to fit an appropriate model.
Behind the scenes, Plot and Workbench are very similar, so you can simply use your knowledge of Workbench if you decide (after discussing with your Instrument Scientist) to use Mantid Plot.
@@ -13,7 +13,7 @@ Here's some things worth looking out for:
Where's the script Editor?
--------------------------
-While this is front and centre in Workbench, in Plot you have to click the |ScriptEditorbutton.png| button in the top toolbar to open it.
+While this is front and centre in Workbench, in Plot you have to click the |ScriptEditorbutton.png| button in the top toolbar to open it.
If want to run a script here, then click Execute > "Execute All" or press "Ctrl+Enter".
@@ -40,7 +40,7 @@ Loading, basic Plotting, and Showing Data work the same as in Workbench. But...
Using Algorithms and managing Workspaces within their Toolboxes (however rearranged) works the same way, although...
-- There is no Plots Toolbox in Mantid Plot.
+- There is no Plots Toolbox in Mantid Plot.
- The Messages Box is called the Results Box in Mantid Plot.
.. |FittingButtonPlot.png| image:: /images/FittingButtonPlot.png
diff --git a/docs/source/tutorials/mantid_basic_course/using_MantidPlot/03_differences.rst b/docs/source/tutorials/mantid_basic_course/using_MantidPlot/03_differences.rst
index d9d1dfc440f3840962a43f822e29c3ae5611a12e..7ed7a7e689cc6b0b7fd72ef2c29619bc028b6fd4 100644
--- a/docs/source/tutorials/mantid_basic_course/using_MantidPlot/03_differences.rst
+++ b/docs/source/tutorials/mantid_basic_course/using_MantidPlot/03_differences.rst
@@ -14,7 +14,7 @@ While we are working to bring Workbench functionality in line with Mantid Plot,
Interfaces
----------
-Almost all interfaces have been moved over to Workbench, with the exception of the
+Almost all interfaces have been moved over to Workbench, with the exception of the
General category.
diff --git a/docs/source/tutorials/mantid_basic_course/using_MantidPlot/index.rst b/docs/source/tutorials/mantid_basic_course/using_MantidPlot/index.rst
index 88d462e7f10989529b3d382c8ea932953191c2bc..d0ed96da6cecc5aa4c27aed5ca09e97c67edf4dc 100644
--- a/docs/source/tutorials/mantid_basic_course/using_MantidPlot/index.rst
+++ b/docs/source/tutorials/mantid_basic_course/using_MantidPlot/index.rst
@@ -18,7 +18,7 @@ If Workbench is the Olympian Greek Gods, then Plot is the Titans before them.
03_differences
04_Exercises_Plot
-**Sections**
+**Sections**
* :ref:`01_opening_mantid_plot`
* :ref:`02_lost_the_plot`
diff --git a/docs/source/tutorials/muon_GUI_course/basics_of_data_reductions.rst b/docs/source/tutorials/muon_GUI_course/basics_of_data_reductions.rst
index 3cce0923f3713c15cd6e06cc70c9146fa8d5b9a9..b51e2026fba8e34ea237e55b9ea80d88135b0730 100644
--- a/docs/source/tutorials/muon_GUI_course/basics_of_data_reductions.rst
+++ b/docs/source/tutorials/muon_GUI_course/basics_of_data_reductions.rst
@@ -11,7 +11,7 @@ The Basics of Data Reduction
This section explains:
-* the concept of |tzero| and |tgood|
+* the concept of |tzero| and |tgood|
* the concept of dead time correction
* how to set the detector calibration factor, :math:`{\alpha}`
* how to group data
@@ -19,22 +19,22 @@ This section explains:
.. contents:: Table of Contents
:local:
-The concept of |tzero| and |tgood|
+The concept of |tzero| and |tgood|
==================================
-Since the muon data collected at ISIS is pulsed, the analysis of data produced by the equipment
-must account for this. The concept of |tzero| and |tgood| and is what is used to determine the start of a good pulsed data set.
+Since the muon data collected at ISIS is pulsed, the analysis of data produced by the equipment
+must account for this. The concept of |tzero| and |tgood| and is what is used to determine the start of a good pulsed data set.
The timing origin, |tzero|, for the muon response in the sample is when the middle of the
-muon pulse has reached the sample.
+muon pulse has reached the sample.
However, the good data region is not obtained until the *entire
-pulse* has arrived at the sample, this time is defined as |tgood|.
+pulse* has arrived at the sample, this time is defined as |tgood|.
The difference between |tgood| and |tzero| is t\ :sub:`good offset`\ .
When using the Muon Analysis GUI, |tzero| and |tgood| are loaded from the NeXuS file (having
-been determined by the instrument scientist).
+been determined by the instrument scientist).
.. figure:: /images/TgoodTzero.png
:scale: 60%
@@ -56,9 +56,9 @@ the correction of detector deadtime see: Kilcoyne, RAL report RAL-94-080 (1994).
To observe the effect of dead time, follow the instructions below:
1. Open the Muon Analysis GUI and make sure 'none' is selected for Dead Time Correction (in the Instrument section of the Home :ref:`Tab<the_tabs_home>`)
-2. Load data file `EMU00034998.nxs` using the GUI.
+2. Load data file `EMU00034998.nxs` using the GUI.
3. This example is best viewed with a fixed rebin with steps of ten, select `Fixed` from the dropdown menu and then type `10` into the box.
-4. A simple way to compare this data to some with dead time correction is to change the name so that Mantid does not automatically update the workspace.
+4. A simple way to compare this data to some with dead time correction is to change the name so that Mantid does not automatically update the workspace.
Go to the workspaces pane and navigate via `EMU34998` > `EMU34998 Pairs`, and right click on the Rebin dataset, then select `Rename` and pick a suitable new
name such as `NoDeadTime`, then click on Run.
5. Plot this data as described by Loading Data in :ref:`other_mantid_functions`.
@@ -71,13 +71,13 @@ To observe the effect of dead time, follow the instructions below:
.. figure:: /images/datareductionfig14.gif
:align: center
- Figure 14: The effect of dead time correction on a data set.
+ Figure 14: The effect of dead time correction on a data set.
The detector calibration factor, Alpha
======================================
-The detector calibration factor, α, used to normalise the asymmetry, can be determined by the use of the Guess Alpha
-tool on any detector group pairing. By default, using the asymmetry equation shown below, the α value is approximated
+The detector calibration factor, α, used to normalise the asymmetry, can be determined by the use of the Guess Alpha
+tool on any detector group pairing. By default, using the asymmetry equation shown below, the α value is approximated
to be 1. However, the Guess Alpha tool allows for a more accurate determination of the α value for a particular data set.
As an exercise, follow the instructions below to guess an :math:`{\alpha}` value and observe the resulting changes.
@@ -85,17 +85,17 @@ As an exercise, follow the instructions below to guess an :math:`{\alpha}` value
1. Using the GUI, load a transverse field measurement, such as `MUSR00024563`.
2. Select the Grouping tab
-Note that when a data file is loaded using the GUI, the default option for the MuSR spectrometer is to GROUP (or add) all data in detectors 1-32
+Note that when a data file is loaded using the GUI, the default option for the MuSR spectrometer is to GROUP (or add) all data in detectors 1-32
(a group of detectors referred to as `bck`) together. Similarly, data in detectors 33-64 (a group called `fwd`) is summed.
-
+
3. To generate :math:`{\alpha}` click on `Guess Alpha`. This process is shown in Figure 15.
.. figure:: /images/datareductionfig15.gif
:align: center
Figure 15: How to use the `Guess Alpha` tool in the Muon Analysis GUI.
-
-What has happened? (reloading the data file might be needed to observe the changes.)
-
+
+What has happened? (reloading the data file might be needed to observe the changes.)
+
4. Try creating a pair called `sample_long` as described in :ref:`the_tabs_grouping` and using `Guess Alpha` with this group highlighted rather than `long`. Consider the changes that can be observed.
diff --git a/docs/source/tutorials/muon_GUI_course/data_fitting.rst b/docs/source/tutorials/muon_GUI_course/data_fitting.rst
index 1b255c81b6c29ef033980bc9f90f53413f4aac9f..b62991ffb3077258c22f270d21e0079978b90688 100644
--- a/docs/source/tutorials/muon_GUI_course/data_fitting.rst
+++ b/docs/source/tutorials/muon_GUI_course/data_fitting.rst
@@ -10,8 +10,8 @@ Data Fitting
Fit Function
============
-There are multiple options within Mantid for fitting data.
-One such solution is the Fit Function tool. The Fit Function browser is similar to the Data Analysis section of the Muon Analysis GUI,
+There are multiple options within Mantid for fitting data.
+One such solution is the Fit Function tool. The Fit Function browser is similar to the Data Analysis section of the Muon Analysis GUI,
however, it is not restricted to muon analysis, and thus contains many more built-in options.
To demonstrate the process of fitting a function to a workspace with the Fit Function browser, follow the instructions below.
@@ -26,16 +26,16 @@ To demonstrate the process of fitting a function to a workspace with the Fit Fun
Figure 36: The `Fit` button and the interface.
4. A new panel should now open on the left hand side of the window, this is the Fit Function browser.
-5. Note the dashed vertical limit selection lines present on the plot. Clicking and dragging these lines the will update the data range that is used in the fit.
+5. Note the dashed vertical limit selection lines present on the plot. Clicking and dragging these lines the will update the data range that is used in the fit.
Try this now to set the fit limits to ~`0` and ~`12` :math:`{\mu s}`. The lines are not currently present in the Fitting tab of the Muon Analysis interface. Alternatively you
can use the `StartX` and `EndX` boxes.
-6. Similar to the Muon Analysis GUI, a function can be added by right clicking the `Functions` toggle and selecting `Add Function`. Then it is possible to pick a function from the menu.
+6. Similar to the Muon Analysis GUI, a function can be added by right clicking the `Functions` toggle and selecting `Add Function`. Then it is possible to pick a function from the menu.
Do this now and add an `ExpDecayOsc` function to the data.
-
-Alternatively, right clicking the plot, with the Fit Function browser open and select `Add other function..`.
+
+Alternatively, right clicking the plot, with the Fit Function browser open and select `Add other function..`.
This will bring up a selection box which lists all available fitting functions in alphabetical order.
-7. Fit `ExpDecayOsc` to the data by selecting `Fit` in the Fit Function browser's drop down menu. Figure 37 shows the process.
+7. Fit `ExpDecayOsc` to the data by selecting `Fit` in the Fit Function browser's drop down menu. Figure 37 shows the process.
Again note that a better fit is achieved if Alpha has been guessed via the Grouping :ref:`tab<the_tabs_grouping>`.
.. figure:: /images/datafittingfig37.gif
@@ -50,16 +50,16 @@ User Defined functions can be added using the Fit Function browser, see below fo
1. Load the file `EMU00011888.nxs` using the Muon Analysis GUI
2. Click on the arrow next to the `EMU11888` workspace in the ADS and plot the workspace ending in `fwd; Counts` as described in Loading Data.
-3. Click the `Fit` button at the right hand side of the toolbar to open the fit function browser.
+3. Click the `Fit` button at the right hand side of the toolbar to open the fit function browser.
4. Add the `UserFunction` function, this can be found in the `General` section of the fit function selection menu.
-5. In the Functions panel, there will now be an undefined `UserFunction`. Expand it to see the parameters and click on the empty box next to the `Formula` input box, and then the `...` button which appears.
+5. In the Functions panel, there will now be an undefined `UserFunction`. Expand it to see the parameters and click on the empty box next to the `Formula` input box, and then the `...` button which appears.
This will take you to the User Function dialogue box.
6. In the large blank white box at the bottom of the window, define the following function; `a*exp(-x/b)+c`. This is an exponential decay function for our data.
7. Make sure that the 'Parameters' box contains all of the parameters for the function (`a, b, c`) and click `Use` to define the function.
8. The three parameters should now appear in the function. Change their default values from `0` to `1`.
-9. Fit the function to the data. See Figure 38 for the process.
+9. Fit the function to the data. See Figure 38 for the process.
.. figure:: /images/user_def_fit2.gif
:align: center
- Figure 38: How to Fit a `UserDefined` function, using the Fit Function browser.
+ Figure 38: How to Fit a `UserDefined` function, using the Fit Function browser.
diff --git a/docs/source/tutorials/muon_GUI_course/getting_started.rst b/docs/source/tutorials/muon_GUI_course/getting_started.rst
index 93e71ae4db7a08bf826a13aa71c24f02c53a8c7d..aaf64741ff163c344fbd14366f985c51c28ec870 100644
--- a/docs/source/tutorials/muon_GUI_course/getting_started.rst
+++ b/docs/source/tutorials/muon_GUI_course/getting_started.rst
@@ -13,11 +13,11 @@ This section allows the user to:
* Download the data needed to complete this course.
* Set file data locations.
-This tutorial focuses on the reduction and analysis of Muon data collected from any of
-the ISIS muon instruments via a Graphical User Interface (GUI). This interface has been
+This tutorial focuses on the reduction and analysis of Muon data collected from any of
+the ISIS muon instruments via a Graphical User Interface (GUI). This interface has been
specifically designed to guide the user through the data reduction and analysis procedure
-The worked examples presented in this tutorial will be analysed using said GUI.
+The worked examples presented in this tutorial will be analysed using said GUI.
Launch the main Mantid interface by clicking on the MantidWorkbench icon on the desktop
@@ -27,30 +27,30 @@ To launch the Muon Analysis GUI follow:
on the tool bar at the top of the main MantidWorkbench window.
-The window shown below in Figure 1 should appear.
-A tab-driven approach guides the user through the standard data reduction and analysis
-procedure. The functionalities contained in the Home, Grouping,
-Fitting, and Results tabs are each discussed in turn, though note this tutorial does not currently
+The window shown below in Figure 1 should appear.
+A tab-driven approach guides the user through the standard data reduction and analysis
+procedure. The functionalities contained in the Home, Grouping,
+Fitting, and Results tabs are each discussed in turn, though note this tutorial does not currently
cover the Phase Table tab. Make sure you have downloaded the data used in this manual before commencing
-with this tutorial - it can be found `here <https://sourceforge.net/projects/mantid/files/Sample%20Data/SampleData-Muon.zip/download>`_
+with this tutorial - it can be found `here <https://sourceforge.net/projects/mantid/files/Sample%20Data/SampleData-Muon.zip/download>`_
.. figure:: /images/gettingstartedfig1.png
:align: center
-
+
Figure 1: The Muon Analysis interface.
Setting data file locations
---------------------------
-Before starting it is best to ensure that Mantid is configured for your needs.
-In particular, adding paths to directories which contain the worked example data will be useful.
-All the data used in this workbook can be found in the Reference Material folder.
+Before starting it is best to ensure that Mantid is configured for your needs.
+In particular, adding paths to directories which contain the worked example data will be useful.
+All the data used in this workbook can be found in the Reference Material folder.
* Select the default facility and instrument (this will be an option during installation)
-* Add paths to directories which contain your data.
+* Add paths to directories which contain your data.
-**Adding paths** To set a path, click on `Manage User Directories` at the bottom of the GUI, or go to `File` > `Manage User Directories` in the toolbar.
-The window shown in Figure 2 will appear. Data can be added as a path by browsing to its location, or typing the
+**Adding paths** To set a path, click on `Manage User Directories` at the bottom of the GUI, or go to `File` > `Manage User Directories` in the toolbar.
+The window shown in Figure 2 will appear. Data can be added as a path by browsing to its location, or typing the
directory name in the field below `Data Search Directories` and then clicking `Add Directory`. See Figure 3 for the process for how to do this for
the Reference Materials folder. Once a path has been added, data stored in that location can be accessed simply by referencing the run number.
@@ -62,4 +62,4 @@ the Reference Materials folder. Once a path has been added, data stored in that
.. figure:: /images/gettingstartedfig3.gif
:align: center
- Figure 3: How to access the `Manage User Directories` window and to set up a new path.
+ Figure 3: How to access the `Manage User Directories` window and to set up a new path.
diff --git a/docs/source/tutorials/muon_GUI_course/other_mantid_functions.rst b/docs/source/tutorials/muon_GUI_course/other_mantid_functions.rst
index afd61c758a305c1f86d2315b251433e8b03d6718..d17285c54754e8a9341a625b18714f3e1de0ab9a 100644
--- a/docs/source/tutorials/muon_GUI_course/other_mantid_functions.rst
+++ b/docs/source/tutorials/muon_GUI_course/other_mantid_functions.rst
@@ -1,7 +1,7 @@
.. _other_mantid_functions:
==================================================
-Other Mantid Functions and Basic Data Manipulation
+Other Mantid Functions and Basic Data Manipulation
==================================================
.. index:: Other Mantid Functions
@@ -30,26 +30,26 @@ algorithms which take a Matrix Workspace as input.
In addition to data, workspaces hold a workspace history, which details the algorithms
which have been run on this workspace.
-The `Analysis Data Service` (ADS), by default is found on the left-hand side of the main MantidWorkbench window.
+The `Analysis Data Service` (ADS), by default is found on the left-hand side of the main MantidWorkbench window.
When a muon data set is loaded via the GUI, the Matrix Workspaces are created automatically.
-* **NAME12345 MA** which contains all the Muon Analysis data for run `12345` on the `NAME` instrument.
+* **NAME12345 MA** which contains all the Muon Analysis data for run `12345` on the `NAME` instrument.
This data is further separated into more sub-workspaces, these are listed below.
* **NAME12345 Raw Data MA**, holds within it raw positron counts for each individual detector.
To examine the data collected in a single detector, right click on workspace and select Plot Spectrum.
There is one spectrum per detector. In the window that opens up, the number of the spectrum/detector
to plot, or a range of spectra, can be selected.
-* **NAME12345 Groups MA** contains data in raw counts and asymmetry, collated
- into the groups specified in the Grouping tab of the interface (see the Grouping section in :ref:`the_tabs_grouping` for more).
+* **NAME12345 Groups MA** contains data in raw counts and asymmetry, collated
+ into the groups specified in the Grouping tab of the interface (see the Grouping section in :ref:`the_tabs_grouping` for more).
Each workspace's name contains the name of the group it holds data for.
* **NAME12345 Pairs MA** these workspaces contain the Pairs (such as 'long' which is created by default) specified in the *Grouping Options* tab of the interface (see the Grouping section in :ref:`the_tabs_grouping` for more).
- Each workspace's name contains the name of the pair it holds data for.
+ Each workspace's name contains the name of the pair it holds data for.
-* **Fitting Results MA** contains the workspaces produced when data is fitted, the spectra and tables within are named with the convention `NAME12345; Group/Pair Asym; Asymmetry; MA; Fitted; FunctionName`.
- In order, the parts of these names correspond to: the data run, the group or pair fitted, the fact the data is asymmetry, that it is from Muon Analysis, that it has been
+* **Fitting Results MA** contains the workspaces produced when data is fitted, the spectra and tables within are named with the convention `NAME12345; Group/Pair Asym; Asymmetry; MA; Fitted; FunctionName`.
+ In order, the parts of these names correspond to: the data run, the group or pair fitted, the fact the data is asymmetry, that it is from Muon Analysis, that it has been
fitted, and what function(s) were used. Data in Fitting Results MA is split into the following sub-workspaces:
-* **Fitting Results_workspaces MA** contains the spectra of fitted asymmetry data. These workspaces contain three spectra - the original data, the fit, and the difference between the two,
+* **Fitting Results_workspaces MA** contains the spectra of fitted asymmetry data. These workspaces contain three spectra - the original data, the fit, and the difference between the two,
which are assigned spectrum numbers 1, 2, and 3 respectively.
* **Fitting Results_parameter_tables MA** contains tables of the parameters of the function used for a fit, along with their values and errors for that fit.
@@ -68,8 +68,8 @@ option on the analysis menu for subsequent data processing.
Loading Data
------------
-Matrix Workspaces are typically created by executing one of Mantid's 'Load' algorithms or are
-the output of algorithms which take a Matrix Workspace as input. In addition to data, workspaces
+Matrix Workspaces are typically created by executing one of Mantid's 'Load' algorithms or are
+the output of algorithms which take a Matrix Workspace as input. In addition to data, workspaces
hold a workspace history which lists the algorithms that have been applied to the data.
To load a raw data file *without using* the Mantid Analysis GUI, and examine its content:
@@ -96,7 +96,7 @@ It can be seen that a workspace called `HIFI00062798` has been created. It
* It contains 64 spectra (or histograms i.e. one for each HiFi detector)
* there are 2048 time channels, or bins, per plot
-However, the NeXuS format allows a lot more information be stored in a data file than that listed above. As an example
+However, the NeXuS format allows a lot more information be stored in a data file than that listed above. As an example
right click on the file name and select `Show Sample Logs`. A list of experiment and
instrument parameters that have been logged during a measurement, from
magnetic fields to sample temperatures, appears.
@@ -118,7 +118,7 @@ data collected in a single detector, right click on HIFI00062798 and select "Plo
On HiFi, as way of example, there are 64 detectors hence ID numbers: 1-64 (1-32 =
upstream detectors, 33-64 = downstream detectors.
-Enter a detector (ID) number of choice and click OK to plot the associated raw data.
+Enter a detector (ID) number of choice and click OK to plot the associated raw data.
This process is illustrated below.
.. figure:: /images/plot_spectrum2.gif
@@ -135,8 +135,8 @@ For information:
Exporting Data
==============
-To export the data contained within any listed workspace, the Algorithms tab at the
-bottom of the workspace list pane can be used.
+To export the data contained within any listed workspace, the Algorithms tab at the
+bottom of the workspace list pane can be used.
.. figure:: /images/AlgorithmsOptions.PNG
:align: center
@@ -153,8 +153,8 @@ Follow the instructions below to try this
Figure 8: Where to find the `SaveAscii` Algorithm.
-3. The `SaveAscii` Input Dialog box - shown in Figure 8 should appear. Select a directory (for the written data file) and specify a file name.
-4. Note the workspace to be exported can be selected from the uppermost dropdown list, next to `InputWorkspace`, in this case let us leave it as `HIFI00062798`.
+3. The `SaveAscii` Input Dialog box - shown in Figure 8 should appear. Select a directory (for the written data file) and specify a file name.
+4. Note the workspace to be exported can be selected from the uppermost dropdown list, next to `InputWorkspace`, in this case let us leave it as `HIFI00062798`.
5. Define which workspace spectra to export using the `WorkspaceIndexMin` and `WorkspaceIndexMax` inputs. Use these to save spectra `10` and `11`.
6. Choose the type of data separator used in the file (CSV is usually a reliable option), add comments and uncheck the `WriteXError` box.
7. Export the spectra.
@@ -162,7 +162,7 @@ Follow the instructions below to try this
Overlaying and Styling Plots
============================
-Overlaying data plots can be useful when trying to compare two different sets of data simultaneously by having them on one individual plot.
+Overlaying data plots can be useful when trying to compare two different sets of data simultaneously by having them on one individual plot.
Overlaying data can be done by simply clicking and dragging a workspace onto an existing plot, or can be done via the Overlaying Data option
from the workspace pane.
@@ -181,7 +181,7 @@ To try this follow these instructions:
Plot Styles
-----------
-The plot style a data set can be selected
+The plot style a data set can be selected
using the gear icon at the top of the plot window, this will open the Figure options menu.
To demonstrate changing a plot's markers and curve colour follow these instructions:
@@ -200,7 +200,7 @@ To demonstrate changing a plot's markers and curve colour follow these instructi
Editing Axes
------------
-One can also change the axis settings, such as the maximum and minimum values, and plotting against a logarithmic scale.
+One can also change the axis settings, such as the maximum and minimum values, and plotting against a logarithmic scale.
The axis limits can be changed either through the Figure options menu, or by double clicking on the relevant axis, while other .
See the instructions below for an example on how to change the X-Axis limits and set the Y-Scale to logarithmic.
@@ -210,18 +210,18 @@ See the instructions below for an example on how to change the X-Axis limits and
4. In the Axes tab of the Figure options, set the value in the box labelled `Upper Limit` to `16` **or** do the same for the box labelled `Max` in the Edit axis dialog.
5. Press `Apply`, **or** click the `OK` button.
6. In the `Axis` tab of the figure options, click the `y` button. Then use the `Scale` drop-down menu and change the setting to `log`. **Or** double click on the Y axis of the plot and tick the box labelled 'Log'.
-7. Click `OK` and observe the changes to the plot, this process is shown for the Figure options and Edit axis in Figures 11 and 12 respectively.
+7. Click `OK` and observe the changes to the plot, this process is shown for the Figure options and Edit axis in Figures 11 and 12 respectively.
.. figure:: /images/othermantidfunctionsfig11.gif
:align: center
Figure 11: Changing the X-Axis scale limits and setting the Y-Axis to logarithmic settings using the Figure options menu.
-
+
.. figure:: /images/othermantidfunctionsfig12.gif
:align: center
- Figure 12: Changing the X-Axis scale limits and setting the Y-Axis to logarithmic using the Edit axis dialog.
- Note that if the scale limits include negative values when doing this, Mantid
+ Figure 12: Changing the X-Axis scale limits and setting the Y-Axis to logarithmic using the Edit axis dialog.
+ Note that if the scale limits include negative values when doing this, Mantid
will automatically use a 'symmetrical log' scale, which allows for negative values by having a range around 0 where
the scale is linear not logarithmic.
diff --git a/docs/source/tutorials/muon_GUI_course/references.rst b/docs/source/tutorials/muon_GUI_course/references.rst
index b81ec25f72991a6ac5aaed1c06b6f9ceeaab47c4..8254d0a3cfa8bb3f0d7d61617bf6cc1e54700131 100644
--- a/docs/source/tutorials/muon_GUI_course/references.rst
+++ b/docs/source/tutorials/muon_GUI_course/references.rst
@@ -18,34 +18,34 @@ Books
* A Yaouanc, P. Dalmas de ReÌotier, MUON SPIN ROTATION, RELAXATION and RESONANCE (Oxford University Press, 2010)
* A Schenck, MUON SPIN ROTATION SPECTROSCOPY, (Adam Hilger, Bristol 1985)
-* E. Karlsson, SOLID STATE PHENOMENA, As Seen by Muons, Protons, and Excited
+* E. Karlsson, SOLID STATE PHENOMENA, As Seen by Muons, Protons, and Excited
Nuclei, (Clarendon, Oxford 1995)
-* S.L. Lee, S.H. Kilcoyne, R. Cywinski eds, MUON SCIENCE: MUONS IN PHYSICS; CHEMISTRY AND MATERIALS,
+* S.L. Lee, S.H. Kilcoyne, R. Cywinski eds, MUON SCIENCE: MUONS IN PHYSICS; CHEMISTRY AND MATERIALS,
(IOP Publishing, Bristol and Philadelphia, 1999)
Introductory Articles
=====================
-* S.J. Blundell, SPIN-POLARIZED MUONS IN CONDENSED MATTER PHYSICS,
+* S.J. Blundell, SPIN-POLARIZED MUONS IN CONDENSED MATTER PHYSICS,
Contemporary Physics 40, 175 (1999)
-* P. Bakule, E. Morenzoni, GENERATION AND APPLICATION OF SLOW POLARIZED MUONS,
+* P. Bakule, E. Morenzoni, GENERATION AND APPLICATION OF SLOW POLARIZED MUONS,
Contemporary Physics 45, 203-225 (2004)
Review Articles / Applications
==============================
-* P. Dalmas de ReÌotier and A. Yaouanc, MUON SPIN ROTATION AND RELAXATION IN MAGNETIC MATERIALS, J. Phys. Condens. Matter 9 (1997) pp.
+* P. Dalmas de ReÌotier and A. Yaouanc, MUON SPIN ROTATION AND RELAXATION IN MAGNETIC MATERIALS, J. Phys. Condens. Matter 9 (1997) pp.
9113-9166
-* A. Schenck and F.N. Gygax, MAGNETIC MATERIALS STUDIED BY MUON SPIN ROTATION SPECTROSCOPY, In: Handbook of Magnetic Materials,
+* A. Schenck and F.N. Gygax, MAGNETIC MATERIALS STUDIED BY MUON SPIN ROTATION SPECTROSCOPY, In: Handbook of Magnetic Materials,
edited by K.H.J. Buschow, Vol. 9 (Elsevier, Amsterdam 1995) pp. 57-302
* B.D. Patterson, MUONIUM STATES IN SEMICONDUCTORS, Rev. Mod. Phys. 60 (1988) pp. 69-159
-* A. Amato, HEAVY-FERMION SYSTEMS STUDIED BY μSR TECHNIQUES, Rev. Mod. Phys., 69, 1119
+* A. Amato, HEAVY-FERMION SYSTEMS STUDIED BY μSR TECHNIQUES, Rev. Mod. Phys., 69, 1119
(1997)
-* V. Storchak, N. Prokovev, QUANTUM DIFFUSION OF MUONS AND MUONIUM ATOMS IN SOLIDS,
+* V. Storchak, N. Prokovev, QUANTUM DIFFUSION OF MUONS AND MUONIUM ATOMS IN SOLIDS,
Rev. Mod. Physics, 70, 929 (1998)
-* J. Sonier, J. Brewer, R. Kiefl, uSR STUDIES OF VORTEX STATE IN TYPE-II SUPERCONDUCTORS,
+* J. Sonier, J. Brewer, R. Kiefl, uSR STUDIES OF VORTEX STATE IN TYPE-II SUPERCONDUCTORS,
Rev. Mod. Physics, 72, 769 (2000)
-* E. Roduner, THE POSITIVE MUON AS A PROBE IN FREE RADICAL CHEMISTRY,
+* E. Roduner, THE POSITIVE MUON AS A PROBE IN FREE RADICAL CHEMISTRY,
Lecture Notes in Chemistry No. 49 (Springer Verlag, Berlin 1988)
diff --git a/docs/source/tutorials/muon_GUI_course/the_tabs_fitting.rst b/docs/source/tutorials/muon_GUI_course/the_tabs_fitting.rst
index 313fcb3fee1d24ec1f087e31c2554db1d49d5601..0377dad6b18fafa6fa99e1d30cdf743a88dda359 100644
--- a/docs/source/tutorials/muon_GUI_course/the_tabs_fitting.rst
+++ b/docs/source/tutorials/muon_GUI_course/the_tabs_fitting.rst
@@ -20,7 +20,7 @@ The Fitting tab allows the user to:
.. figure:: /images/thetabsfittingfig24.png
:align: center
-
+
Figure 24: The Fitting tab options.
Mantid comes with a number of fitting functions. Additional functions may
@@ -67,9 +67,9 @@ To select a function right click in the box beneath where `Fit Status` is writte
A new window will appear with several drop-down titles; `Background`, `Calibrate` etc.; this is the Mantid-Fit dialog box.
-Follow the following instructions for an example of fitting:
-
-1. Load the `HIFI00062798` file from the reference material folder in the home tab.
+Follow the following instructions for an example of fitting:
+
+1. Load the `HIFI00062798` file from the reference material folder in the home tab.
2. Open the Fitting tab and right click in the functions box and select `Add Function`.
3. Go to the `Muon` drop-down title in the Fit dialogue box.
4. Expand the `MuonGeneric` section and then select `ExpDecayOsc`, and press the `OK` button. This process is shown in Figure 25.
@@ -77,7 +77,7 @@ Follow the following instructions for an example of fitting:
.. figure:: /images/thetabsfittingfig25.gif
:align: center
- Figure 25: How to add a function to a data set.
+ Figure 25: How to add a function to a data set.
*NB: To remove the function, right click on the function name and select Remove.*
@@ -86,17 +86,17 @@ Function Parameters
Once a function has been selected its name will appear in the Property column. To
examine a function's fit parameters, click on the small arrow beside the function name to
-expand the entry. Generic properties for performing the fit itself - such as start and end times,
+expand the entry. Generic properties for performing the fit itself - such as start and end times,
what minimizer to use etc. are located in the table below the functions table.
-The parameters of a function can be adjusted in order to give the user maximum control over the fitting result of the data.
-These parameters can be adjusted before or after fitting initially, however it will require re-fitting for the changes to apply.
-Factors such as the time range fitted and fixing constraint boundaries can be adjusted.
+The parameters of a function can be adjusted in order to give the user maximum control over the fitting result of the data.
+These parameters can be adjusted before or after fitting initially, however it will require re-fitting for the changes to apply.
+Factors such as the time range fitted and fixing constraint boundaries can be adjusted.
Once the user is happy with the initial fit parameters, clicking `Fit` will perform chosen fit
-to the data. The fit parameters will then be updated.
+to the data. The fit parameters will then be updated.
-To illustrate this:
+To illustrate this:
1. If not already done, load the `HIFI00062798` file and add `ExpDecayOsc` function (see above for instructions).
2. Adjust the fit limits in the lower table, for instance set `start` and `end` times of `0.2` and `12` :math:`{\mu s}` respectively.
@@ -106,7 +106,7 @@ To illustrate this:
.. figure:: /images/thetabsfittingfig26.gif
:align: center
- Figure 26: How to change the fitting scale of a function.
+ Figure 26: How to change the fitting scale of a function.
.. figure:: /images/thetabsfittingfig27.png
:align: center
@@ -117,7 +117,7 @@ Each fit parameter can also be bound by certain fit limits (+/- 10% of its start
a custom value), fixed at a specific user determined value, or tied together using some functional form.
To demonstrate setting bound limits:
-
+
1. Go to the function name and ensure the top down arrow is clicked so all fit parameters are visible.
2. Right click the parameter `A` and select `Constraints` > `Both Bounds` > `50%`. The `A` parameter now has both its' upper and lower bounds fixed to `50%` of the value of `A`.
@@ -128,51 +128,51 @@ Data will sometimes require a function which is made up of multiple other functi
To create a fit function involving adding and multiplying functions, follow the examples below.
1. Load the `EMU00019631.nxs` file
-2. Add the function `StaticKuboToyabe` (under `MuonGeneric`) to the data, using the method from `Using Fit Functions`_.
+2. Add the function `StaticKuboToyabe` (under `MuonGeneric`) to the data, using the method from `Using Fit Functions`_.
3. Repeat the same method to add a second function, `ExpDecayMuon`, to the same data set. Simply adding a function creates a composite where all functions are summed. See Figure 26 for the process.
-
+
.. figure:: /images/thetabsfittingfig28.gif
:align: center
-
- Figure 28: How to add two functions together.
-
-4. At this point, it is possible to fit the composite function to the data. Do so now, and consider the quality of the fit between from :math:`x=0` and :math:`x=12`.
+
+ Figure 28: How to add two functions together.
+
+4. At this point, it is possible to fit the composite function to the data. Do so now, and consider the quality of the fit between from :math:`x=0` and :math:`x=12`.
(see Overlaying and Styling Plots in :ref:`other_mantid_functions` for changing plot limits).
.. figure:: /images/thetabsfittingfig29.png
:align: center
-Figure 29: A plot of the `ExpDecayMuon` and `StaticKuboToyabe` functions added together and fitted to `EMU19631`.
-
-5. It should be clear that the sum of these functions does not properly model the oscillations in the data set, to rectify this a product function can be used.
+Figure 29: A plot of the `ExpDecayMuon` and `StaticKuboToyabe` functions added together and fitted to `EMU19631`.
+
+5. It should be clear that the sum of these functions does not properly model the oscillations in the data set, to rectify this a product function can be used.
6. Add the `ProductFunction` function (from the `General` function type), and remove `ExpDecayMuon` by right clicking on it and selecting `Remove`.
7. Right click on the newly added `ProductFunction` and add two functions to it - `ExpDecayMuon` and `GausOsc`.
-8. The total function now consists of :math:`StaticKuboToyabe + (ExpDecayMuon * GausOsc)`.
+8. The total function now consists of :math:`StaticKuboToyabe + (ExpDecayMuon * GausOsc)`.
(The perceptive reader may have noticed that the same effect can be achieved by adding `StaticKuboToyabe` and `GausOsc`, this is true, however it would not demonstrate the use of the `ProductFunction`)
9. Fit the new function to the data, note that :math:`{\chi}` (chi) squared has decreased from 6.844 to 2.026 - the new fit function is a much better fit to the data. (Note: the workspace is stored in
`EMU19631; Pair Asym; long; MA; Fitted; StaticKuboToyabe, Productfunction`)
.. figure:: /images/thetabsfittingfig30.gif
:align: center
-
+
Figure 30: How to add a function which is a product of two other functions to a third.
Sequentially Fitting Multiple Datasets
--------------------------------------
-Multiple workspaces can be selected in different combinations. Selecting many workspaces is useful for when using the sequential option,
+Multiple workspaces can be selected in different combinations. Selecting many workspaces is useful for when using the sequential option,
which allows Mantid to fit one function with a consistent set of parameters to a range of data sets. You need to use the separate Sequential Fitting tab to do this.
-Follow the instructions below in order to sequentially fit a function to a range of data.
+Follow the instructions below in order to sequentially fit a function to a range of data.
1. Load the data sets from `EMU00019631-EMU00019634`.
2. Set up a function where `StaticKuboToyabe` and `ExpDecayMuon` are added together in the Fitting tab.
3. Navigate to the Sequential Fitting tab and click `Sequentially fit all`.
4. To make a custom selection of data to fit, click on the run number in the table below, and then click `Fit selected`.
5. The plot will automatically show the selected fit. Use this to check all of the fits.
-
+
.. figure:: /images/thetabsfittingfig31.gif
:align: center
-
+
Figure 31: How to use sequential fit on multiple data sets.
For more specifics on each option in the Fitting tab, see the Fitting section of :ref:`Muon_Analysis-ref`
diff --git a/docs/source/tutorials/muon_GUI_course/the_tabs_grouping.rst b/docs/source/tutorials/muon_GUI_course/the_tabs_grouping.rst
index a1eb71e02ec1da22e59cecf79e94bd1f748d5ec9..c1a1dc0f88f0cee7fb3ca4ba69f7424f336aabeb 100644
--- a/docs/source/tutorials/muon_GUI_course/the_tabs_grouping.rst
+++ b/docs/source/tutorials/muon_GUI_course/the_tabs_grouping.rst
@@ -8,7 +8,7 @@ The Tabs - Grouping
.. contents:: Table of Contents
:local:
-
+
Grouping
========
@@ -26,15 +26,15 @@ The **Grouping** options are shown below
Figure 18: The Grouping Options tab of the Muon Analysis Interface.
-Standard detector groupings are usually loaded when a data file is opened, which each incorporate one
-half of the total detectors of the equipment being used. For example, for the EMu spectrometer detectors 1 – 48
-and 49 - 96 are automatically assigned to the forward and backward detector arrays.
+Standard detector groupings are usually loaded when a data file is opened, which each incorporate one
+half of the total detectors of the equipment being used. For example, for the EMu spectrometer detectors 1 – 48
+and 49 - 96 are automatically assigned to the forward and backward detector arrays.
Data Grouping
-------------
-When a workspace is opened using the Muon Analysis GUI, a plot of the data automatically opens with it. For measurements not taken in transverse fields, this
+When a workspace is opened using the Muon Analysis GUI, a plot of the data automatically opens with it. For measurements not taken in transverse fields, this
plot is set to show the asymmetry by default, which is the normalised ratio of the Forward (:math:`F`) and Backward (:math:`B`) detector banks' positron counts; as given by the equation:
.. math:: P_z(t) = A_0G_z(t) = \frac{F(t) - \alpha B(t)}{F(t) + \alpha B(t)}
@@ -50,9 +50,9 @@ Data collected only in the Forward, or Backward, detector banks can be viewed in
1. Load the `MUSR00024563` file in the Muon Analysis GUI.
2. On the Grouping Tab tick the checkboxes next to forward (`fwd`) and backward (`bwd`) detector arrays. Then untick the checkbox next to `long`.
3. Observe and consider the difference in the plot. This is shown in Figure 18.
-
+
.. figure:: /images/thetabsgroupingfig20.gif
-
+
Figure 20: Plotting forward and backward counts
@@ -60,18 +60,18 @@ Data collected only in the Forward, or Backward, detector banks can be viewed in
Plot Type
---------
-Though the plot type shows asymmetry by default it can be changed to show positron counts against time using the Plot Type drop-down menu, which can be found in the Plotting section of the Home tab.
+Though the plot type shows asymmetry by default it can be changed to show positron counts against time using the Plot Type drop-down menu, which can be found in the Plotting section of the Home tab.
To demonstrate this, follow the example below.
1. MUSR00024563.nxs should still be loaded from the previous task; if not, re-load the file.
2. Ensure that the Group / Pair drop-down menu is set to either 'bwd' or 'fwd', as the plot type will not change if this is set to 'long'.
-3. Underneath the Plot Data section, in the Plot Type box change the type from 'Asymmetry' to 'Counts'.
+3. Underneath the Plot Data section, in the Plot Type box change the type from 'Asymmetry' to 'Counts'.
There should be a change in the data plot. See Figure 21 for the process.
.. figure:: /images/thetabsgroupingfig21.gif
:align: center
- Figure 21: How to change the plot type using the Muon Analysis GUI.
+ Figure 21: How to change the plot type using the Muon Analysis GUI.
Plot options (such as symbol type, lines etc.) are described in Overlaying and Styling Plots section of :ref:`other_mantid_functions`.
@@ -88,15 +88,15 @@ Adding Detector Groups and Pairs
--------------------------------
Different detector grouping configurations can be entered manually, as can Group Pairs.
-A Group Pair is a combination of two different detector groups. For example, the default detector groups `fwd`
+A Group Pair is a combination of two different detector groups. For example, the default detector groups `fwd`
and `bwd` are used a pair called `long`. This combines the detectors from both groups in order to be able to view them together.
-For the MuSR equipment this default case means viewing all 64 detectors. A detector group pair can include any two groups found in the group table.
+For the MuSR equipment this default case means viewing all 64 detectors. A detector group pair can include any two groups found in the group table.
-To try assigning new detector groups and pairs with the `MUSR00024563` file (see :ref:`Home <the_tabs_home>` for how to load files),
+To try assigning new detector groups and pairs with the `MUSR00024563` file (see :ref:`Home <the_tabs_home>` for how to load files),
follow the instructions below. For assistance, see figures 22 and 23.
1. First, go to the Grouping tab in the muon analysis GUI.
-2. Under the 'Description:', there is a table of the existing groups, with `Group Name`, `Analyse (plot/fit)`, `Detector IDs` and `N Detectors` as columns.
+2. Under the 'Description:', there is a table of the existing groups, with `Group Name`, `Analyse (plot/fit)`, `Detector IDs` and `N Detectors` as columns.
`bwd` and `fwd` should already be saved as groups.
3. In the blank space under the existing group names, right click, select `Add Group` and enter the name `sample_fwd`. This will be one of our new groups.
4. Assign this new group `Detector IDs` of `1-2`, in the blank space in the same row. `Ndet` will then fill automatically.
@@ -106,24 +106,24 @@ follow the instructions below. For assistance, see figures 22 and 23.
:align: center
Figure 22: How to add a new detector group using the Muon analysis GUI.
-
-*NB any string of numbers can be defined as `Detector IDs`, so long as they are within the number of detectors on the equipment
+
+*NB any string of numbers can be defined as `Detector IDs`, so long as they are within the number of detectors on the equipment
used (i.e. `1,3-5,15,17-18` would be valid and `1,3-5,10324` would be invalid).*
-
+
6. At the bottom of the tab there should be a table containing the default `long` pair details. The columns in this table read `Pair Name`, `Analyse (plot/fit)`, `Group 1`, `Group 2`, `Alpha`, and `Guess Alpha`.
-7. In the blank space under `long` in the `Name` column, right click and enter a name for a new pair, such as `sample_long`.
-8. In the same row as the new pair, in the `Group 1` column select `sample_fwd` from the drop down menu and in the `Group 2` column select `sample_bwd`. To update the:math:`{\alpha}` value, click `Guess Alpha`. This process is
+7. In the blank space under `long` in the `Name` column, right click and enter a name for a new pair, such as `sample_long`.
+8. In the same row as the new pair, in the `Group 1` column select `sample_fwd` from the drop down menu and in the `Group 2` column select `sample_bwd`. To update the:math:`{\alpha}` value, click `Guess Alpha`. This process is
shown in figure 21 below.
.. figure:: /images/thetabsgroupingfig23.gif
:align: center
- Figure 23: Adding a new group pair in the Muon Analysis GUI.
+ Figure 23: Adding a new group pair in the Muon Analysis GUI.
Once defined, these new user grouping options propagate through the Muon Analysis tabs.
For example, in the :ref:`Home <the_tabs_home>`, the options under Group/Group Pair are automatically
updated to include user defined detector configurations. From there, the new groups can be plotted
-as they would be for the default long, bwd and fwd groups.
+as they would be for the default long, bwd and fwd groups.
Finally, :math:`{\alpha}` can be determined for any given detector pairing (via the analysis of
transverse field data) by clicking on `Guess Alpha`. Click on a specific Group Pair name to
diff --git a/docs/source/tutorials/muon_GUI_course/the_tabs_home.rst b/docs/source/tutorials/muon_GUI_course/the_tabs_home.rst
index 89d582881f76d4fb9d407a0f4fd8a3d2ee0ecc7b..217eb71fe776e5972d9526fa44f43533226aad99 100644
--- a/docs/source/tutorials/muon_GUI_course/the_tabs_home.rst
+++ b/docs/source/tutorials/muon_GUI_course/the_tabs_home.rst
@@ -12,7 +12,7 @@ The Tabs - Home
Home
====
-When launched, the Muon Analysis GUI defaults to the Home tab. This tab allows:
+When launched, the Muon Analysis GUI defaults to the Home tab. This tab allows:
* Data files to be loaded.
* Run information to be viewed.
@@ -24,33 +24,33 @@ Loading a Workspace
-------------------
To load a file either: `Browse` or `Load Current Run` or simply type a run number (assuming you have defined the directory(ies) in which your files are stored)
-When typing a run number, or using the 'Load Current Run' option, first select the desired instrument from the dropdown list.
-
-To demonstrate:
+When typing a run number, or using the 'Load Current Run' option, first select the desired instrument from the dropdown list.
+
+To demonstrate:
1. Select 'MUSR' in the instrument drop-down menu
2. Type run number '24563' in the Loading section and press enter, note this can only be done if the correct reference material folder was selected in :ref:`getting_started`. This process shown in Figure 16.
-
-*NB the plot's appearance will vary based on the Time axis and Rebin data values as described later in this section and* :ref:`other_mantid_functions`
+
+*NB the plot's appearance will vary based on the Time axis and Rebin data values as described later in this section and* :ref:`other_mantid_functions`
.. figure:: /images/thetabshomefig16.gif
:align: center
- Figure 16: How to load a workspace in the Muon Analysis GUI.
+ Figure 16: How to load a workspace in the Muon Analysis GUI.
-Regardless of the data input method used, the 'Time Zero' (:math:`{\mu s}`), 'First Good Data' (:math:`{\mu s}`) and 'Last Good Data' (:math:`{\mu s}`)
-values are automatically updated. These values have been determined by the instrument scientist during instrument calibration periods, and are stored in the header
+Regardless of the data input method used, the 'Time Zero' (:math:`{\mu s}`), 'First Good Data' (:math:`{\mu s}`) and 'Last Good Data' (:math:`{\mu s}`)
+values are automatically updated. These values have been determined by the instrument scientist during instrument calibration periods, and are stored in the header
block of the raw .nxs data files, which are saved once a measurement is finished. Once a data file has been successfully read, a new plot window like the one shown in Fig. 2(b) will appear.
-*NB: when browsing for files multiple files such as `15190,15193` or a string like `15190-3` can be selected (the latter would load runs from `15190` to `15193`).
+*NB: when browsing for files multiple files such as `15190,15193` or a string like `15190-3` can be selected (the latter would load runs from `15190` to `15193`).
The selected files will each be loaded into a different workspace.*
Data Binning
------------
-Data can be re-binned via the home tab by using the `Rebin` section. The options are `None` for no binning, `Fixed` to use a
-given value (entered in the`Steps` box to the right) or `Variable`, for binning
-with various steps. When entering values in the `Steps` box, do so as for parameters in the
+Data can be re-binned via the home tab by using the `Rebin` section. The options are `None` for no binning, `Fixed` to use a
+given value (entered in the`Steps` box to the right) or `Variable`, for binning
+with various steps. When entering values in the `Steps` box, do so as for parameters in the
:ref:`Rebin <algm-Rebin>` algorithm.
For example, to set the plot to a fixed bin-width of choice, follow the instructions below
diff --git a/docs/source/tutorials/muon_GUI_course/the_tabs_results.rst b/docs/source/tutorials/muon_GUI_course/the_tabs_results.rst
index 8b6e1d21d0c2d3873d89fa7e800d1fe6dd0c3e11..ab85b74d783dad7ac664657617a0232f062f3219 100644
--- a/docs/source/tutorials/muon_GUI_course/the_tabs_results.rst
+++ b/docs/source/tutorials/muon_GUI_course/the_tabs_results.rst
@@ -8,7 +8,7 @@ The Tabs - Results
.. contents:: Table of Contents
:local:
-
+
Results
=======
@@ -24,60 +24,60 @@ The Results tab allows the user to:
Figure 32: The Results tab options.
The user has chosen to create a results table. When the 'Output Results' button is clicked, the resulting table will appear in the ADS.
-From here the data can be :ref:`explored <02_the_matrix_workspace>` and :ref:`plotted <03_displaying_1D_data>` as one would
+From here the data can be :ref:`explored <02_the_matrix_workspace>` and :ref:`plotted <03_displaying_1D_data>` as one would
with any data in a Mantid workspace.
The data contained in a results table is determined by the contents of the Values and Fitting Results sections (in the example above these are empty; no data has been fitted,
-so there are no workspaces available for the Fitting Results section).
+so there are no workspaces available for the Fitting Results section).
-In the Values sections, the user can choose which Log Values to include in the results table, these values are data from the instrument such as `run number`, `sample temperature` etc.
+In the Values sections, the user can choose which Log Values to include in the results table, these values are data from the instrument such as `run number`, `sample temperature` etc.
and are taken from the workspaces in the Fitting Results section.
-*NB even if a workspace from the Fit Result table has not been selected (via the checkbox), the types of Log Value it contains will still be present in the Values table.
+*NB even if a workspace from the Fit Result table has not been selected (via the checkbox), the types of Log Value it contains will still be present in the Values table.
This does not mean they will be included in a produced results table.*
-The Fit Results section allows the user to choose which workspaces to use Log Values from - these can be either individual fits, or a sequential/simultaneous fits.
+The Fit Results section allows the user to choose which workspaces to use Log Values from - these can be either individual fits, or a sequential/simultaneous fits.
The first option in this section is the `Function Name` drop-down menu, selecting a certain function in this menu will show all the workspaces that have had this function fitted
to them in the table below. By default, checking the box next to a workspace in this table means its Log Values will be present in the results table. This can be changed with the `Include`/`Exclude` option
(if `Exclude` is selected from the drop-down menu, checked workspaces will be the only ones *not* included in the table). The view can also be customised to only show selected workspaces.
As an exercise, follow the instructions below in order to produce a results table for a single individual or sequential fit.
-1. Load the `HIFI00062798` file from the reference folder, guess :math:`\alpha` as described in :ref:`grouping <the_tabs_grouping>` then fit the `ExpDecayOsc` function to it.
+1. Load the `HIFI00062798` file from the reference folder, guess :math:`\alpha` as described in :ref:`grouping <the_tabs_grouping>` then fit the `ExpDecayOsc` function to it.
To demonstrate a sequential fit table, load the `EMU00019631-4` files, don't guess :math:`{\alpha}`, and then perform a sequential fit of `ExpDecayOsc` on those files.
(See :ref:`using fit functions <data_fitting>` for instructions on single and sequential fits.)
-2. In the Results tab, the default individual fit table should already be set up. Check that the `Function Name` and workspace(s) selected in the lower part of the tab show the
+2. In the Results tab, the default individual fit table should already be set up. Check that the `Function Name` and workspace(s) selected in the lower part of the tab show the
fit function and data used so far, respectively.
-3. Use the table in the `Log Values` section to select parameters to include in the results table. This is done by checking the box next to them - try this now for
+3. Use the table in the `Log Values` section to select parameters to include in the results table. This is done by checking the box next to them - try this now for
`run number` and `Temp_Sample`.
4. Pick a name for the table, then click `Output Results`. See figure 33 for the process for an individual fit, and 34 for sequential.
5. To view a table, right click it in the ADS and then select `Show Data`.
.. figure:: /images/thetabsresultsfig33.gif
:align: center
-
- Figure 33: How to create a results table from a single individual fit.
+
+ Figure 33: How to create a results table from a single individual fit.
.. figure:: /images/thetabsresultsfig34.gif
:align: center
- Figure 34: How to create a results table from a sequential fit.
+ Figure 34: How to create a results table from a sequential fit.
Plotting from a Results Table
-----------------------------
-Once a results table has been created, there are now different sets of parameters available for individual analysis. In Mantid, it is possible to plot different parameters
-against each other, to see the relationship between the two.
+Once a results table has been created, there are now different sets of parameters available for individual analysis. In Mantid, it is possible to plot different parameters
+against each other, to see the relationship between the two.
-Follow the instructions below in order to plot a graph from parameters in a Results Table.
+Follow the instructions below in order to plot a graph from parameters in a Results Table.
-1. Files `EMU00019631.nxs` to `EMU00019634.nxs` should already have been loaded, sequentially fitted and a Results Table produced from them during the last section.
- If not then load the files, fit and produce a table.
-2. This example plots Temp_Sample against Lambda, which should automatically be assigned to the X and Y axes by Mantid (labelled X1 and Y1 respectively) click on `Temp_Sample` to select it.
-
-*NB If data is not automatically assigned to the desired axes this can be changed manually. As an example, if in step 2. `Temp_Sample` was not already assigned to X,
+1. Files `EMU00019631.nxs` to `EMU00019634.nxs` should already have been loaded, sequentially fitted and a Results Table produced from them during the last section.
+ If not then load the files, fit and produce a table.
+2. This example plots Temp_Sample against Lambda, which should automatically be assigned to the X and Y axes by Mantid (labelled X1 and Y1 respectively) click on `Temp_Sample` to select it.
+
+*NB If data is not automatically assigned to the desired axes this can be changed manually. As an example, if in step 2. `Temp_Sample` was not already assigned to X,
it could be right clicked after selection and then `Set as X`. This process is shown in 35. There are also other options such as to assign data to the `Y` axis, or `Y error`.*
-
-3. Next, hold down the `Ctrl` key and click on the `Lambda` column to select this column as well as `Temp_Sample`.
+
+3. Next, hold down the `Ctrl` key and click on the `Lambda` column to select this column as well as `Temp_Sample`.
4. Right click one of the columns and follow `Plot` > `Line and Symbol`. This will bring up a plot of `Temp_Sample` on the X axis and `Lambda` on the Y axis. See Figure 35 for the process.
5. The axis titles may not be entirely correct, so it may be best to change them. To do this, just double click the title and re-write it.
diff --git a/docs/source/tutorials/python_in_mantid/algorithms_and_workspaces/01_running_algorithms.rst b/docs/source/tutorials/python_in_mantid/algorithms_and_workspaces/01_running_algorithms.rst
index 9d969f57cb53d3e964c9f3657afe2de309809b2b..281ab5d40ee6a14856a992091ca04b3b87ccf82a 100644
--- a/docs/source/tutorials/python_in_mantid/algorithms_and_workspaces/01_running_algorithms.rst
+++ b/docs/source/tutorials/python_in_mantid/algorithms_and_workspaces/01_running_algorithms.rst
@@ -26,7 +26,7 @@ The simplest exercise is to load a data file. This is done using the :ref:`algm-
.. code-block:: python
from mantid.simpleapi import *
- # This example just has .RAW extension but it is able to load all
+ # This example just has .RAW extension but it is able to load all
# file types that Mantid is aware of.
# run = Load('filename.nxs')
run = Load('HRP39182.RAW')
diff --git a/docs/source/tutorials/python_in_mantid/algorithms_and_workspaces/03_matrix_ws_py.rst b/docs/source/tutorials/python_in_mantid/algorithms_and_workspaces/03_matrix_ws_py.rst
index 7c0450640106274fba42397180ee7dfb41b7c1dc..9451ee6bce819675f2bc2aebd7508ab27d9af866 100644
--- a/docs/source/tutorials/python_in_mantid/algorithms_and_workspaces/03_matrix_ws_py.rst
+++ b/docs/source/tutorials/python_in_mantid/algorithms_and_workspaces/03_matrix_ws_py.rst
@@ -22,12 +22,12 @@ Loading a Workspace2D and extracting some basic details:
ws2D = Load(Filename="LOQ49886.nxs")
- # Basic queries
+ # Basic queries
print("Number of histograms: " + str(ws2D.getNumberHistograms()))
print("Is histogram data: " + str(ws2D.isHistogramData()))
print("Number of bins: " + str(ws2D.blocksize()))
- # More advanced queries
+ # More advanced queries
spectrumAxis = ws2D.getAxis(1)
print("Is spectra axis: " + str(spectrumAxis.isSpectra()))
print("Number of spectra: " + str(spectrumAxis.length()))
diff --git a/docs/source/tutorials/python_in_mantid/algorithms_and_workspaces/06_alg_help.rst b/docs/source/tutorials/python_in_mantid/algorithms_and_workspaces/06_alg_help.rst
index fd381129e301ec9f1cdea80706433f01c5bd947b..ad921e68379f6c539566a0a26a1dfd9342e4d491 100644
--- a/docs/source/tutorials/python_in_mantid/algorithms_and_workspaces/06_alg_help.rst
+++ b/docs/source/tutorials/python_in_mantid/algorithms_and_workspaces/06_alg_help.rst
@@ -18,21 +18,21 @@ produces
.. code-block:: python
- Help on function Rebin in module mantid.simpleapi:
-
+ Help on function Rebin in module mantid.simpleapi:
+
Rebin(InputWorkspace,Params,PreserveEvents, Version=1)
Rebins data with new X bin boundaries. For EventWorkspaces, you can very quickly rebin in-place by keeping the same output name and PreserveEvents=true.
-
- Property descriptions:
-
+
+ Property descriptions:
+
InputWorkspace(Input:req) *MatrixWorkspace* Workspace containing the input data
-
+
OutputWorkspace(Output:req) *MatrixWorkspace* The name to give the output workspace
-
+
Params(Input:req) *dbl list* A comma separated list of first bin boundary, width, last bin boundary. Optionally
this can be followed by a comma and more widths and last boundary pairs.
Negative width values indicate logarithmic binning.
-
+
PreserveEvents(Input) *boolean* Keep the output workspace as an EventWorkspace, if the input has events (default).
If the input and output EventWorkspace names are the same, only the X bins are set, which is very quick.
- If false, then the workspace gets converted to a Workspace2D histogram.
+ If false, then the workspace gets converted to a Workspace2D histogram.
diff --git a/docs/source/tutorials/python_in_mantid/algorithms_and_workspaces/07_pim_ex_1.rst b/docs/source/tutorials/python_in_mantid/algorithms_and_workspaces/07_pim_ex_1.rst
index 986f97adf7641ecfe993ff2d08e0b8fe219d2ab4..e3d99dc0fec03d7f7c8577dd4367dcd7ee4aa918 100644
--- a/docs/source/tutorials/python_in_mantid/algorithms_and_workspaces/07_pim_ex_1.rst
+++ b/docs/source/tutorials/python_in_mantid/algorithms_and_workspaces/07_pim_ex_1.rst
@@ -18,7 +18,7 @@ The aim of this exercise is to use Mantid to write a script, which excludes this
#. :ref:`algm-Load` - Load the given HRPD data set, HRP39182.RAW into a workspace called 'HRP39182'
#. :ref:`algm-MaskBins` - Mask out the bins corresponding to the pulse with XMin=19990 and XMax=20040
-#. Repeat the previous step for the other 4 pulses, each of which is 20000 microseconds after the previous. *All MaskBins executions should happen on the same InputWorkspace so that all 5 pulses are masked from the same workspace. Hint: A loop might be useful.*
+#. Repeat the previous step for the other 4 pulses, each of which is 20000 microseconds after the previous. *All MaskBins executions should happen on the same InputWorkspace so that all 5 pulses are masked from the same workspace. Hint: A loop might be useful.*
#. :ref:`algm-AlignDetectors` - Correct the masked workspace for small variations in detector position, using the calibration file `hrpd_new_072_01_corr.cal`. (Note: This performs an explicit conversion to dSpacing)
#. :ref:`algm-DiffractionFocussing` - Focus the data in the masked workspace using the same cal file as the previous step (called a grouping file here)
@@ -49,6 +49,6 @@ Merge, mask, correct and compare.
#. :ref:`algm-MultiplyRange` - Calculate sample transmission of 95%.
#. :ref:`algm-ConvertUnits` - Convert the data from TOF to Delta Energy. (Find the Efixed value as Ei in the Sample Logs for the workspace)
#. :ref:`algm-DetectorEfficiencyCorUser` - Correct the data with the detector efficiency for this instrument.
-#. Compare the corrected with the unccorrected data, say bin 4 of spectrum number 7 (workspace index 6).
+#. Compare the corrected with the unccorrected data, say bin 4 of spectrum number 7 (workspace index 6).
:ref:`Solutions <01_pim_sol>`
diff --git a/docs/source/tutorials/python_in_mantid/further_alg_ws/02_scripting_workspaces.rst b/docs/source/tutorials/python_in_mantid/further_alg_ws/02_scripting_workspaces.rst
index 40d253af44f1dfdc73b2c73a727b610ea94e88be..da269d056dc5a3c108e7e7a36cc84d1a0c69797d 100644
--- a/docs/source/tutorials/python_in_mantid/further_alg_ws/02_scripting_workspaces.rst
+++ b/docs/source/tutorials/python_in_mantid/further_alg_ws/02_scripting_workspaces.rst
@@ -5,7 +5,7 @@ Workspaces in Scripts
=====================
-The :ref:`Workspaces Toolbox<WorkbenchWorkspaceToolbox>` is used to store and manage workspaces within Mantid. Behind the scenes, the Analysis Data Service or ADS is used to control these workspaces.
+The :ref:`Workspaces Toolbox<WorkbenchWorkspaceToolbox>` is used to store and manage workspaces within Mantid. Behind the scenes, the Analysis Data Service or ADS is used to control these workspaces.
Below are some examples of how to control workspaces with a script.
@@ -49,8 +49,8 @@ Required import:
ws2 = CreateSampleWorkspace()
ws3 = CreateSampleWorkspace()
wsGroup = GroupWorkspaces([ws1,ws2,ws3])
-
- # or if you only have the names of the workspaces
+
+ # or if you only have the names of the workspaces
wsGroup = GroupWorkspaces(['ws1','ws2','ws3'])
:ref:`Save a Workspace in a supported ASCII format <algm-SaveAscii>`:
@@ -71,10 +71,10 @@ Plot Spectra from a Workspace:
# simple plot of 1 spectrum
plotSpectrum(ws, 0)
-
+
# Plot of 3 spectra, and error bars
plotSpectrum(ws, [0,1,2], error_bars=True)
-
+
# Waterfall plot from two workspaces, with two spectra from each
plotSpectrum([ws1, ws2], [0,1], waterfall=True)
@@ -138,7 +138,7 @@ Useful links
* :ref:`WorkingWithWorkspaces`
* :ref:`More ADS options <mantid.api.AnalysisDataServiceImpl>`
-* :ref:`Analysis Data Service Explained <Analysis Data Service>`
+* :ref:`Analysis Data Service Explained <Analysis Data Service>`
Overall Example
diff --git a/docs/source/tutorials/python_in_mantid/further_alg_ws/03_matrix_ws_attributes.rst b/docs/source/tutorials/python_in_mantid/further_alg_ws/03_matrix_ws_attributes.rst
index c3fce36c9261d02703c06272fdb3f4d2fbc96be9..b1bbefa0192aae8c98038c1545c1c7064cbdad44 100644
--- a/docs/source/tutorials/python_in_mantid/further_alg_ws/03_matrix_ws_attributes.rst
+++ b/docs/source/tutorials/python_in_mantid/further_alg_ws/03_matrix_ws_attributes.rst
@@ -33,7 +33,7 @@ Create a view of the Y data from the 2nd spectrum:
.. code-block:: python
y_data2 = raw_workspace.readY(1)
-
+
for y in y_data2:
print(y)
@@ -80,5 +80,5 @@ Useful links
* :ref:`WorkingWithWorkspaces`
* :ref:`MatrixWorkspace`
-* :ref:`Mantid_api`
+* :ref:`Mantid_api`
* :ref:`concepts contents`
\ No newline at end of file
diff --git a/docs/source/tutorials/python_in_mantid/further_alg_ws/06_settings.rst b/docs/source/tutorials/python_in_mantid/further_alg_ws/06_settings.rst
index 2c3d2dfbf20e3ddbf076b9551ebe0b0f67a80ad0..5cd1a6e96fba1f7d80d7ce8d7bbc04a7d6e3d971 100644
--- a/docs/source/tutorials/python_in_mantid/further_alg_ws/06_settings.rst
+++ b/docs/source/tutorials/python_in_mantid/further_alg_ws/06_settings.rst
@@ -25,7 +25,7 @@ All settings specified in these files are accessible via python through the conf
.. code-block:: python
from mantid import config
-
+
default_inst_name = config['default.instrument']
The config object behaves like a Python dictionary, where each setting in the properties file is used as a key to obtain its value from the config object.
@@ -64,7 +64,7 @@ Some keys in the properties are considered special and have their own accessors.
config.setDataSearchDirs('path1;path2;path3')
# Set it via a list
- config.setDataSearchDirs(['path1','path2'])
+ config.setDataSearchDirs(['path1','path2'])
Facility & Instrument Information
diff --git a/docs/source/tutorials/python_in_mantid/further_alg_ws/07_extract_manipulate_data.rst b/docs/source/tutorials/python_in_mantid/further_alg_ws/07_extract_manipulate_data.rst
index 4878ccb3c3eb693e5e0af2e785c3e08f2fd4a523..4ed772a2b694cd1e18ba221e8545ffa711770545 100644
--- a/docs/source/tutorials/python_in_mantid/further_alg_ws/07_extract_manipulate_data.rst
+++ b/docs/source/tutorials/python_in_mantid/further_alg_ws/07_extract_manipulate_data.rst
@@ -53,7 +53,7 @@ The data from all spectra can be obtained as a mutable multi-dimensional array i
print(y.shape)
print(e.shape)
-Since the *extract* methods return multi-dimensional numpy arrays. So to use *extract* in a similar way to *read*, you need to `slice these arrays with indexing <https://numpy.org/doc/1.18/reference/arrays.indexing.html>`_.
+Since the *extract* methods return multi-dimensional numpy arrays. So to use *extract* in a similar way to *read*, you need to `slice these arrays with indexing <https://numpy.org/doc/1.18/reference/arrays.indexing.html>`_.
E.g. instead of `ws.readX(5)` you should use:
@@ -79,7 +79,7 @@ This allows access to the individual bins in each spectrum. E.g. to sum the y-va
sum_counts = 0
# Inner loop. Loop over bins.
for j in range(ws.blocksize()):
- sum_counts += y[j]
+ sum_counts += y[j]
# Display spectrum number against sum_counts
print("Spectrum Number: {0}, Total Counts: {1}".format(ws.getSpectrum(i).getSpectrumNo(), sum_counts))
@@ -87,7 +87,7 @@ This allows access to the individual bins in each spectrum. E.g. to sum the y-va
Creating Output Workspaces
==========================
-We may perform some processing on the data arrays before creating our new workspace.
+We may perform some processing on the data arrays before creating our new workspace.
Creating a MatrixWorkspace
--------------------------
@@ -105,7 +105,7 @@ E.g. Change the x-axis for TOF from microseconds to milliseconds:
from mantid.plots._compatability import plotSpectrum
# Load and Read data
- ws = Load(Filename="HRP39182.RAW")
+ ws = Load(Filename="HRP39182.RAW")
x = ws.readX(0)
y = ws.readY(0)
e = ws.readE(0)
@@ -133,7 +133,7 @@ E.g. To read out the value in the first bin for each spectrum:
.. code-block:: python
ws = Load(Filename="GEM40979.RAW")
-
+
table = CreateEmptyTableWorkspace()
table.addColumn('int', 'Spectrum Number')
table.addColumn('double', 'First Bin Value')
diff --git a/docs/source/tutorials/python_in_mantid/further_alg_ws/08_running_algorithms_complex.rst b/docs/source/tutorials/python_in_mantid/further_alg_ws/08_running_algorithms_complex.rst
index 25bdf08123592b921bc2509609b37a72efdae708..d689bf81317d0c72fb29b9d73791f6459feb3301 100644
--- a/docs/source/tutorials/python_in_mantid/further_alg_ws/08_running_algorithms_complex.rst
+++ b/docs/source/tutorials/python_in_mantid/further_alg_ws/08_running_algorithms_complex.rst
@@ -40,11 +40,11 @@ The script below shows a more complex example of mixing Mantid's algorithms with
evalues = numpy.sum(evalues, axis=1) # Sum the squares
evalues = numpy.sqrt(evalues)
- xlimits = xvalues[ :, [0,-1] ] # numpy array slice. : takes all rows and [0,-1] selects only column 0 and n-1
+ xlimits = xvalues[ :, [0,-1] ] # numpy array slice. : takes all rows and [0,-1] selects only column 0 and n-1
# + any other operations that numpy can do
- # Put back into workspace.
- white_beam = CreateWorkspace(xlimits, sumy, evalues,NSpec=sumy.shape[0])
+ # Put back into workspace.
+ white_beam = CreateWorkspace(xlimits, sumy, evalues,NSpec=sumy.shape[0])
# Divide sample run
sample = Load("MAR11015")
diff --git a/docs/source/tutorials/python_in_mantid/plotting/01_basic_plot_scripting.rst b/docs/source/tutorials/python_in_mantid/plotting/01_basic_plot_scripting.rst
index e7390d66da745c6ae9903db3b90aeb51255d30ea..d396bab17b255ec70a73e80749d8935700b42f6a 100644
--- a/docs/source/tutorials/python_in_mantid/plotting/01_basic_plot_scripting.rst
+++ b/docs/source/tutorials/python_in_mantid/plotting/01_basic_plot_scripting.rst
@@ -1,7 +1,7 @@
.. _01_basic_plot_scripting:
=========================
-Basic 1D, 2D and 3D Plots
+Basic 1D, 2D and 3D Plots
=========================
@@ -22,7 +22,7 @@ Right clicking on a row or a column allows a plot of that spectrum or time bin,
.. code-block:: python
RawData = Load("MAR11015")
-
+
graph_spec = plotSpectrum(RawData, 0)
graph_time = plotBin(RawData, 0)
@@ -77,7 +77,7 @@ To overplot on the same window:
.. code-block:: python
RawData = Load("MAR11015")
-
+
# Assign original plot to a window called graph_spce
graph_spec = plotSpectrum(RawData, 0)
@@ -181,15 +181,15 @@ To overplot on the same window:
:include-source:
''' ----------- Wireframe plot ----------- '''
-
+
from mantid.simpleapi import *
import matplotlib.pyplot as plt
data = Load('PG3_733.nxs')
-
+
fig, ax = plt.subplots(subplot_kw={'projection':'mantid3d'})
ax.plot_wireframe(data, color='green')
#plt.show()
-* See :ref:`here <plotting>` for custom color cycles and colormaps
+* See :ref:`here <plotting>` for custom color cycles and colormaps
diff --git a/docs/source/tutorials/python_in_mantid/plotting/02_scripting_plots.rst b/docs/source/tutorials/python_in_mantid/plotting/02_scripting_plots.rst
index 209f8db1b858326d3dc11817fc2bc320fbd12235..5a76c3cf5660f932020d97dee2e98478862003c4 100644
--- a/docs/source/tutorials/python_in_mantid/plotting/02_scripting_plots.rst
+++ b/docs/source/tutorials/python_in_mantid/plotting/02_scripting_plots.rst
@@ -25,7 +25,7 @@ Access a workspace,loaded in the Workspace Toolbox, inside a script:
.. code-block:: python
ws = mtd['ws']
-
+
#or you could use:
from mantid.api import AnalysisDataService as ADS
ws = ADS.retrieve('ws')
@@ -191,7 +191,7 @@ Example Script
UserDefinedFunction='\
name=ExpDecay,Lifetime = 20,Height = 200;name=Gaussian,\
PeakCentre=50, Height=10, Sigma=3',
- XMax=100, BinWidth=2)
+ XMax=100, BinWidth=2)
#Create figure and axes
fig, axes = plt.subplots(ncols=2,nrows=1,subplot_kw={'projection': 'mantid'})
@@ -229,5 +229,5 @@ Example Script
* :ref:`06_formatting_plots`
* `Matplotlib Keyboard Shortcuts <https://matplotlib.org/3.1.1/users/navigation_toolbar.html#navigation-keyboard-shortcuts>`_
-.. |GenerateAScript.png| image:: /images/GenerateAScript.png
+.. |GenerateAScript.png| image:: /images/GenerateAScript.png
:width: 30px
\ No newline at end of file
diff --git a/docs/source/tutorials/python_in_mantid/plotting/03_pim_ex_3.rst b/docs/source/tutorials/python_in_mantid/plotting/03_pim_ex_3.rst
index 92ac04a6345f38cb9b7285d1f4d32ff35dd2fecf..a67ff9625b63bca0a1a38ed9dd1faa7a0f903e72 100644
--- a/docs/source/tutorials/python_in_mantid/plotting/03_pim_ex_3.rst
+++ b/docs/source/tutorials/python_in_mantid/plotting/03_pim_ex_3.rst
@@ -51,7 +51,7 @@ C - 2D and 3D Plot ILL Data
#. Overlay contour lines on the second subplot (axes[1]), colored white and with alpha = 0.5
#. Set the title to 'Colorfill' for axes[0] and 'Contour' for axes[1]
#. Add a colorbar to this figure
-#. Set the colorbar label to 'Counts ($\mu s$)$^{-1}$'
+#. Set the colorbar label to 'Counts ($\mu s$)$^{-1}$'
#. Get another figure and axes for subplots with ncols=2, nrows=1, using the mantid3d projection and also set figsize = (8,3)
#. Add a Surface and Wireframe plot to the subplot axes respectively (indexed as axes[0] and axes[1])
diff --git a/docs/source/tutorials/python_in_mantid/script_generation/03_plot_script_generation.rst b/docs/source/tutorials/python_in_mantid/script_generation/03_plot_script_generation.rst
index bef9c2098cb7d68aa850b4e491171f758359d2e4..abd67610599db932b1ef25fa7a5ba7d1f56b0882 100644
--- a/docs/source/tutorials/python_in_mantid/script_generation/03_plot_script_generation.rst
+++ b/docs/source/tutorials/python_in_mantid/script_generation/03_plot_script_generation.rst
@@ -20,5 +20,5 @@ A script can also be generated for producing a plot!
* For advice on how to add more features to a plotting script, see :ref:`02_scripting_plots` in the next section.
-.. |GenerateAScript.png| image:: /images/GenerateAScript.png
+.. |GenerateAScript.png| image:: /images/GenerateAScript.png
:width: 30px
\ No newline at end of file
diff --git a/docs/source/tutorials/python_in_mantid/script_generation/04_pim_ex_2.rst b/docs/source/tutorials/python_in_mantid/script_generation/04_pim_ex_2.rst
index 5ee7a07f46f6ad13744afc4f07c5299236340804..bcc96443c6632bc0d025af5a87e0309339b00bb4 100644
--- a/docs/source/tutorials/python_in_mantid/script_generation/04_pim_ex_2.rst
+++ b/docs/source/tutorials/python_in_mantid/script_generation/04_pim_ex_2.rst
@@ -103,7 +103,7 @@ Plot and Edit
#. Double-click on the *normalized* spectrum to plot it
#. Right-click on *run_monitors_lambda_rebinned* and select Plot > Overplot Spectrum.
-#. Also, overplot with *run_lambda_summed*
+#. Also, overplot with *run_lambda_summed*
#. In the Options menu (Gear icon)
#. Set the **x-upper-limit** to 4.5
#. Set the **y-scale** to log
@@ -120,5 +120,5 @@ Generating a script from a plot
:ref:`Solutions <02_pim_sol>`
-.. |GenerateAScript.png| image:: /images/GenerateAScript.png
+.. |GenerateAScript.png| image:: /images/GenerateAScript.png
:width: 30px
\ No newline at end of file
diff --git a/docs/source/tutorials/python_in_mantid/solutions/02_pim_sol.rst b/docs/source/tutorials/python_in_mantid/solutions/02_pim_sol.rst
index 86699db1ef6977b883e954e22ab0f618a578eff5..dae5e77db96efaf6b5d1a075e5022d7706c15525 100644
--- a/docs/source/tutorials/python_in_mantid/solutions/02_pim_sol.rst
+++ b/docs/source/tutorials/python_in_mantid/solutions/02_pim_sol.rst
@@ -93,7 +93,7 @@ B - Plotting ILL Data
axes.legend() #.set_draggable(True)
#plt.show()
-
+
C - Processing and Plotting SNS Data
====================================
@@ -129,7 +129,7 @@ C - Processing and Plotting SNS Data
axes.set_ylabel('($\AA$)$^{-1}$')
axes.set_xlim([2.405, 4.5])
axes.set_yscale('log')
- axes.legend() #.set_draggable(True)
+ axes.legend() #.set_draggable(True)
#plt.show()
diff --git a/docs/source/tutorials/python_in_mantid/solutions/03_pim_sol.rst b/docs/source/tutorials/python_in_mantid/solutions/03_pim_sol.rst
index 8c6550ba133844490ad41d44c93ec5318ae3b34a..678f6a70bd2efdad1fe4957e5c4b2aae65789e1d 100644
--- a/docs/source/tutorials/python_in_mantid/solutions/03_pim_sol.rst
+++ b/docs/source/tutorials/python_in_mantid/solutions/03_pim_sol.rst
@@ -111,7 +111,7 @@ C - 2D and 3D Plot ILL Data
'''2D Plotting - Colorfill and Contour'''
- # Get a figure and axes for
+ # Get a figure and axes for
figC,axC = plt.subplots(ncols=2, subplot_kw={'projection':'mantid'}, figsize = (6,4))
# Plot the data as a 2D colorfill: IMPORTANT to set origin to lower
diff --git a/docs/source/tutorials/python_in_mantid/solutions/04_pim_sol.rst b/docs/source/tutorials/python_in_mantid/solutions/04_pim_sol.rst
index 91ecaf32c05b3ca19b6c00aea604db8add20cb71..cee49061097d882ae0edf25a535ef15d5073c2f6 100644
--- a/docs/source/tutorials/python_in_mantid/solutions/04_pim_sol.rst
+++ b/docs/source/tutorials/python_in_mantid/solutions/04_pim_sol.rst
@@ -18,7 +18,7 @@ A - Create a MatrixWorkspace
import numpy as np
ws = Load(Filename="HRP39182.RAW")
- ws = Rebin(InputWorkspace=ws, Params=1e4)
+ ws = Rebin(InputWorkspace=ws, Params=1e4)
nbins = ws.blocksize()
print(nbins)
@@ -49,7 +49,7 @@ A - Create a MatrixWorkspace
for j in range(nbins):
maxY = max(y[j], maxY) # Using the input Max method.
new_y.append(maxY)
-
+
solution_2 = CreateWorkspace(DataY=new_y, DataX=xRange, NSpec=ws.getNumberHistograms())
''' ----------- Part One Solution using single loop and numpy max function ----------- '''
@@ -58,7 +58,7 @@ A - Create a MatrixWorkspace
y = ws.readY(i)
maxY = np.max(y)
new_y.append(maxY)
-
+
solution_3 = CreateWorkspace(DataY=new_y, DataX=xRange, NSpec=ws.getNumberHistograms())
B - Create a TableWorkspace
@@ -67,7 +67,7 @@ B - Create a TableWorkspace
.. code-block:: python
ws = Load(Filename="HRP39182.RAW")
- ws = Rebin(InputWorkspace=ws, Params=1e4)
+ ws = Rebin(InputWorkspace=ws, Params=1e4)
nbins = ws.blocksize()
print(nbins)
diff --git a/images/fonts/OFL.txt b/images/fonts/OFL.txt
index 3968b2265a31a3dd7825426208ca427093feb171..ffcecf036af2c9f545dcf9b63394101f1f73a313 100644
--- a/images/fonts/OFL.txt
+++ b/images/fonts/OFL.txt
@@ -17,7 +17,7 @@ with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
+fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
diff --git a/installers/MacInstaller/make_package.rb b/installers/MacInstaller/make_package.rb
index fc9e4f54f4b1b4285bce4a12ad3cbdd770684956..d1dde232b70128b81f11e03cb88b18b16f6814ac 100755
--- a/installers/MacInstaller/make_package.rb
+++ b/installers/MacInstaller/make_package.rb
@@ -183,7 +183,7 @@ def deploy_python_framework(destination, host_python_exe,
# remove Info.plist files so outer application controls app display name
FileUtils.rm "#{bundle_py_home}/Resources/Info.plist"
FileUtils.rm "#{bundle_py_home}/Resources/Python.app/Contents/Info.plist"
-
+
# remove site-packages symlink, copy brew python modules and pip install the rest
src_site_packages = Pathname.new("#{host_py_home}/lib/python#{py_ver}/site-packages")
bundle_site_packages = Pathname.new("#{bundle_py_home}/lib/python#{py_ver}/site-packages")
@@ -206,7 +206,7 @@ def deploy_python_framework(destination, host_python_exe,
# add sitecustomize module
FileUtils.cp SITECUSTOMIZE_FILE, bundle_site_packages,
preserve: true
-
+
bundle_site_packages
end
diff --git a/installers/WinInstaller/License.rtf b/installers/WinInstaller/License.rtf
index 3de4b7898889a73d407c4f5242eefbeeab48f29c..13fdd770ef973ab2e77cac95c3c78044954859f1 100644
--- a/installers/WinInstaller/License.rtf
+++ b/installers/WinInstaller/License.rtf
@@ -4,117 +4,117 @@
{\f58\fmodern\fcharset204\fprq1 Courier New Cyr;}{\f60\fmodern\fcharset161\fprq1 Courier New Greek;}{\f61\fmodern\fcharset162\fprq1 Courier New Tur;}{\f62\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);}
{\f63\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f64\fmodern\fcharset186\fprq1 Courier New Baltic;}{\f65\fmodern\fcharset163\fprq1 Courier New (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;
\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;
-\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033
+\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033
\snext0 Normal;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\*
-\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv
+\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv
\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}{\s15\ql \li0\ri0\widctlpar
-\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af2\afs20\alang1025 \ltrch\fcs0
+\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af2\afs20\alang1025 \ltrch\fcs0
\f2\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext15 \styrsid10231950 HTML Preformatted;}}{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\pgptbl {\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid2318410\rsid5516594\rsid10231950
}{\*\generator Microsoft Word 11.0.0000;}{\info{\title OK}{\author }{\operator }{\creatim\yr2008\mo5\dy7\hr13\min38}{\revtim\yr2008\mo5\dy7\hr13\min57}{\version4}{\edmins8}{\nofpages13}{\nofwords5231}{\nofchars29820}{\*\company CCLRC}{\nofcharsws34982}
-{\vern24613}{\*\password 00000000}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\margl1800\margr1800\margt1440\margb1440\gutter0\ltrsect
+{\vern24613}{\*\password 00000000}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\margl1800\margr1800\margt1440\margb1440\gutter0\ltrsect
\widowctrl\ftnbj\aenddoc\donotembedsysfont0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors1\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180
\dgvspace180\dghorigin1800\dgvorigin1440\dghshow1\dgvshow1
\jexpand\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct
\asianbrkrule\rsidroot2318410\newtblstyruls\nogrowautofit \fet0{\*\wgrffmtfilter 013f}\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\headery708\footery708\colsx708\endnhere\sectlinegrid360\sectdefaultcl\sftnbj {\*\pnseclvl1
\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5
-\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang
+\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang
{\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\s15\qc \li0\ri0\widctlpar
-\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid10231950 \rtlch\fcs1 \af2\afs20\alang1025 \ltrch\fcs0
+\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid10231950 \rtlch\fcs1 \af2\afs20\alang1025 \ltrch\fcs0
\f2\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 GNU GENERAL PUBLIC LICENSE
\par Version 3, 29 June 2007
-\par }\pard \ltrpar\s15\ql \li0\ri0\widctlpar\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid10231950 {\rtlch\fcs1
-\af2 \ltrch\fcs0 \insrsid10231950
+\par }\pard \ltrpar\s15\ql \li0\ri0\widctlpar\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid10231950 {\rtlch\fcs1
+\af2 \ltrch\fcs0 \insrsid10231950
\par Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-\par }\pard \ltrpar\s15\qc \li0\ri0\widctlpar\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5516594 {\rtlch\fcs1 \af2
+\par }\pard \ltrpar\s15\qc \li0\ri0\widctlpar\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5516594 {\rtlch\fcs1 \af2
\ltrch\fcs0 \insrsid10231950 Preamble
-\par }\pard \ltrpar\s15\ql \li0\ri0\widctlpar\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid10231950 {\rtlch\fcs1
-\af2 \ltrch\fcs0 \insrsid10231950
+\par }\pard \ltrpar\s15\ql \li0\ri0\widctlpar\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid10231950 {\rtlch\fcs1
+\af2 \ltrch\fcs0 \insrsid10231950
\par The GNU General Public License is a free, copyleft license for}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 software and other kinds of works.
-\par
-\par The licenses for most software and other practical works are designed}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 to take away your freedom to share and change the works. By contrast,}{\rtlch\fcs1
-\af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 the GNU General Public License is intended to guarantee your freedom to}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
-share and change all versions of a program--to make sure it remains free}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 software for all its users. We, the Free Software Foundation, use the}{\rtlch\fcs1
-\af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 GNU General Public License for most of our software; it applies also to}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
+\par
+\par The licenses for most software and other practical works are designed}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 to take away your freedom to share and change the works. By contrast,}{\rtlch\fcs1
+\af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 the GNU General Public License is intended to guarantee your freedom to}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
+share and change all versions of a program--to make sure it remains free}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 software for all its users. We, the Free Software Foundation, use the}{\rtlch\fcs1
+\af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 GNU General Public License for most of our software; it applies also to}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
any other work released this way by its authors. You can apply it to}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 your programs, too.
-\par
-\par When we speak of free software, we are referring to freedom, not}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 price. Our General Public Licenses are designed to make sure that you}{\rtlch\fcs1 \af2
-\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 have the freedom to distribute copies of free software (and charge for}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
-them if you wish), that you receive source code or can get it if you}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 want it, that you can change the software or use pieces of it in new}{\rtlch\fcs1 \af2
+\par
+\par When we speak of free software, we are referring to freedom, not}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 price. Our General Public Licenses are designed to make sure that you}{\rtlch\fcs1 \af2
+\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 have the freedom to distribute copies of free software (and charge for}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
+them if you wish), that you receive source code or can get it if you}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 want it, that you can change the software or use pieces of it in new}{\rtlch\fcs1 \af2
\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 free programs, and that you know you can do these things.
-\par
-\par To protect your rights, we need to prevent others from denying you}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 these rights or asking you to surrender the rights. Therefore, you have}{\rtlch\fcs1 \af2
-\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 certain responsibilities if you distribute copies of the software, or if}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
+\par
+\par To protect your rights, we need to prevent others from denying you}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 these rights or asking you to surrender the rights. Therefore, you have}{\rtlch\fcs1 \af2
+\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 certain responsibilities if you distribute copies of the software, or if}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
you modify it: responsibilities to respect the freedom of others.
-\par
-\par For example, if you distribute copies of such a program, whether}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 gratis or for a fee, you must pass on to the recipients the same}{\rtlch\fcs1 \af2
-\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 freedoms that you received. You must make sure that they, too, receive}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
+\par
+\par For example, if you distribute copies of such a program, whether}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 gratis or for a fee, you must pass on to the recipients the same}{\rtlch\fcs1 \af2
+\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 freedoms that you received. You must make sure that they, too, receive}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
or can get the source code. And you must show them these terms so they}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 know their rights.
-\par
-\par Developers that use the GNU GPL protect your rights with two steps:}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 (1) assert copyright on the software, and (2) offer you this License}{\rtlch\fcs1 \af2
+\par
+\par Developers that use the GNU GPL protect your rights with two steps:}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 (1) assert copyright on the software, and (2) offer you this License}{\rtlch\fcs1 \af2
\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 giving you legal permission to copy, distribute and/or modify it.
-\par
-\par For the developers' and authors' protection, the GPL clearly explains}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 that there is no warranty for this free software. For both users' and}{\rtlch\fcs1
-\af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 authors' sake, the GPL requires that modified versions be marked as}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
+\par
+\par For the developers' and authors' protection, the GPL clearly explains}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 that there is no warranty for this free software. For both users' and}{\rtlch\fcs1
+\af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 authors' sake, the GPL requires that modified versions be marked as}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
changed, so that their problems will not be attributed erroneously to}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 authors of previous versions.
-\par }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594
-\par }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 Some devices are designed to deny users access to install or run}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
-modified versions of the software inside them, although the manufacturer}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 can do so. This is fundamentally incompatible with the aim of}{\rtlch\fcs1 \af2
-\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 protecting users' freedom to change the software. The systematic}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
-pattern of such abuse occurs in the area of products for individuals to}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 use, which is precisely where it is most unacceptable. Therefore, we}{\rtlch\fcs1 \af2
-\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 have designed this version of the GPL to prohibit the practice for those}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
-products. If such problems arise substantially in other domains, we}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 stand ready to extend this provision to those domains in future versions}{\rtlch\fcs1 \af2
+\par }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594
+\par }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 Some devices are designed to deny users access to install or run}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
+modified versions of the software inside them, although the manufacturer}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 can do so. This is fundamentally incompatible with the aim of}{\rtlch\fcs1 \af2
+\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 protecting users' freedom to change the software. The systematic}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
+pattern of such abuse occurs in the area of products for individuals to}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 use, which is precisely where it is most unacceptable. Therefore, we}{\rtlch\fcs1 \af2
+\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 have designed this version of the GPL to prohibit the practice for those}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
+products. If such problems arise substantially in other domains, we}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 stand ready to extend this provision to those domains in future versions}{\rtlch\fcs1 \af2
\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 of the GPL, as needed to protect the freedom of users.
-\par
-\par Finally, every program is threatened constantly by software patents.}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 States should not allow patents to restrict development and use of}{\rtlch\fcs1 \af2
-\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 software on general-purpose computers, but in those that do, we wish to}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
-avoid the special danger that patents applied to a free program could}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 make it effectively proprietary. To prevent this, the GPL assures that}{\rtlch\fcs1 \af2
+\par
+\par Finally, every program is threatened constantly by software patents.}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 States should not allow patents to restrict development and use of}{\rtlch\fcs1 \af2
+\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 software on general-purpose computers, but in those that do, we wish to}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
+avoid the special danger that patents applied to a free program could}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 make it effectively proprietary. To prevent this, the GPL assures that}{\rtlch\fcs1 \af2
\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 patents cannot be used to render the program non-free.
-\par
+\par
\par The precise terms and conditions for copying, distribution and}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 modification follow.
-\par
-\par }\pard \ltrpar\s15\qc \li0\ri0\widctlpar\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5516594 {\rtlch\fcs1 \af2
+\par
+\par }\pard \ltrpar\s15\qc \li0\ri0\widctlpar\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5516594 {\rtlch\fcs1 \af2
\ltrch\fcs0 \insrsid10231950 TERMS AND CONDITIONS
-\par }\pard \ltrpar\s15\ql \li0\ri0\widctlpar\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid10231950 {\rtlch\fcs1
-\af2 \ltrch\fcs0 \insrsid10231950
+\par }\pard \ltrpar\s15\ql \li0\ri0\widctlpar\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid10231950 {\rtlch\fcs1
+\af2 \ltrch\fcs0 \insrsid10231950
\par 0. Definitions.
-\par
+\par
\par "This License" refers to version 3 of the GNU General Public License.
-\par
+\par
\par "Copyright" also means copyright-like laws that apply to other kinds of}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 works, such as semiconductor masks.
-\par
-\par "The Program" refers to any copyrightable work licensed under this}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 License. Each licensee is addressed as "you". "Licensees" and}{\rtlch\fcs1 \af2
+\par
+\par "The Program" refers to any copyrightable work licensed under this}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 License. Each licensee is addressed as "you". "Licensees" and}{\rtlch\fcs1 \af2
\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 "recipients" may be individuals or organizations.
-\par
-\par To "modify" a work means to copy from or adapt all or part of the work}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 in a fashion requiring copyright permission, other than the making of an}{\rtlch\fcs1
-\af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 exact copy. The resulting work is called a "modified version" of the}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
+\par
+\par To "modify" a work means to copy from or adapt all or part of the work}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 in a fashion requiring copyright permission, other than the making of an}{\rtlch\fcs1
+\af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 exact copy. The resulting work is called a "modified version" of the}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
earlier work or a work "based on" the earlier work.
-\par
+\par
\par A "covered work" means either the unmodified Program or a work based}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 on the Program.
-\par
-\par To "propagate" a work means to do anything with it that, without}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 permission, would make you directly or secondarily liable for}{\rtlch\fcs1 \af2 \ltrch\fcs0
-\insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 infringement under applicable copyright law, except executing it on a}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
-computer or modifying a private copy. Propagation includes copying,}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 distribution (with or without modification), making available to the}{\rtlch\fcs1 \af2
+\par
+\par To "propagate" a work means to do anything with it that, without}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 permission, would make you directly or secondarily liable for}{\rtlch\fcs1 \af2 \ltrch\fcs0
+\insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 infringement under applicable copyright law, except executing it on a}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
+computer or modifying a private copy. Propagation includes copying,}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 distribution (with or without modification), making available to the}{\rtlch\fcs1 \af2
\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 public, and in some countries other activities as well.
-\par
-\par To "convey" a work means any kind of propagation that enables other}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 parties to make or receive copies. Mere interaction with a user through}{\rtlch\fcs1
+\par
+\par To "convey" a work means any kind of propagation that enables other}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 parties to make or receive copies. Mere interaction with a user through}{\rtlch\fcs1
\af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 a computer network, with no transfer of a copy, is not conveying.
-\par
-\par An interactive user interface displays "Appropriate Legal Notices"}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 to the extent that it includes a convenient and prominently visible}{\rtlch\fcs1 \af2
-\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 feature that (1) displays an appropriate copyright notice, and (2)}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
-tells the user that there is no warranty for the work (except to the}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 extent that warranties are provided), that licensees may convey the}{\rtlch\fcs1 \af2
-\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 work under this License, and how to view a copy of this License. If}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
+\par
+\par An interactive user interface displays "Appropriate Legal Notices"}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 to the extent that it includes a convenient and prominently visible}{\rtlch\fcs1 \af2
+\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 feature that (1) displays an appropriate copyright notice, and (2)}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
+tells the user that there is no warranty for the work (except to the}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 extent that warranties are provided), that licensees may convey the}{\rtlch\fcs1 \af2
+\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 work under this License, and how to view a copy of this License. If}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950
the interface presents a list of user commands or options, such as a}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 menu, a prominent item in the list meets this criterion.
-\par
+\par
\par 1. Source Code.
-\par
-\par The "source code" for a work means the preferred form of the work}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 for making modifications to it. "Object code" means any non-source}{\rtlch\fcs1 \af2
+\par
+\par The "source code" for a work means the preferred form of the work}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 for making modifications to it. "Object code" means any non-source}{\rtlch\fcs1 \af2
\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 form of a work.
-\par
-\par A "Standard Interface" means an interface that either is an official}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 standard defined by a recognized standards body, or, in the case of}{\rtlch\fcs1 \af2
+\par
+\par A "Standard Interface" means an interface that either is an official}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 standard defined by a recognized standards body, or, in the case of}{\rtlch\fcs1 \af2
\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 interfaces specified for a particular programming language, one that}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 is wi
dely used among developers working in that language.
-\par
-\par The "System Libraries" of an executable work include anything, other}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 than the work as a whole, that (a) is included in the normal form of}{\rtlch\fcs1 \af2
+\par
+\par The "System Libraries" of an executable work include anything, other}{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 than the work as a whole, that (a) is included in the normal form of}{\rtlch\fcs1 \af2
\ltrch\fcs0 \insrsid5516594 }{\rtlch\fcs1 \af2 \ltrch\fcs0 \insrsid10231950 packaging a Major Component, but which is not part of that Major
\par Component, and (b) serves only to enable use of the work with that
\par Major Component, or to implement a Standard Interface for which an
@@ -123,7 +123,7 @@ dely used among developers working in that language.
\par (kernel, window system, and so on) of the specific operating system
\par (if any) on which the executable work runs, or a compiler used to
\par produce the work, or an object code interpreter used to run it.
-\par
+\par
\par The "Corresponding Source" for a work in object code form means all
\par the source code needed to generate, install, and (for an executable
\par work) run the object code and to modify the work, including scripts to
@@ -136,16 +136,16 @@ dely used among developers working in that language.
\par linked subprograms that the work is specifically designed to require,
\par such as by intimate data communication or control flow between those
\par subprograms and other parts of the work.
-\par
+\par
\par The Corresponding Source need not include anything that users
\par can regenerate automatically from other parts of the Corresponding
\par Source.
-\par
+\par
\par The Corresponding Source for a work in source code form is that
\par same work.
-\par
+\par
\par 2. Basic Permissions.
-\par
+\par
\par All rights granted under this License are granted for the term of
\par copyright on the Program, and are irrevocable provided the stated
\par conditions are met. This License explicitly affirms your unlimited
@@ -153,7 +153,7 @@ dely used among developers working in that language.
\par covered work is covered by this License only if the output, given its
\par content, constitutes a covered work. This License acknowledges your
\par rights of fair use or other equivalent, as provided by copyright law.
-\par
+\par
\par You may make, run and propagate covered works that you do not
\par convey, without conditions so long as your license otherwise remains
\par in force. You may convey covered works to others for the sole purpose
@@ -164,19 +164,19 @@ dely used among developers working in that language.
\par for you must do so exclusively on your behalf, under your direction
\par and control, on terms that prohibit them from making any copies of
\par your copyrighted material outside their relationship with you.
-\par
+\par
\par Conveying under any other circumstances is permitted solely under
\par the conditions stated below. Sublicensing is not allowed; section 10
\par makes it unnecessary.
-\par
+\par
\par 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-\par
+\par
\par No covered work shall be deemed part of an effective technological
\par measure under any applicable law fulfilling obligations under article
\par 11 of the WIPO copyright treaty adopted on 20 December 1996, or
\par similar laws prohibiting or restricting circumvention of such
\par measures.
-\par
+\par
\par When you convey a covered work, you waive any legal power to forbid
\par circumvention of technological measures to the extent such circumvention
\par is effected by exercising rights under this License with respect to
@@ -184,9 +184,9 @@ dely used among developers working in that language.
\par modification of the work as a means of enforcing, against the work's
\par users, your or third parties' legal rights to forbid circumvention of
\par technological measures.
-\par
+\par
\par 4. Conveying Verbatim Copies.
-\par
+\par
\par You may convey verbatim copies of the Program's source code as you
\par receive it, in any medium, provided that you conspicuously and
\par appropriately publish on each copy an appropriate copyright notice;
@@ -194,24 +194,24 @@ dely used among developers working in that language.
\par non-permissive terms added in accord with section 7 apply to the code;
\par keep intact all notices of the absence of any warranty; and give all
\par recipients a copy of this License along with the Program.
-\par
+\par
\par You may charge any price or no price for each copy that you convey,
\par and you may offer support or warranty protection for a fee.
-\par
+\par
\par 5. Conveying Modified Source Versions.
-\par
+\par
\par You may convey a work based on the Program, or the modifications to
\par produce it from the Program, in the form of source code under the
\par terms of section 4, provided that you also meet all of these conditions:
-\par
+\par
\par a) The work must carry prominent notices stating that you modified
\par it, and giving a relevant date.
-\par
+\par
\par b) The work must carry prominent notices stating that it is
\par released under this License and any conditions added under section
\par 7. This requirement modifies the requirement in section 4 to
\par "keep intact all notices".
-\par
+\par
\par c) You must license the entire work, as a whole, under this
\par License to anyone who comes into possession of a copy. This
\par License will therefore apply, along with any applicable section 7
@@ -219,12 +219,12 @@ dely used among developers working in that language.
\par regardless of how they are packaged. This License gives no
\par permission to license the work in any other way, but it does not
\par invalidate such permission if you have separately received it.
-\par
+\par
\par d) If the work has interactive user interfaces, each must display
\par Appropriate Legal Notices; however, if the Program has interactive
\par interfaces that do not display Appropriate Legal Notices, your
\par work need not make them do so.
-\par
+\par
\par A compilation of a covered work with other separate and independent
\par works, which are not by their nature extensions of the covered work,
\par and which are not combined with it such as to form a larger program,
@@ -234,19 +234,19 @@ dely used among developers working in that language.
\par beyond what the individual works permit. Inclusion of a covered work
\par in an aggregate does not cause this License to apply to the other
\par parts of the aggregate.
-\par
+\par
\par 6. Conveying Non-Source Forms.
-\par
+\par
\par You may convey a covered work in object code form under the terms
\par of sections 4 and 5, provided that you also convey the
\par machine-readable Corresponding Source under the terms of this License,
\par in one of these ways:
-\par
+\par
\par a) Convey the object code in, or embodied in, a physical product
\par (including a physical distribution medium), accompanied by the
\par Corresponding Source fixed on a durable physical medium
\par customarily used for software interchange.
-\par
+\par
\par b) Convey the object code in, or embodied in, a physical product
\par (including a physical distribution medium), accompanied by a
\par written offer, valid for at least three years and valid for as
@@ -258,13 +258,13 @@ dely used among developers working in that language.
\par more than your reasonable cost of physically performing this
\par conveying of source, or (2) access to copy the
\par Corresponding Source from a network server at no charge.
-\par
+\par
\par c) Convey individual copies of the object code with a copy of the
\par written offer to provide the Corresponding Source. This
\par alternative is allowed only occasionally and noncommercially, and
\par only if you received the object code with such an offer, in accord
\par with subsection 6b.
-\par
+\par
\par d) Convey the object code by offering access from a designated
\par place (gratis or for a charge), and offer equivalent access to the
\par Corresponding Source in the same way through the same place at no
@@ -277,16 +277,16 @@ dely used among developers working in that language.
\par Corresponding Source. Regardless of what server hosts the
\par Corresponding Source, you remain obligated to ensure that it is
\par available for as long as needed to satisfy these requirements.
-\par
+\par
\par e) Convey the object code using peer-to-peer transmission, provided
\par you inform other peers where the object code and Corresponding
\par Source of the work are being offered to the general public at no
\par charge under subsection 6d.
-\par
+\par
\par A separable portion of the object code, whose source code is excluded
\par from the Corresponding Source as a System Library, need not be
\par included in conveying the object code work.
-\par
+\par
\par A "User Product" is either (1) a "consumer product", which means any
\par tangible personal property which is normally used for personal, family,
\par or household purposes, or (2) anything designed or sold for incorporation
@@ -299,7 +299,7 @@ dely used among developers working in that language.
\par is a consumer product regardless of whether the product has substantial
\par commercial, industrial or non-consumer uses, unless such uses represent
\par the only significant mode of use of the product.
-\par
+\par
\par "Installation Information" for a User Product means any methods,
\par procedures, authorization keys, or other information required to install
\par and execute modified versions of a covered work in that User Product from
@@ -307,7 +307,7 @@ dely used among developers working in that language.
\par suffice to ensure that the continued functioning of the modified object
\par code is in no case prevented or interfered with solely because
\par modification has been made.
-\par
+\par
\par If you convey an object code work under this section in, or with, or
\par specifically for use in, a User Product, and the conveying occurs as
\par part of a transaction in which the right of possession and use of the
@@ -318,7 +318,7 @@ dely used among developers working in that language.
\par if neither you nor any third party retains the ability to install
\par modified object code on the User Product (for example, the work has
\par been installed in ROM).
-\par
+\par
\par The requirement to provide Installation Information does not include a
\par requirement to continue to provide support service, warranty, or updates
\par for a work that has been modified or installed by the recipient, or for
@@ -326,15 +326,15 @@ dely used among developers working in that language.
\par network may be denied when the modification itself materially and
\par adversely affects the operation of the network or violates the rules and
\par protocols for communication across the network.
-\par
+\par
\par Corresponding Source conveyed, and Installation Information provided,
\par in accord with this section must be in a format that is publicly
\par documented (and with an implementation available to the public in
\par source code form), and must require no special password or key for
\par unpacking, reading or copying.
-\par
+\par
\par 7. Additional Terms.
-\par
+\par
\par "Additional permissions" are terms that supplement the terms of this
\par License by making exceptions from one or more of its conditions.
\par Additional permissions that are applicable to the entire Program shall
@@ -343,41 +343,41 @@ dely used among developers working in that language.
\par apply only to part of the Program, that part may be used separately
\par under those permissions, but the entire Program remains governed by
\par this License without regard to the additional permissions.
-\par
+\par
\par When you convey a copy of a covered work, you may at your option
\par remove any additional permissions from that copy, or from any part of
\par it. (Additional permissions may be written to require their own
\par removal in certain cases when you modify the work.) You may place
\par additional permissions on material, added by you to a covered work,
\par for which you have or can give appropriate copyright permission.
-\par
+\par
\par Notwithstanding any other provision of this License, for material you
\par add to a covered work, you may (if authorized by the copyright holders of
\par that material) supplement the terms of this License with terms:
-\par
+\par
\par a) Disclaiming warranty or limiting liability differently from the
\par terms of sections 15 and 16 of this License; or
-\par
+\par
\par b) Requiring preservation of specified reasonable legal notices or
\par author attributions in that material or in the Appropriate Legal
\par Notices displayed by works containing it; or
-\par
+\par
\par c) Prohibiting misrepresentation of the origin of that material, or
\par requiring that modified versions of such material be marked in
\par reasonable ways as different from the original version; or
-\par
+\par
\par d) Limiting the use for publicity purposes of names of licensors or
\par authors of the material; or
-\par
+\par
\par e) Declining to grant rights under trademark law for use of some
\par trade names, trademarks, or service marks; or
-\par
+\par
\par f) Requiring indemnification of licensors and authors of that
\par material by anyone who conveys the material (or modified versions of
\par it) with contractual assumptions of liability to the recipient, for
\par any liability that these contractual assumptions directly impose on
\par those licensors and authors.
-\par
+\par
\par All other non-permissive additional terms are considered "further
\par restrictions" within the meaning of section 10. If the Program as you
\par received it, or any part of it, contains a notice stating that it is
@@ -387,46 +387,46 @@ dely used among developers working in that language.
\par License, you may add to a covered work material governed by the terms
\par of that license document, provided that the further restriction does
\par not survive such relicensing or conveying.
-\par
+\par
\par If you add terms to a covered work in accord with this section, you
\par must place, in the relevant source files, a statement of the
\par additional terms that apply to those files, or a notice indicating
\par where to find the applicable terms.
-\par
+\par
\par Additional terms, permissive or non-permissive, may be stated in the
\par form of a separately written license, or stated as exceptions;
\par the above requirements apply either way.
-\par
+\par
\par 8. Termination.
-\par
+\par
\par You may not propagate or modify a covered work except as expressly
\par provided under this License. Any attempt otherwise to propagate or
\par modify it is void, and will automatically terminate your rights under
\par this License (including any patent licenses granted under the third
\par paragraph of section 11).
-\par
+\par
\par However, if you cease all violation of this License, then your
\par license from a particular copyright holder is reinstated (a)
\par provisionally, unless and until the copyright holder explicitly and
\par finally terminates your license, and (b) permanently, if the copyright
\par holder fails to notify you of the violation by some reasonable means
\par prior to 60 days after the cessation.
-\par
+\par
\par Moreover, your license from a particular copyright holder is
\par reinstated permanently if the copyright holder notifies you of the
\par violation by some reasonable means, this is the first time you have
\par received notice of violation of this License (for any work) from that
\par copyright holder, and you cure the violation prior to 30 days after
\par your receipt of the notice.
-\par
+\par
\par Termination of your rights under this section does not terminate the
\par licenses of parties who have received copies or rights from you under
\par this License. If your rights have been terminated and not permanently
\par reinstated, you do not qualify to receive new licenses for the same
\par material under section 10.
-\par
+\par
\par 9. Acceptance Not Required for Having Copies.
-\par
+\par
\par You are not required to accept this License in order to receive or
\par run a copy of the Program. Ancillary propagation of a covered work
\par occurring solely as a consequence of using peer-to-peer transmission
@@ -435,14 +435,14 @@ dely used among developers working in that language.
\par modify any covered work. These actions infringe copyright if you do
\par not accept this License. Therefore, by modifying or propagating a
\par covered work, you indicate your acceptance of this License to do so.
-\par
+\par
\par 10. Automatic Licensing of Downstream Recipients.
-\par
+\par
\par Each time you convey a covered work, the recipient automatically
\par receives a license from the original licensors, to run, modify and
\par propagate that work, subject to this License. You are not responsible
\par for enforcing compliance by third parties with this License.
-\par
+\par
\par An "entity transaction" is a transaction transferring control of an
\par organization, or substantially all assets of one, or subdividing an
\par organization, or merging organizations. If propagation of a covered
@@ -452,7 +452,7 @@ dely used among developers working in that language.
\par give under the previous paragraph, plus a right to possession of the
\par Corresponding Source of the work from the predecessor in interest, if
\par the predecessor has it or can get it with reasonable efforts.
-\par
+\par
\par You may not impose any further restrictions on the exercise of the
\par rights granted or affirmed under this License. For example, you may
\par not impose a license fee, royalty, or other charge for exercise of
@@ -460,13 +460,13 @@ dely used among developers working in that language.
\par (including a cross-claim or counterclaim in a lawsuit) alleging that
\par any patent claim is infringed by making, using, selling, offering for
\par sale, or importing the Program or any portion of it.
-\par
+\par
\par 11. Patents.
-\par
+\par
\par A "contributor" is a copyright holder who authorizes use under this
\par License of the Program or a work on which the Program is based. The
\par work thus licensed is called the contributor's "contributor version".
-\par
+\par
\par A contributor's "essential patent claims" are all patent claims
\par owned or controlled by the contributor, whether already acquired or
\par hereafter acquired, that would be infringed by some manner, permitted
@@ -476,19 +476,19 @@ dely used among developers working in that language.
\par purposes of this definition, "control" includes the right to grant
\par patent sublicenses in a manner consistent with the requirements of
\par this License.
-\par
+\par
\par Each contributor grants you a non-exclusive, worldwide, royalty-free
\par patent license under the contributor's essential patent claims, to
\par make, use, sell, offer for sale, import and otherwise run, modify and
\par propagate the contents of its contributor version.
-\par
+\par
\par In the following three paragraphs, a "patent license" is any express
\par agreement or commitment, however denominated, not to enforce a patent
\par (such as an express permission to practice a patent or covenant not to
\par sue for patent infringement). To "grant" such a patent license to a
\par party means to make such an agreement or commitment not to enforce a
\par patent against the party.
-\par
+\par
\par If you convey a covered work, knowingly relying on a patent license,
\par and the Corresponding Source of the work is not available for anyone
\par to copy, free of charge and under the terms of this License, through a
@@ -502,7 +502,7 @@ dely used among developers working in that language.
\par covered work in a country, or your recipient's use of the covered work
\par in a country, would infringe one or more identifiable patents in that
\par country that you have reason to believe are valid.
-\par
+\par
\par If, pursuant to or in connection with a single transaction or
\par arrangement, you convey, or propagate by procuring conveyance of, a
\par covered work, and grant a patent license to some of the parties
@@ -510,7 +510,7 @@ dely used among developers working in that language.
\par or convey a specific copy of the covered work, then the patent license
\par you grant is automatically extended to all recipients of the covered
\par work and works based on it.
-\par
+\par
\par A patent license is "discriminatory" if it does not include within
\par the scope of its coverage, prohibits the exercise of, or is
\par conditioned on the non-exercise of one or more of the rights that are
@@ -525,13 +525,13 @@ dely used among developers working in that language.
\par for and in connection with specific products or compilations that
\par contain the covered work, unless you entered into that arrangement,
\par or that patent license was granted, prior to 28 March 2007.
-\par
+\par
\par Nothing in this License shall be construed as excluding or limiting
\par any implied license or other defenses to infringement that may
\par otherwise be available to you under applicable patent law.
-\par
+\par
\par 12. No Surrender of Others' Freedom.
-\par
+\par
\par If conditions are imposed on you (whether by court order, agreement or
\par otherwise) that contradict the conditions of this License, they do not
\par excuse you from the conditions of this License. If you cannot convey a
@@ -541,9 +541,9 @@ dely used among developers working in that language.
\par to collect a royalty for further conveying from those to whom you convey
\par the Program, the only way you could satisfy both those terms and this
\par License would be to refrain entirely from conveying the Program.
-\par
+\par
\par 13. Use with the GNU Affero General Public License.
-\par
+\par
\par Notwithstanding any other provision of this License, you have
\par permission to link or combine any covered work with a work licensed
\par under version 3 of the GNU Affero General Public License into a single
@@ -552,14 +552,14 @@ dely used among developers working in that language.
\par but the special requirements of the GNU Affero General Public License,
\par section 13, concerning interaction through a network will apply to the
\par combination as such.
-\par
+\par
\par 14. Revised Versions of this License.
-\par
+\par
\par The Free Software Foundation may publish revised and/or new versions of
\par the GNU General Public License from time to time. Such new versions will
\par be similar in spirit to the present version, but may differ in detail to
\par address new problems or concerns.
-\par
+\par
\par Each version is given a distinguishing version number. If the
\par Program specifies that a certain numbered version of the GNU General
\par Public License "or any later version" applies to it, you have the
@@ -568,19 +568,19 @@ dely used among developers working in that language.
\par Foundation. If the Program does not specify a version number of the
\par GNU General Public License, you may choose any version ever published
\par by the Free Software Foundation.
-\par
+\par
\par If the Program specifies that a proxy can decide which future
\par versions of the GNU General Public License can be used, that proxy's
\par public statement of acceptance of a version permanently authorizes you
\par to choose that version for the Program.
-\par
+\par
\par Later license versions may give you additional or different
\par permissions. However, no additional obligations are imposed on any
\par author or copyright holder as a result of your choosing to follow a
\par later version.
-\par
+\par
\par 15. Disclaimer of Warranty.
-\par
+\par
\par THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
\par APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
\par HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
@@ -589,9 +589,9 @@ dely used among developers working in that language.
\par PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
\par IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
\par ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-\par
+\par
\par 16. Limitation of Liability.
-\par
+\par
\par IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
\par WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
\par THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
@@ -601,70 +601,70 @@ dely used among developers working in that language.
\par PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
\par EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
\par SUCH DAMAGES.
-\par
+\par
\par 17. Interpretation of Sections 15 and 16.
-\par
+\par
\par If the disclaimer of warranty and limitation of liability provided
\par above cannot be given local legal effect according to their terms,
\par reviewing courts shall apply local law that most closely approximates
\par an absolute waiver of all civil liability in connection with the
\par Program, unless a warranty or assumption of liability accompanies a
\par copy of the Program in return for a fee.
-\par
+\par
\par END OF TERMS AND CONDITIONS
-\par
+\par
\par How to Apply These Terms to Your New Programs
-\par
+\par
\par If you develop a new program, and you want it to be of the greatest
\par possible use to the public, the best way to achieve this is to make it
\par free software which everyone can redistribute and change under these terms.
-\par
+\par
\par To do so, attach the following notices to the program. It is safest
\par to attach them to the start of each source file to most effectively
\par state the exclusion of warranty; and each file should have at least
\par the "copyright" line and a pointer to where the full notice is found.
-\par
+\par
\par <one line to give the program's name and a brief idea of what it does.>
\par Copyright (C) <year> <name of author>
-\par
+\par
\par This program is free software: you can redistribute it and/or modify
\par it under the terms of the GNU General Public License as published by
\par the Free Software Foundation, either version 3 of the License, or
\par (at your option) any later version.
-\par
+\par
\par This program is distributed in the hope that it will be useful,
\par but WITHOUT ANY WARRANTY; without even the implied warranty of
\par MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
\par GNU General Public License for more details.
-\par
+\par
\par You should have received a copy of the GNU General Public License
\par along with this program. If not, see <http://www.gnu.org/licenses/>.
-\par
+\par
\par Also add information on how to contact you by electronic and paper mail.
-\par
+\par
\par If the program does terminal interaction, make it output a short
\par notice like this when it starts in an interactive mode:
-\par
+\par
\par <program> Copyright (C) <year> <name of author>
\par This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
\par This is free software, and you are welcome to redistribute it
\par under certain conditions; type `show c' for details.
-\par
+\par
\par The hypothetical commands `show w' and `show c' should show the appropriate
\par parts of the General Public License. Of course, your program's commands
\par might be different; for a GUI interface, you would use an "about box".
-\par
+\par
\par You should also get your employer (if you work as a programmer) or school,
\par if any, to sign a "copyright disclaimer" for the program, if necessary.
\par For more information on this, and how to apply and follow the GNU GPL, see
\par <http://www.gnu.org/licenses/>.
-\par
+\par
\par The GNU General Public License does not permit incorporating your program
\par into proprietary programs. If your program is a subroutine library, you
\par may consider it more useful to permit linking proprietary applications with
\par the library. If this is what you want to do, use the GNU Lesser General
\par Public License instead of this License. But first, please read
\par <http://www.gnu.org/philosophy/why-not-lgpl.html>.
-\par }\pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid10231950 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af0 \ltrch\fcs0
-\insrsid2318410\charrsid10231950
+\par }\pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid10231950 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af0 \ltrch\fcs0
+\insrsid2318410\charrsid10231950
\par }}
\ No newline at end of file
diff --git a/qt/applications/workbench/CMakeLists.txt b/qt/applications/workbench/CMakeLists.txt
index b61d71c64937dd23fd9c61bfdcd8eb159f8f57aa..5f8974cae35c5ae237ae045eaeac60d3ab6cd58b 100644
--- a/qt/applications/workbench/CMakeLists.txt
+++ b/qt/applications/workbench/CMakeLists.txt
@@ -31,7 +31,7 @@ endif()
if(APPLE OR WIN32)
# development version
add_executable(MantidWorkbench mantidworkbench.cpp)
- target_compile_definitions(MantidWorkbench
+ target_compile_definitions(MantidWorkbench
PRIVATE
-DPYTHON_EXECUTABLE_PATH="${Python_EXECUTABLE}")
target_link_libraries(MantidWorkbench PRIVATE Boost::filesystem)
@@ -55,7 +55,7 @@ if(APPLE OR WIN32)
OUTPUT_NAME ${PACKAGE_EXECUTABLE}
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
target_compile_definitions(MantidWorkbenchInstalled
- PRIVATE
+ PRIVATE
-DPYTHON_EXECUTABLE_PATH="${_py_exe}"
-DQT_PLUGIN_PATH="${_qt_plugins}")
target_link_libraries(MantidWorkbenchInstalled PRIVATE Boost::filesystem)
@@ -66,7 +66,7 @@ if(APPLE OR WIN32)
DESTINATION ${WORKBENCH_BIN_DIR})
endif()
-# process resources files
+# process resources files
set(_images_qrc_file ${CMAKE_CURRENT_LIST_DIR}/resources.qrc)
if (WIN32)
function (CREATE_QRC_FILE_TEMPLATE BUILD_TYPE)
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/RecoveryFailure.ui b/qt/applications/workbench/workbench/projectrecovery/recoverygui/RecoveryFailure.ui
index 10296ee6ceb3d925c9771bbc5f2905c73058c1f1..bc2ffaa20a1e1cd2b6d61ca78660f701cb0a8dc0 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/RecoveryFailure.ui
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/RecoveryFailure.ui
@@ -87,7 +87,7 @@
<item>
<widget class="QPushButton" name="pushButton_4">
<property name="text">
- <string>Try last
+ <string>Try last
checkpoint again</string>
</property>
</widget>
@@ -95,7 +95,7 @@ checkpoint again</string>
<item>
<widget class="QPushButton" name="pushButton">
<property name="text">
- <string>Try selected
+ <string>Try selected
checkpoint</string>
</property>
</widget>
@@ -103,7 +103,7 @@ checkpoint</string>
<item>
<widget class="QPushButton" name="pushButton_2">
<property name="text">
- <string>Open selected
+ <string>Open selected
in script editor</string>
</property>
</widget>
diff --git a/qt/icons/resources/materialdesignicons-webfont-charmap.json b/qt/icons/resources/materialdesignicons-webfont-charmap.json
index 32a4684181868a4d275c67d957da6670f16096f3..6f4466063fb33a039c354cd4f5ec7f00ab85b054 100644
--- a/qt/icons/resources/materialdesignicons-webfont-charmap.json
+++ b/qt/icons/resources/materialdesignicons-webfont-charmap.json
@@ -1,3697 +1,3697 @@
{
- "access-point": "0xf002",
- "access-point-network": "0xf003",
- "access-point-network-off": "0xfbbd",
- "account": "0xf004",
- "account-alert": "0xf005",
- "account-alert-outline": "0xfb2c",
- "account-arrow-left": "0xfb2d",
- "account-arrow-left-outline": "0xfb2e",
- "account-arrow-right": "0xfb2f",
- "account-arrow-right-outline": "0xfb30",
- "account-badge": "0xfd83",
- "account-badge-alert": "0xfd84",
- "account-badge-alert-outline": "0xfd85",
- "account-badge-horizontal": "0xfdf0",
- "account-badge-horizontal-outline": "0xfdf1",
- "account-badge-outline": "0xfd86",
- "account-box": "0xf006",
- "account-box-multiple": "0xf933",
- "account-box-outline": "0xf007",
- "account-card-details": "0xf5d2",
- "account-card-details-outline": "0xfd87",
- "account-check": "0xf008",
- "account-check-outline": "0xfbbe",
- "account-child": "0xfa88",
- "account-child-circle": "0xfa89",
- "account-circle": "0xf009",
- "account-circle-outline": "0xfb31",
- "account-clock": "0xfb32",
- "account-clock-outline": "0xfb33",
- "account-convert": "0xf00a",
- "account-details": "0xf631",
- "account-edit": "0xf6bb",
- "account-group": "0xf848",
- "account-group-outline": "0xfb34",
- "account-heart": "0xf898",
- "account-heart-outline": "0xfbbf",
- "account-key": "0xf00b",
- "account-key-outline": "0xfbc0",
- "account-minus": "0xf00d",
- "account-minus-outline": "0xfaeb",
- "account-multiple": "0xf00e",
- "account-multiple-check": "0xf8c4",
- "account-multiple-minus": "0xf5d3",
- "account-multiple-minus-outline": "0xfbc1",
- "account-multiple-outline": "0xf00f",
- "account-multiple-plus": "0xf010",
- "account-multiple-plus-outline": "0xf7ff",
- "account-network": "0xf011",
- "account-network-outline": "0xfbc2",
- "account-off": "0xf012",
- "account-off-outline": "0xfbc3",
- "account-outline": "0xf013",
- "account-plus": "0xf014",
- "account-plus-outline": "0xf800",
- "account-question": "0xfb35",
- "account-question-outline": "0xfb36",
- "account-remove": "0xf015",
- "account-remove-outline": "0xfaec",
- "account-search": "0xf016",
- "account-search-outline": "0xf934",
- "account-settings": "0xf630",
- "account-star": "0xf017",
- "account-star-outline": "0xfbc4",
- "account-supervisor": "0xfa8a",
- "account-supervisor-circle": "0xfa8b",
- "account-switch": "0xf019",
- "account-tie": "0xfcbf",
- "accusoft": "0xf849",
- "adchoices": "0xfd1e",
- "adjust": "0xf01a",
- "adobe": "0xf935",
- "air-conditioner": "0xf01b",
- "air-filter": "0xfd1f",
- "air-horn": "0xfd88",
- "air-purifier": "0xfd20",
- "airbag": "0xfbc5",
- "airballoon": "0xf01c",
- "airplane": "0xf01d",
- "airplane-landing": "0xf5d4",
- "airplane-off": "0xf01e",
- "airplane-takeoff": "0xf5d5",
- "airplay": "0xf01f",
- "airport": "0xf84a",
- "alarm": "0xf020",
- "alarm-bell": "0xf78d",
- "alarm-check": "0xf021",
- "alarm-light": "0xf78e",
- "alarm-light-outline": "0xfbc6",
- "alarm-multiple": "0xf022",
- "alarm-off": "0xf023",
- "alarm-plus": "0xf024",
- "alarm-snooze": "0xf68d",
- "album": "0xf025",
- "alert": "0xf026",
- "alert-box": "0xf027",
- "alert-box-outline": "0xfcc0",
- "alert-circle": "0xf028",
- "alert-circle-outline": "0xf5d6",
- "alert-decagram": "0xf6bc",
- "alert-decagram-outline": "0xfcc1",
- "alert-octagon": "0xf029",
- "alert-octagon-outline": "0xfcc2",
- "alert-octagram": "0xf766",
- "alert-octagram-outline": "0xfcc3",
- "alert-outline": "0xf02a",
- "alien": "0xf899",
- "all-inclusive": "0xf6bd",
- "alpha": "0xf02b",
- "alpha-a": "0x41",
- "alpha-a-box": "0xfaed",
- "alpha-a-box-outline": "0xfbc7",
- "alpha-a-circle": "0xfbc8",
- "alpha-a-circle-outline": "0xfbc9",
- "alpha-b": "0x42",
- "alpha-b-box": "0xfaee",
- "alpha-b-box-outline": "0xfbca",
- "alpha-b-circle": "0xfbcb",
- "alpha-b-circle-outline": "0xfbcc",
- "alpha-c": "0x43",
- "alpha-c-box": "0xfaef",
- "alpha-c-box-outline": "0xfbcd",
- "alpha-c-circle": "0xfbce",
- "alpha-c-circle-outline": "0xfbcf",
- "alpha-d": "0x44",
- "alpha-d-box": "0xfaf0",
- "alpha-d-box-outline": "0xfbd0",
- "alpha-d-circle": "0xfbd1",
- "alpha-d-circle-outline": "0xfbd2",
- "alpha-e": "0x45",
- "alpha-e-box": "0xfaf1",
- "alpha-e-box-outline": "0xfbd3",
- "alpha-e-circle": "0xfbd4",
- "alpha-e-circle-outline": "0xfbd5",
- "alpha-f": "0x46",
- "alpha-f-box": "0xfaf2",
- "alpha-f-box-outline": "0xfbd6",
- "alpha-f-circle": "0xfbd7",
- "alpha-f-circle-outline": "0xfbd8",
- "alpha-g": "0x47",
- "alpha-g-box": "0xfaf3",
- "alpha-g-box-outline": "0xfbd9",
- "alpha-g-circle": "0xfbda",
- "alpha-g-circle-outline": "0xfbdb",
- "alpha-h": "0x48",
- "alpha-h-box": "0xfaf4",
- "alpha-h-box-outline": "0xfbdc",
- "alpha-h-circle": "0xfbdd",
- "alpha-h-circle-outline": "0xfbde",
- "alpha-i": "0x49",
- "alpha-i-box": "0xfaf5",
- "alpha-i-box-outline": "0xfbdf",
- "alpha-i-circle": "0xfbe0",
- "alpha-i-circle-outline": "0xfbe1",
- "alpha-j": "0x4a",
- "alpha-j-box": "0xfaf6",
- "alpha-j-box-outline": "0xfbe2",
- "alpha-j-circle": "0xfbe3",
- "alpha-j-circle-outline": "0xfbe4",
- "alpha-k": "0x4b",
- "alpha-k-box": "0xfaf7",
- "alpha-k-box-outline": "0xfbe5",
- "alpha-k-circle": "0xfbe6",
- "alpha-k-circle-outline": "0xfbe7",
- "alpha-l": "0x4c",
- "alpha-l-box": "0xfaf8",
- "alpha-l-box-outline": "0xfbe8",
- "alpha-l-circle": "0xfbe9",
- "alpha-l-circle-outline": "0xfbea",
- "alpha-m": "0x4d",
- "alpha-m-box": "0xfaf9",
- "alpha-m-box-outline": "0xfbeb",
- "alpha-m-circle": "0xfbec",
- "alpha-m-circle-outline": "0xfbed",
- "alpha-n": "0x4e",
- "alpha-n-box": "0xfafa",
- "alpha-n-box-outline": "0xfbee",
- "alpha-n-circle": "0xfbef",
- "alpha-n-circle-outline": "0xfbf0",
- "alpha-o": "0x4f",
- "alpha-o-box": "0xfafb",
- "alpha-o-box-outline": "0xfbf1",
- "alpha-o-circle": "0xfbf2",
- "alpha-o-circle-outline": "0xfbf3",
- "alpha-p": "0x50",
- "alpha-p-box": "0xfafc",
- "alpha-p-box-outline": "0xfbf4",
- "alpha-p-circle": "0xfbf5",
- "alpha-p-circle-outline": "0xfbf6",
- "alpha-q": "0x51",
- "alpha-q-box": "0xfafd",
- "alpha-q-box-outline": "0xfbf7",
- "alpha-q-circle": "0xfbf8",
- "alpha-q-circle-outline": "0xfbf9",
- "alpha-r": "0x52",
- "alpha-r-box": "0xfafe",
- "alpha-r-box-outline": "0xfbfa",
- "alpha-r-circle": "0xfbfb",
- "alpha-r-circle-outline": "0xfbfc",
- "alpha-s": "0x53",
- "alpha-s-box": "0xfaff",
- "alpha-s-box-outline": "0xfbfd",
- "alpha-s-circle": "0xfbfe",
- "alpha-s-circle-outline": "0xfbff",
- "alpha-t": "0x54",
- "alpha-t-box": "0xfb00",
- "alpha-t-box-outline": "0xfc00",
- "alpha-t-circle": "0xfc01",
- "alpha-t-circle-outline": "0xfc02",
- "alpha-u": "0x55",
- "alpha-u-box": "0xfb01",
- "alpha-u-box-outline": "0xfc03",
- "alpha-u-circle": "0xfc04",
- "alpha-u-circle-outline": "0xfc05",
- "alpha-v": "0x56",
- "alpha-v-box": "0xfb02",
- "alpha-v-box-outline": "0xfc06",
- "alpha-v-circle": "0xfc07",
- "alpha-v-circle-outline": "0xfc08",
- "alpha-w": "0x57",
- "alpha-w-box": "0xfb03",
- "alpha-w-box-outline": "0xfc09",
- "alpha-w-circle": "0xfc0a",
- "alpha-w-circle-outline": "0xfc0b",
- "alpha-x": "0x58",
- "alpha-x-box": "0xfb04",
- "alpha-x-box-outline": "0xfc0c",
- "alpha-x-circle": "0xfc0d",
- "alpha-x-circle-outline": "0xfc0e",
- "alpha-y": "0x59",
- "alpha-y-box": "0xfb05",
- "alpha-y-box-outline": "0xfc0f",
- "alpha-y-circle": "0xfc10",
- "alpha-y-circle-outline": "0xfc11",
- "alpha-z": "0x5a",
- "alpha-z-box": "0xfb06",
- "alpha-z-box-outline": "0xfc12",
- "alpha-z-circle": "0xfc13",
- "alpha-z-circle-outline": "0xfc14",
- "alphabetical": "0xf02c",
- "altimeter": "0xf5d7",
- "amazon": "0xf02d",
- "amazon-alexa": "0xf8c5",
- "amazon-drive": "0xf02e",
- "ambulance": "0xf02f",
- "ammunition": "0xfcc4",
- "ampersand": "0xfa8c",
- "amplifier": "0xf030",
- "anchor": "0xf031",
- "android": "0xf032",
- "android-auto": "0xfa8d",
- "android-debug-bridge": "0xf033",
- "android-head": "0xf78f",
- "android-messages": "0xfd21",
- "android-studio": "0xf034",
- "angle-acute": "0xf936",
- "angle-obtuse": "0xf937",
- "angle-right": "0xf938",
- "angular": "0xf6b1",
- "angularjs": "0xf6be",
- "animation": "0xf5d8",
- "animation-outline": "0xfa8e",
- "animation-play": "0xf939",
- "animation-play-outline": "0xfa8f",
- "anvil": "0xf89a",
- "apple": "0xf035",
- "apple-finder": "0xf036",
- "apple-icloud": "0xf038",
- "apple-ios": "0xf037",
- "apple-keyboard-caps": "0xf632",
- "apple-keyboard-command": "0xf633",
- "apple-keyboard-control": "0xf634",
- "apple-keyboard-option": "0xf635",
- "apple-keyboard-shift": "0xf636",
- "apple-safari": "0xf039",
- "application": "0xf614",
- "application-export": "0xfd89",
- "application-import": "0xfd8a",
- "apps": "0xf03b",
- "apps-box": "0xfd22",
- "arch": "0xf8c6",
- "archive": "0xf03c",
- "arrange-bring-forward": "0xf03d",
- "arrange-bring-to-front": "0xf03e",
- "arrange-send-backward": "0xf03f",
- "arrange-send-to-back": "0xf040",
- "arrow-all": "0xf041",
- "arrow-bottom-left": "0xf042",
- "arrow-bottom-left-bold-outline": "0xf9b6",
- "arrow-bottom-left-thick": "0xf9b7",
- "arrow-bottom-right": "0xf043",
- "arrow-bottom-right-bold-outline": "0xf9b8",
- "arrow-bottom-right-thick": "0xf9b9",
- "arrow-collapse": "0xf615",
- "arrow-collapse-all": "0xf044",
- "arrow-collapse-down": "0xf791",
- "arrow-collapse-horizontal": "0xf84b",
- "arrow-collapse-left": "0xf792",
- "arrow-collapse-right": "0xf793",
- "arrow-collapse-up": "0xf794",
- "arrow-collapse-vertical": "0xf84c",
- "arrow-decision": "0xf9ba",
- "arrow-decision-auto": "0xf9bb",
- "arrow-decision-auto-outline": "0xf9bc",
- "arrow-decision-outline": "0xf9bd",
- "arrow-down": "0xf045",
- "arrow-down-bold": "0xf72d",
- "arrow-down-bold-box": "0xf72e",
- "arrow-down-bold-box-outline": "0xf72f",
- "arrow-down-bold-circle": "0xf047",
- "arrow-down-bold-circle-outline": "0xf048",
- "arrow-down-bold-hexagon-outline": "0xf049",
- "arrow-down-bold-outline": "0xf9be",
- "arrow-down-box": "0xf6bf",
- "arrow-down-circle": "0xfcb7",
- "arrow-down-circle-outline": "0xfcb8",
- "arrow-down-drop-circle": "0xf04a",
- "arrow-down-drop-circle-outline": "0xf04b",
- "arrow-down-thick": "0xf046",
- "arrow-expand": "0xf616",
- "arrow-expand-all": "0xf04c",
- "arrow-expand-down": "0xf795",
- "arrow-expand-horizontal": "0xf84d",
- "arrow-expand-left": "0xf796",
- "arrow-expand-right": "0xf797",
- "arrow-expand-up": "0xf798",
- "arrow-expand-vertical": "0xf84e",
- "arrow-left": "0xf04d",
- "arrow-left-bold": "0xf730",
- "arrow-left-bold-box": "0xf731",
- "arrow-left-bold-box-outline": "0xf732",
- "arrow-left-bold-circle": "0xf04f",
- "arrow-left-bold-circle-outline": "0xf050",
- "arrow-left-bold-hexagon-outline": "0xf051",
- "arrow-left-bold-outline": "0xf9bf",
- "arrow-left-box": "0xf6c0",
- "arrow-left-circle": "0xfcb9",
- "arrow-left-circle-outline": "0xfcba",
- "arrow-left-drop-circle": "0xf052",
- "arrow-left-drop-circle-outline": "0xf053",
- "arrow-left-right-bold-outline": "0xf9c0",
- "arrow-left-thick": "0xf04e",
- "arrow-right": "0xf054",
- "arrow-right-bold": "0xf733",
- "arrow-right-bold-box": "0xf734",
- "arrow-right-bold-box-outline": "0xf735",
- "arrow-right-bold-circle": "0xf056",
- "arrow-right-bold-circle-outline": "0xf057",
- "arrow-right-bold-hexagon-outline": "0xf058",
- "arrow-right-bold-outline": "0xf9c1",
- "arrow-right-box": "0xf6c1",
- "arrow-right-circle": "0xfcbb",
- "arrow-right-circle-outline": "0xfcbc",
- "arrow-right-drop-circle": "0xf059",
- "arrow-right-drop-circle-outline": "0xf05a",
- "arrow-right-thick": "0xf055",
- "arrow-split-horizontal": "0xf93a",
- "arrow-split-vertical": "0xf93b",
- "arrow-top-left": "0xf05b",
- "arrow-top-left-bold-outline": "0xf9c2",
- "arrow-top-left-thick": "0xf9c3",
- "arrow-top-right": "0xf05c",
- "arrow-top-right-bold-outline": "0xf9c4",
- "arrow-top-right-thick": "0xf9c5",
- "arrow-up": "0xf05d",
- "arrow-up-bold": "0xf736",
- "arrow-up-bold-box": "0xf737",
- "arrow-up-bold-box-outline": "0xf738",
- "arrow-up-bold-circle": "0xf05f",
- "arrow-up-bold-circle-outline": "0xf060",
- "arrow-up-bold-hexagon-outline": "0xf061",
- "arrow-up-bold-outline": "0xf9c6",
- "arrow-up-box": "0xf6c2",
- "arrow-up-circle": "0xfcbd",
- "arrow-up-circle-outline": "0xfcbe",
- "arrow-up-down-bold-outline": "0xf9c7",
- "arrow-up-drop-circle": "0xf062",
- "arrow-up-drop-circle-outline": "0xf063",
- "arrow-up-thick": "0xf05e",
- "artist": "0xf802",
- "artist-outline": "0xfcc5",
- "artstation": "0xfb37",
- "aspect-ratio": "0xfa23",
- "assistant": "0xf064",
- "asterisk": "0xf6c3",
- "at": "0xf065",
- "atlassian": "0xf803",
- "atm": "0xfd23",
- "atom": "0xf767",
- "attachment": "0xf066",
- "audio-video": "0xf93c",
- "audiobook": "0xf067",
- "augmented-reality": "0xf84f",
- "auto-fix": "0xf068",
- "auto-upload": "0xf069",
- "autorenew": "0xf06a",
- "av-timer": "0xf06b",
- "aws": "0xfdf2",
- "axe": "0xf8c7",
- "axis": "0xfd24",
- "axis-arrow": "0xfd25",
- "axis-arrow-lock": "0xfd26",
- "axis-lock": "0xfd27",
- "axis-x-arrow": "0xfd28",
- "axis-x-arrow-lock": "0xfd29",
- "axis-x-rotate-clockwise": "0xfd2a",
- "axis-x-rotate-counterclockwise": "0xfd2b",
- "axis-x-y-arrow-lock": "0xfd2c",
- "axis-y-arrow": "0xfd2d",
- "axis-y-arrow-lock": "0xfd2e",
- "axis-y-rotate-clockwise": "0xfd2f",
- "axis-y-rotate-counterclockwise": "0xfd30",
- "axis-z-arrow": "0xfd31",
- "axis-z-arrow-lock": "0xfd32",
- "axis-z-rotate-clockwise": "0xfd33",
- "axis-z-rotate-counterclockwise": "0xfd34",
- "azure": "0xf804",
- "babel": "0xfa24",
- "baby": "0xf06c",
- "baby-buggy": "0xf68e",
- "backburger": "0xf06d",
- "backspace": "0xf06e",
- "backspace-outline": "0xfb38",
- "backup-restore": "0xf06f",
- "badminton": "0xf850",
- "bag-personal": "0xfdf3",
- "bag-personal-off": "0xfdf4",
- "bag-personal-off-outline": "0xfdf5",
- "bag-personal-outline": "0xfdf6",
- "balloon": "0xfa25",
- "ballot": "0xf9c8",
- "ballot-outline": "0xf9c9",
- "ballot-recount": "0xfc15",
- "ballot-recount-outline": "0xfc16",
- "bandage": "0xfd8b",
- "bandcamp": "0xf674",
- "bank": "0xf070",
- "bank-minus": "0xfd8c",
- "bank-plus": "0xfd8d",
- "bank-remove": "0xfd8e",
- "bank-transfer": "0xfa26",
- "bank-transfer-in": "0xfa27",
- "bank-transfer-out": "0xfa28",
- "barcode": "0xf071",
- "barcode-scan": "0xf072",
- "barley": "0xf073",
- "barley-off": "0xfb39",
- "barn": "0xfb3a",
- "barrel": "0xf074",
- "baseball": "0xf851",
- "baseball-bat": "0xf852",
- "basecamp": "0xf075",
- "basket": "0xf076",
- "basket-fill": "0xf077",
- "basket-unfill": "0xf078",
- "basketball": "0xf805",
- "basketball-hoop": "0xfc17",
- "basketball-hoop-outline": "0xfc18",
- "bat": "0xfb3b",
- "battery": "0xf079",
- "battery-10": "0xf07a",
- "battery-10-bluetooth": "0xf93d",
- "battery-20": "0xf07b",
- "battery-20-bluetooth": "0xf93e",
- "battery-30": "0xf07c",
- "battery-30-bluetooth": "0xf93f",
- "battery-40": "0xf07d",
- "battery-40-bluetooth": "0xf940",
- "battery-50": "0xf07e",
- "battery-50-bluetooth": "0xf941",
- "battery-60": "0xf07f",
- "battery-60-bluetooth": "0xf942",
- "battery-70": "0xf080",
- "battery-70-bluetooth": "0xf943",
- "battery-80": "0xf081",
- "battery-80-bluetooth": "0xf944",
- "battery-90": "0xf082",
- "battery-90-bluetooth": "0xf945",
- "battery-alert": "0xf083",
- "battery-alert-bluetooth": "0xf946",
- "battery-bluetooth": "0xf947",
- "battery-bluetooth-variant": "0xf948",
- "battery-charging": "0xf084",
- "battery-charging-10": "0xf89b",
- "battery-charging-100": "0xf085",
- "battery-charging-20": "0xf086",
- "battery-charging-30": "0xf087",
- "battery-charging-40": "0xf088",
- "battery-charging-50": "0xf89c",
- "battery-charging-60": "0xf089",
- "battery-charging-70": "0xf89d",
- "battery-charging-80": "0xf08a",
- "battery-charging-90": "0xf08b",
- "battery-charging-outline": "0xf89e",
- "battery-charging-wireless": "0xf806",
- "battery-charging-wireless-10": "0xf807",
- "battery-charging-wireless-20": "0xf808",
- "battery-charging-wireless-30": "0xf809",
- "battery-charging-wireless-40": "0xf80a",
- "battery-charging-wireless-50": "0xf80b",
- "battery-charging-wireless-60": "0xf80c",
- "battery-charging-wireless-70": "0xf80d",
- "battery-charging-wireless-80": "0xf80e",
- "battery-charging-wireless-90": "0xf80f",
- "battery-charging-wireless-alert": "0xf810",
- "battery-charging-wireless-outline": "0xf811",
- "battery-minus": "0xf08c",
- "battery-negative": "0xf08d",
- "battery-outline": "0xf08e",
- "battery-plus": "0xf08f",
- "battery-positive": "0xf090",
- "battery-unknown": "0xf091",
- "battery-unknown-bluetooth": "0xf949",
- "battlenet": "0xfb3c",
- "beach": "0xf092",
- "beaker": "0xfcc6",
- "beaker-outline": "0xf68f",
- "beats": "0xf097",
- "bed-empty": "0xf89f",
- "beer": "0xf098",
- "behance": "0xf099",
- "bell": "0xf09a",
- "bell-alert": "0xfd35",
- "bell-circle": "0xfd36",
- "bell-circle-outline": "0xfd37",
- "bell-off": "0xf09b",
- "bell-off-outline": "0xfa90",
- "bell-outline": "0xf09c",
- "bell-plus": "0xf09d",
- "bell-plus-outline": "0xfa91",
- "bell-ring": "0xf09e",
- "bell-ring-outline": "0xf09f",
- "bell-sleep": "0xf0a0",
- "bell-sleep-outline": "0xfa92",
- "beta": "0xf0a1",
- "betamax": "0xf9ca",
- "biathlon": "0xfdf7",
- "bible": "0xf0a2",
- "bike": "0xf0a3",
- "billiards": "0xfb3d",
- "billiards-rack": "0xfb3e",
- "bing": "0xf0a4",
- "binoculars": "0xf0a5",
- "bio": "0xf0a6",
- "biohazard": "0xf0a7",
- "bitbucket": "0xf0a8",
- "bitcoin": "0xf812",
- "black-mesa": "0xf0a9",
- "blackberry": "0xf0aa",
- "blender": "0xfcc7",
- "blender-software": "0xf0ab",
- "blinds": "0xf0ac",
- "block-helper": "0xf0ad",
- "blogger": "0xf0ae",
- "blood-bag": "0xfcc8",
- "bluetooth": "0xf0af",
- "bluetooth-audio": "0xf0b0",
- "bluetooth-connect": "0xf0b1",
- "bluetooth-off": "0xf0b2",
- "bluetooth-settings": "0xf0b3",
- "bluetooth-transfer": "0xf0b4",
- "blur": "0xf0b5",
- "blur-linear": "0xf0b6",
- "blur-off": "0xf0b7",
- "blur-radial": "0xf0b8",
- "bolnisi-cross": "0xfcc9",
- "bolt": "0xfd8f",
- "bomb": "0xf690",
- "bomb-off": "0xf6c4",
- "bone": "0xf0b9",
- "book": "0xf0ba",
- "book-lock": "0xf799",
- "book-lock-open": "0xf79a",
- "book-minus": "0xf5d9",
- "book-multiple": "0xf0bb",
- "book-multiple-minus": "0xfa93",
- "book-multiple-plus": "0xfa94",
- "book-multiple-remove": "0xfa95",
- "book-multiple-variant": "0xf0bc",
- "book-open": "0xf0bd",
- "book-open-outline": "0xfb3f",
- "book-open-page-variant": "0xf5da",
- "book-open-variant": "0xf0be",
- "book-outline": "0xfb40",
- "book-plus": "0xf5db",
- "book-remove": "0xfa96",
- "book-variant": "0xf0bf",
- "bookmark": "0xf0c0",
- "bookmark-check": "0xf0c1",
- "bookmark-minus": "0xf9cb",
- "bookmark-minus-outline": "0xf9cc",
- "bookmark-multiple": "0xfdf8",
- "bookmark-multiple-outline": "0xfdf9",
- "bookmark-music": "0xf0c2",
- "bookmark-off": "0xf9cd",
- "bookmark-off-outline": "0xf9ce",
- "bookmark-outline": "0xf0c3",
- "bookmark-plus": "0xf0c5",
- "bookmark-plus-outline": "0xf0c4",
- "bookmark-remove": "0xf0c6",
- "boombox": "0xf5dc",
- "bootstrap": "0xf6c5",
- "border-all": "0xf0c7",
- "border-all-variant": "0xf8a0",
- "border-bottom": "0xf0c8",
- "border-bottom-variant": "0xf8a1",
- "border-color": "0xf0c9",
- "border-horizontal": "0xf0ca",
- "border-inside": "0xf0cb",
- "border-left": "0xf0cc",
- "border-left-variant": "0xf8a2",
- "border-none": "0xf0cd",
- "border-none-variant": "0xf8a3",
- "border-outside": "0xf0ce",
- "border-right": "0xf0cf",
- "border-right-variant": "0xf8a4",
- "border-style": "0xf0d0",
- "border-top": "0xf0d1",
- "border-top-variant": "0xf8a5",
- "border-vertical": "0xf0d2",
- "bottle-wine": "0xf853",
- "bow-tie": "0xf677",
- "bowl": "0xf617",
- "bowling": "0xf0d3",
- "box": "0xf0d4",
- "box-cutter": "0xf0d5",
- "box-shadow": "0xf637",
- "boxing-glove": "0xfb41",
- "braille": "0xf9cf",
- "brain": "0xf9d0",
- "bread-slice": "0xfcca",
- "bread-slice-outline": "0xfccb",
- "bridge": "0xf618",
- "briefcase": "0xf0d6",
- "briefcase-account": "0xfccc",
- "briefcase-account-outline": "0xfccd",
- "briefcase-check": "0xf0d7",
- "briefcase-download": "0xf0d8",
- "briefcase-download-outline": "0xfc19",
- "briefcase-edit": "0xfa97",
- "briefcase-edit-outline": "0xfc1a",
- "briefcase-minus": "0xfa29",
- "briefcase-minus-outline": "0xfc1b",
- "briefcase-outline": "0xf813",
- "briefcase-plus": "0xfa2a",
- "briefcase-plus-outline": "0xfc1c",
- "briefcase-remove": "0xfa2b",
- "briefcase-remove-outline": "0xfc1d",
- "briefcase-search": "0xfa2c",
- "briefcase-search-outline": "0xfc1e",
- "briefcase-upload": "0xf0d9",
- "briefcase-upload-outline": "0xfc1f",
- "brightness-1": "0xf0da",
- "brightness-2": "0xf0db",
- "brightness-3": "0xf0dc",
- "brightness-4": "0xf0dd",
- "brightness-5": "0xf0de",
- "brightness-6": "0xf0df",
- "brightness-7": "0xf0e0",
- "brightness-auto": "0xf0e1",
- "brightness-percent": "0xfcce",
- "broom": "0xf0e2",
- "brush": "0xf0e3",
- "buddhism": "0xf94a",
- "buffer": "0xf619",
- "bug": "0xf0e4",
- "bug-check": "0xfa2d",
- "bug-check-outline": "0xfa2e",
- "bug-outline": "0xfa2f",
- "bugle": "0xfd90",
- "bulldozer": "0xfb07",
- "bullet": "0xfccf",
- "bulletin-board": "0xf0e5",
- "bullhorn": "0xf0e6",
- "bullhorn-outline": "0xfb08",
- "bullseye": "0xf5dd",
- "bullseye-arrow": "0xf8c8",
- "bus": "0xf0e7",
- "bus-alert": "0xfa98",
- "bus-articulated-end": "0xf79b",
- "bus-articulated-front": "0xf79c",
- "bus-clock": "0xf8c9",
- "bus-double-decker": "0xf79d",
- "bus-school": "0xf79e",
- "bus-side": "0xf79f",
- "cached": "0xf0e8",
- "cactus": "0xfd91",
- "cake": "0xf0e9",
- "cake-layered": "0xf0ea",
- "cake-variant": "0xf0eb",
- "calculator": "0xf0ec",
- "calculator-variant": "0xfa99",
- "calendar": "0xf0ed",
- "calendar-alert": "0xfa30",
- "calendar-blank": "0xf0ee",
- "calendar-blank-outline": "0xfb42",
- "calendar-check": "0xf0ef",
- "calendar-check-outline": "0xfc20",
- "calendar-clock": "0xf0f0",
- "calendar-edit": "0xf8a6",
- "calendar-export": "0xfb09",
- "calendar-heart": "0xf9d1",
- "calendar-import": "0xfb0a",
- "calendar-minus": "0xfd38",
- "calendar-month": "0xfdfa",
- "calendar-month-outline": "0xfdfb",
- "calendar-multiple": "0xf0f1",
- "calendar-multiple-check": "0xf0f2",
- "calendar-multiselect": "0xfa31",
- "calendar-outline": "0xfb43",
- "calendar-plus": "0xf0f3",
- "calendar-question": "0xf691",
- "calendar-range": "0xf678",
- "calendar-range-outline": "0xfb44",
- "calendar-remove": "0xf0f4",
- "calendar-remove-outline": "0xfc21",
- "calendar-search": "0xf94b",
- "calendar-star": "0xf9d2",
- "calendar-text": "0xf0f5",
- "calendar-text-outline": "0xfc22",
- "calendar-today": "0xf0f6",
- "calendar-week": "0xfa32",
- "calendar-week-begin": "0xfa33",
- "call-made": "0xf0f7",
- "call-merge": "0xf0f8",
- "call-missed": "0xf0f9",
- "call-received": "0xf0fa",
- "call-split": "0xf0fb",
- "camcorder": "0xf0fc",
- "camcorder-box": "0xf0fd",
- "camcorder-box-off": "0xf0fe",
- "camcorder-off": "0xf0ff",
- "camera": "0xf100",
- "camera-account": "0xf8ca",
- "camera-burst": "0xf692",
- "camera-control": "0xfb45",
- "camera-enhance": "0xf101",
- "camera-enhance-outline": "0xfb46",
- "camera-front": "0xf102",
- "camera-front-variant": "0xf103",
- "camera-gopro": "0xf7a0",
- "camera-image": "0xf8cb",
- "camera-iris": "0xf104",
- "camera-metering-center": "0xf7a1",
- "camera-metering-matrix": "0xf7a2",
- "camera-metering-partial": "0xf7a3",
- "camera-metering-spot": "0xf7a4",
- "camera-off": "0xf5df",
- "camera-outline": "0xfd39",
- "camera-party-mode": "0xf105",
- "camera-rear": "0xf106",
- "camera-rear-variant": "0xf107",
- "camera-retake": "0xfdfc",
- "camera-retake-outline": "0xfdfd",
- "camera-switch": "0xf108",
- "camera-timer": "0xf109",
- "camera-wireless": "0xfd92",
- "camera-wireless-outline": "0xfd93",
- "cancel": "0xf739",
- "candle": "0xf5e2",
- "candycane": "0xf10a",
- "cannabis": "0xf7a5",
- "caps-lock": "0xfa9a",
- "car": "0xf10b",
- "car-back": "0xfdfe",
- "car-battery": "0xf10c",
- "car-brake-abs": "0xfc23",
- "car-brake-alert": "0xfc24",
- "car-brake-hold": "0xfd3a",
- "car-brake-parking": "0xfd3b",
- "car-connected": "0xf10d",
- "car-convertible": "0xf7a6",
- "car-cruise-control": "0xfd3c",
- "car-defrost-front": "0xfd3d",
- "car-defrost-rear": "0xfd3e",
- "car-door": "0xfb47",
- "car-electric": "0xfb48",
- "car-esp": "0xfc25",
- "car-estate": "0xf7a7",
- "car-hatchback": "0xf7a8",
- "car-key": "0xfb49",
- "car-light-dimmed": "0xfc26",
- "car-light-fog": "0xfc27",
- "car-light-high": "0xfc28",
- "car-limousine": "0xf8cc",
- "car-multiple": "0xfb4a",
- "car-off": "0xfdff",
- "car-parking-lights": "0xfd3f",
- "car-pickup": "0xf7a9",
- "car-side": "0xf7aa",
- "car-sports": "0xf7ab",
- "car-tire-alert": "0xfc29",
- "car-traction-control": "0xfd40",
- "car-wash": "0xf10e",
- "caravan": "0xf7ac",
- "card": "0xfb4b",
- "card-bulleted": "0xfb4c",
- "card-bulleted-off": "0xfb4d",
- "card-bulleted-off-outline": "0xfb4e",
- "card-bulleted-outline": "0xfb4f",
- "card-bulleted-settings": "0xfb50",
- "card-bulleted-settings-outline": "0xfb51",
- "card-outline": "0xfb52",
- "card-text": "0xfb53",
- "card-text-outline": "0xfb54",
- "cards": "0xf638",
- "cards-club": "0xf8cd",
- "cards-diamond": "0xf8ce",
- "cards-heart": "0xf8cf",
- "cards-outline": "0xf639",
- "cards-playing-outline": "0xf63a",
- "cards-spade": "0xf8d0",
- "cards-variant": "0xf6c6",
- "carrot": "0xf10f",
- "carry-on-bag-check": "0xfd41",
- "cart": "0xf110",
- "cart-arrow-down": "0xfd42",
- "cart-arrow-right": "0xfc2a",
- "cart-arrow-up": "0xfd43",
- "cart-minus": "0xfd44",
- "cart-off": "0xf66b",
- "cart-outline": "0xf111",
- "cart-plus": "0xf112",
- "cart-remove": "0xfd45",
- "case-sensitive-alt": "0xf113",
- "cash": "0xf114",
- "cash-100": "0xf115",
- "cash-marker": "0xfd94",
- "cash-multiple": "0xf116",
- "cash-refund": "0xfa9b",
- "cash-register": "0xfcd0",
- "cash-usd": "0xf117",
- "cassette": "0xf9d3",
- "cast": "0xf118",
- "cast-connected": "0xf119",
- "cast-education": "0xfe6d",
- "cast-off": "0xf789",
- "castle": "0xf11a",
- "cat": "0xf11b",
- "cctv": "0xf7ad",
- "ceiling-light": "0xf768",
- "cellphone": "0xf11c",
- "cellphone-android": "0xf11d",
- "cellphone-arrow-down": "0xf9d4",
- "cellphone-basic": "0xf11e",
- "cellphone-dock": "0xf11f",
- "cellphone-erase": "0xf94c",
- "cellphone-iphone": "0xf120",
- "cellphone-key": "0xf94d",
- "cellphone-link": "0xf121",
- "cellphone-link-off": "0xf122",
- "cellphone-lock": "0xf94e",
- "cellphone-message": "0xf8d2",
- "cellphone-off": "0xf94f",
- "cellphone-screenshot": "0xfa34",
- "cellphone-settings": "0xf123",
- "cellphone-settings-variant": "0xf950",
- "cellphone-sound": "0xf951",
- "cellphone-text": "0xf8d1",
- "cellphone-wireless": "0xf814",
- "celtic-cross": "0xfcd1",
- "certificate": "0xf124",
- "chair-school": "0xf125",
- "charity": "0xfc2b",
- "chart-arc": "0xf126",
- "chart-areaspline": "0xf127",
- "chart-bar": "0xf128",
- "chart-bar-stacked": "0xf769",
- "chart-bell-curve": "0xfc2c",
- "chart-bubble": "0xf5e3",
- "chart-donut": "0xf7ae",
- "chart-donut-variant": "0xf7af",
- "chart-gantt": "0xf66c",
- "chart-histogram": "0xf129",
- "chart-line": "0xf12a",
- "chart-line-stacked": "0xf76a",
- "chart-line-variant": "0xf7b0",
- "chart-multiline": "0xf8d3",
- "chart-pie": "0xf12b",
- "chart-scatterplot-hexbin": "0xf66d",
- "chart-timeline": "0xf66e",
- "chat": "0xfb55",
- "chat-alert": "0xfb56",
- "chat-processing": "0xfb57",
- "check": "0xf12c",
- "check-all": "0xf12d",
- "check-bold": "0xfe6e",
- "check-box-multiple-outline": "0xfc2d",
- "check-box-outline": "0xfc2e",
- "check-circle": "0xf5e0",
- "check-circle-outline": "0xf5e1",
- "check-decagram": "0xf790",
- "check-network": "0xfc2f",
- "check-network-outline": "0xfc30",
- "check-outline": "0xf854",
- "check-underline": "0xfe70",
- "check-underline-circle": "0xfe71",
- "check-underline-circle-outline": "0xfe72",
- "checkbook": "0xfa9c",
- "checkbox-blank": "0xf12e",
- "checkbox-blank-circle": "0xf12f",
- "checkbox-blank-circle-outline": "0xf130",
- "checkbox-blank-outline": "0xf131",
- "checkbox-intermediate": "0xf855",
- "checkbox-marked": "0xf132",
- "checkbox-marked-circle": "0xf133",
- "checkbox-marked-circle-outline": "0xf134",
- "checkbox-marked-outline": "0xf135",
- "checkbox-multiple-blank": "0xf136",
- "checkbox-multiple-blank-circle": "0xf63b",
- "checkbox-multiple-blank-circle-outline": "0xf63c",
- "checkbox-multiple-blank-outline": "0xf137",
- "checkbox-multiple-marked": "0xf138",
- "checkbox-multiple-marked-circle": "0xf63d",
- "checkbox-multiple-marked-circle-outline": "0xf63e",
- "checkbox-multiple-marked-outline": "0xf139",
- "checkerboard": "0xf13a",
- "chef-hat": "0xfb58",
- "chemical-weapon": "0xf13b",
- "chess-bishop": "0xf85b",
- "chess-king": "0xf856",
- "chess-knight": "0xf857",
- "chess-pawn": "0xf858",
- "chess-queen": "0xf859",
- "chess-rook": "0xf85a",
- "chevron-double-down": "0xf13c",
- "chevron-double-left": "0xf13d",
- "chevron-double-right": "0xf13e",
- "chevron-double-up": "0xf13f",
- "chevron-down": "0xf140",
- "chevron-down-box": "0xf9d5",
- "chevron-down-box-outline": "0xf9d6",
- "chevron-down-circle": "0xfb0b",
- "chevron-down-circle-outline": "0xfb0c",
- "chevron-left": "0xf141",
- "chevron-left-box": "0xf9d7",
- "chevron-left-box-outline": "0xf9d8",
- "chevron-left-circle": "0xfb0d",
- "chevron-left-circle-outline": "0xfb0e",
- "chevron-right": "0xf142",
- "chevron-right-box": "0xf9d9",
- "chevron-right-box-outline": "0xf9da",
- "chevron-right-circle": "0xfb0f",
- "chevron-right-circle-outline": "0xfb10",
- "chevron-triple-down": "0xfd95",
- "chevron-triple-left": "0xfd96",
- "chevron-triple-right": "0xfd97",
- "chevron-triple-up": "0xfd98",
- "chevron-up": "0xf143",
- "chevron-up-box": "0xf9db",
- "chevron-up-box-outline": "0xf9dc",
- "chevron-up-circle": "0xfb11",
- "chevron-up-circle-outline": "0xfb12",
- "chili-hot": "0xf7b1",
- "chili-medium": "0xf7b2",
- "chili-mild": "0xf7b3",
- "chip": "0xf61a",
- "christianity": "0xf952",
- "christianity-outline": "0xfcd2",
- "church": "0xf144",
- "circle": "0xf764",
- "circle-edit-outline": "0xf8d4",
- "circle-medium": "0xf9dd",
- "circle-outline": "0xf765",
- "circle-slice-1": "0xfa9d",
- "circle-slice-2": "0xfa9e",
- "circle-slice-3": "0xfa9f",
- "circle-slice-4": "0xfaa0",
- "circle-slice-5": "0xfaa1",
- "circle-slice-6": "0xfaa2",
- "circle-slice-7": "0xfaa3",
- "circle-slice-8": "0xfaa4",
- "circle-small": "0xf9de",
- "circular-saw": "0xfe73",
- "cisco-webex": "0xf145",
- "city": "0xf146",
- "city-variant": "0xfa35",
- "city-variant-outline": "0xfa36",
- "clipboard": "0xf147",
- "clipboard-account": "0xf148",
- "clipboard-account-outline": "0xfc31",
- "clipboard-alert": "0xf149",
- "clipboard-alert-outline": "0xfcd3",
- "clipboard-arrow-down": "0xf14a",
- "clipboard-arrow-down-outline": "0xfc32",
- "clipboard-arrow-left": "0xf14b",
- "clipboard-arrow-left-outline": "0xfcd4",
- "clipboard-arrow-right": "0xfcd5",
- "clipboard-arrow-right-outline": "0xfcd6",
- "clipboard-arrow-up": "0xfc33",
- "clipboard-arrow-up-outline": "0xfc34",
- "clipboard-check": "0xf14c",
- "clipboard-check-outline": "0xf8a7",
- "clipboard-flow": "0xf6c7",
- "clipboard-outline": "0xf14d",
- "clipboard-play": "0xfc35",
- "clipboard-play-outline": "0xfc36",
- "clipboard-plus": "0xf750",
- "clipboard-pulse": "0xf85c",
- "clipboard-pulse-outline": "0xf85d",
- "clipboard-text": "0xf14e",
- "clipboard-text-outline": "0xfa37",
- "clipboard-text-play": "0xfc37",
- "clipboard-text-play-outline": "0xfc38",
- "clippy": "0xf14f",
- "clock": "0xf953",
- "clock-alert": "0xf954",
- "clock-alert-outline": "0xf5ce",
- "clock-end": "0xf151",
- "clock-fast": "0xf152",
- "clock-in": "0xf153",
- "clock-out": "0xf154",
- "clock-outline": "0xf150",
- "clock-start": "0xf155",
- "close": "0xf156",
- "close-box": "0xf157",
- "close-box-multiple": "0xfc39",
- "close-box-multiple-outline": "0xfc3a",
- "close-box-outline": "0xf158",
- "close-circle": "0xf159",
- "close-circle-outline": "0xf15a",
- "close-network": "0xf15b",
- "close-network-outline": "0xfc3b",
- "close-octagon": "0xf15c",
- "close-octagon-outline": "0xf15d",
- "close-outline": "0xf6c8",
- "closed-caption": "0xf15e",
- "closed-caption-outline": "0xfd99",
- "cloud": "0xf15f",
- "cloud-alert": "0xf9df",
- "cloud-braces": "0xf7b4",
- "cloud-check": "0xf160",
- "cloud-circle": "0xf161",
- "cloud-download": "0xf162",
- "cloud-download-outline": "0xfb59",
- "cloud-off-outline": "0xf164",
- "cloud-outline": "0xf163",
- "cloud-print": "0xf165",
- "cloud-print-outline": "0xf166",
- "cloud-question": "0xfa38",
- "cloud-search": "0xf955",
- "cloud-search-outline": "0xf956",
- "cloud-sync": "0xf63f",
- "cloud-tags": "0xf7b5",
- "cloud-upload": "0xf167",
- "cloud-upload-outline": "0xfb5a",
- "clover": "0xf815",
- "code-array": "0xf168",
- "code-braces": "0xf169",
- "code-brackets": "0xf16a",
- "code-equal": "0xf16b",
- "code-greater-than": "0xf16c",
- "code-greater-than-or-equal": "0xf16d",
- "code-less-than": "0xf16e",
- "code-less-than-or-equal": "0xf16f",
- "code-not-equal": "0xf170",
- "code-not-equal-variant": "0xf171",
- "code-parentheses": "0xf172",
- "code-string": "0xf173",
- "code-tags": "0xf174",
- "code-tags-check": "0xf693",
- "codepen": "0xf175",
- "coffee": "0xf176",
- "coffee-outline": "0xf6c9",
- "coffee-to-go": "0xf177",
- "coffin": "0xfb5b",
- "cogs": "0xf8d5",
- "coin": "0xf178",
- "coins": "0xf694",
- "collage": "0xf640",
- "collapse-all": "0xfaa5",
- "collapse-all-outline": "0xfaa6",
- "color-helper": "0xf179",
- "comma": "0xfe74",
- "comma-box": "0xfe75",
- "comma-box-outline": "0xfe76",
- "comma-circle": "0xfe77",
- "comma-circle-outline": "0xfe78",
- "comment": "0xf17a",
- "comment-account": "0xf17b",
- "comment-account-outline": "0xf17c",
- "comment-alert": "0xf17d",
- "comment-alert-outline": "0xf17e",
- "comment-arrow-left": "0xf9e0",
- "comment-arrow-left-outline": "0xf9e1",
- "comment-arrow-right": "0xf9e2",
- "comment-arrow-right-outline": "0xf9e3",
- "comment-check": "0xf17f",
- "comment-check-outline": "0xf180",
- "comment-eye": "0xfa39",
- "comment-eye-outline": "0xfa3a",
- "comment-multiple": "0xf85e",
- "comment-multiple-outline": "0xf181",
- "comment-outline": "0xf182",
- "comment-plus": "0xf9e4",
- "comment-plus-outline": "0xf183",
- "comment-processing": "0xf184",
- "comment-processing-outline": "0xf185",
- "comment-question": "0xf816",
- "comment-question-outline": "0xf186",
- "comment-remove": "0xf5de",
- "comment-remove-outline": "0xf187",
- "comment-search": "0xfa3b",
- "comment-search-outline": "0xfa3c",
- "comment-text": "0xf188",
- "comment-text-multiple": "0xf85f",
- "comment-text-multiple-outline": "0xf860",
- "comment-text-outline": "0xf189",
- "compare": "0xf18a",
- "compass": "0xf18b",
- "compass-off": "0xfb5c",
- "compass-off-outline": "0xfb5d",
- "compass-outline": "0xf18c",
- "console": "0xf18d",
- "console-line": "0xf7b6",
- "console-network": "0xf8a8",
- "console-network-outline": "0xfc3c",
- "contact-mail": "0xf18e",
- "contactless-payment": "0xfd46",
- "contacts": "0xf6ca",
- "contain": "0xfa3d",
- "contain-end": "0xfa3e",
- "contain-start": "0xfa3f",
- "content-copy": "0xf18f",
- "content-cut": "0xf190",
- "content-duplicate": "0xf191",
- "content-paste": "0xf192",
- "content-save": "0xf193",
- "content-save-all": "0xf194",
- "content-save-edit": "0xfcd7",
- "content-save-edit-outline": "0xfcd8",
- "content-save-move": "0xfe79",
- "content-save-move-outline": "0xfe7a",
- "content-save-outline": "0xf817",
- "content-save-settings": "0xf61b",
- "content-save-settings-outline": "0xfb13",
- "contrast": "0xf195",
- "contrast-box": "0xf196",
- "contrast-circle": "0xf197",
- "controller-classic": "0xfb5e",
- "controller-classic-outline": "0xfb5f",
- "cookie": "0xf198",
- "copyright": "0xf5e6",
- "cordova": "0xf957",
- "corn": "0xf7b7",
- "counter": "0xf199",
- "cow": "0xf19a",
- "crane": "0xf861",
- "creation": "0xf1c9",
- "creative-commons": "0xfd47",
- "credit-card": "0xf19b",
- "credit-card-marker": "0xfd9a",
- "credit-card-multiple": "0xf19c",
- "credit-card-off": "0xf5e4",
- "credit-card-plus": "0xf675",
- "credit-card-refund": "0xfaa7",
- "credit-card-scan": "0xf19d",
- "credit-card-settings": "0xf8d6",
- "credit-card-wireless": "0xfd48",
- "cricket": "0xfd49",
- "crop": "0xf19e",
- "crop-free": "0xf19f",
- "crop-landscape": "0xf1a0",
- "crop-portrait": "0xf1a1",
- "crop-rotate": "0xf695",
- "crop-square": "0xf1a2",
- "crosshairs": "0xf1a3",
- "crosshairs-gps": "0xf1a4",
- "crown": "0xf1a5",
- "cryengine": "0xf958",
- "crystal-ball": "0xfb14",
- "cube": "0xf1a6",
- "cube-outline": "0xf1a7",
- "cube-scan": "0xfb60",
- "cube-send": "0xf1a8",
- "cube-unfolded": "0xf1a9",
- "cup": "0xf1aa",
- "cup-off": "0xf5e5",
- "cup-water": "0xf1ab",
- "cupcake": "0xf959",
- "curling": "0xf862",
- "currency-bdt": "0xf863",
- "currency-brl": "0xfb61",
- "currency-btc": "0xf1ac",
- "currency-chf": "0xf7b8",
- "currency-cny": "0xf7b9",
- "currency-eth": "0xf7ba",
- "currency-eur": "0xf1ad",
- "currency-gbp": "0xf1ae",
- "currency-ils": "0xfc3d",
- "currency-inr": "0xf1af",
- "currency-jpy": "0xf7bb",
- "currency-krw": "0xf7bc",
- "currency-kzt": "0xf864",
- "currency-ngn": "0xf1b0",
- "currency-php": "0xf9e5",
- "currency-rub": "0xf1b1",
- "currency-sign": "0xf7bd",
- "currency-try": "0xf1b2",
- "currency-twd": "0xf7be",
- "currency-usd": "0xf1b3",
- "currency-usd-off": "0xf679",
- "current-ac": "0xf95a",
- "current-dc": "0xf95b",
- "cursor-default": "0xf1b4",
- "cursor-default-click": "0xfcd9",
- "cursor-default-click-outline": "0xfcda",
- "cursor-default-outline": "0xf1b5",
- "cursor-move": "0xf1b6",
- "cursor-pointer": "0xf1b7",
- "cursor-text": "0xf5e7",
- "database": "0xf1b8",
- "database-check": "0xfaa8",
- "database-edit": "0xfb62",
- "database-export": "0xf95d",
- "database-import": "0xf95c",
- "database-lock": "0xfaa9",
- "database-minus": "0xf1b9",
- "database-plus": "0xf1ba",
- "database-refresh": "0xfcdb",
- "database-remove": "0xfcdc",
- "database-search": "0xf865",
- "database-settings": "0xfcdd",
- "death-star": "0xf8d7",
- "death-star-variant": "0xf8d8",
- "deathly-hallows": "0xfb63",
- "debian": "0xf8d9",
- "debug-step-into": "0xf1bb",
- "debug-step-out": "0xf1bc",
- "debug-step-over": "0xf1bd",
- "decagram": "0xf76b",
- "decagram-outline": "0xf76c",
- "decimal-decrease": "0xf1be",
- "decimal-increase": "0xf1bf",
- "delete": "0xf1c0",
- "delete-circle": "0xf682",
- "delete-circle-outline": "0xfb64",
- "delete-empty": "0xf6cb",
- "delete-forever": "0xf5e8",
- "delete-forever-outline": "0xfb65",
- "delete-outline": "0xf9e6",
- "delete-restore": "0xf818",
- "delete-sweep": "0xf5e9",
- "delete-sweep-outline": "0xfc3e",
- "delete-variant": "0xf1c1",
- "delta": "0xf1c2",
- "desk-lamp": "0xf95e",
- "deskphone": "0xf1c3",
- "desktop-classic": "0xf7bf",
- "desktop-mac": "0xf1c4",
- "desktop-mac-dashboard": "0xf9e7",
- "desktop-tower": "0xf1c5",
- "desktop-tower-monitor": "0xfaaa",
- "details": "0xf1c6",
- "dev-to": "0xfd4a",
- "developer-board": "0xf696",
- "deviantart": "0xf1c7",
- "dialpad": "0xf61c",
- "diameter": "0xfc3f",
- "diameter-outline": "0xfc40",
- "diameter-variant": "0xfc41",
- "diamond": "0xfb66",
- "diamond-outline": "0xfb67",
- "diamond-stone": "0xf1c8",
- "dice-1": "0xf1ca",
- "dice-2": "0xf1cb",
- "dice-3": "0xf1cc",
- "dice-4": "0xf1cd",
- "dice-5": "0xf1ce",
- "dice-6": "0xf1cf",
- "dice-d10": "0xf76e",
- "dice-d12": "0xf866",
- "dice-d20": "0xf5ea",
- "dice-d4": "0xf5eb",
- "dice-d6": "0xf5ec",
- "dice-d8": "0xf5ed",
- "dice-multiple": "0xf76d",
- "dictionary": "0xf61d",
- "dip-switch": "0xf7c0",
- "directions": "0xf1d0",
- "directions-fork": "0xf641",
- "disc": "0xf5ee",
- "disc-alert": "0xf1d1",
- "disc-player": "0xf95f",
- "discord": "0xf66f",
- "dishwasher": "0xfaab",
- "disqus": "0xf1d2",
- "disqus-outline": "0xf1d3",
- "diving-flippers": "0xfd9b",
- "diving-helmet": "0xfd9c",
- "diving-scuba": "0xfd9d",
- "diving-scuba-flag": "0xfd9e",
- "diving-scuba-tank": "0xfd9f",
- "diving-scuba-tank-multiple": "0xfda0",
- "diving-snorkel": "0xfda1",
- "division": "0xf1d4",
- "division-box": "0xf1d5",
- "dlna": "0xfa40",
- "dna": "0xf683",
- "dns": "0xf1d6",
- "dns-outline": "0xfb68",
- "do-not-disturb": "0xf697",
- "do-not-disturb-off": "0xf698",
- "docker": "0xf867",
- "doctor": "0xfa41",
- "dog": "0xfa42",
- "dog-service": "0xfaac",
- "dog-side": "0xfa43",
- "dolby": "0xf6b2",
- "domain": "0xf1d7",
- "domain-off": "0xfd4b",
- "donkey": "0xf7c1",
- "door": "0xf819",
- "door-closed": "0xf81a",
- "door-open": "0xf81b",
- "doorbell-video": "0xf868",
- "dot-net": "0xfaad",
- "dots-horizontal": "0xf1d8",
- "dots-horizontal-circle": "0xf7c2",
- "dots-horizontal-circle-outline": "0xfb69",
- "dots-vertical": "0xf1d9",
- "dots-vertical-circle": "0xf7c3",
- "dots-vertical-circle-outline": "0xfb6a",
- "douban": "0xf699",
- "download": "0xf1da",
- "download-multiple": "0xf9e8",
- "download-network": "0xf6f3",
- "download-network-outline": "0xfc42",
- "download-outline": "0xfb6b",
- "drag": "0xf1db",
- "drag-horizontal": "0xf1dc",
- "drag-variant": "0xfb6c",
- "drag-vertical": "0xf1dd",
- "drama-masks": "0xfcde",
- "drawing": "0xf1de",
- "drawing-box": "0xf1df",
- "dribbble": "0xf1e0",
- "dribbble-box": "0xf1e1",
- "drone": "0xf1e2",
- "dropbox": "0xf1e3",
- "drupal": "0xf1e4",
- "duck": "0xf1e5",
- "dumbbell": "0xf1e6",
- "dump-truck": "0xfc43",
- "ear-hearing": "0xf7c4",
- "ear-hearing-off": "0xfa44",
- "earth": "0xf1e7",
- "earth-box": "0xf6cc",
- "earth-box-off": "0xf6cd",
- "earth-off": "0xf1e8",
- "edge": "0xf1e9",
- "egg": "0xfaae",
- "egg-easter": "0xfaaf",
- "eight-track": "0xf9e9",
- "eject": "0xf1ea",
- "eject-outline": "0xfb6d",
- "elephant": "0xf7c5",
- "elevation-decline": "0xf1eb",
- "elevation-rise": "0xf1ec",
- "elevator": "0xf1ed",
- "email": "0xf1ee",
- "email-alert": "0xf6ce",
- "email-box": "0xfcdf",
- "email-check": "0xfab0",
- "email-check-outline": "0xfab1",
- "email-lock": "0xf1f1",
- "email-mark-as-unread": "0xfb6e",
- "email-open": "0xf1ef",
- "email-open-outline": "0xf5ef",
- "email-outline": "0xf1f0",
- "email-plus": "0xf9ea",
- "email-plus-outline": "0xf9eb",
- "email-search": "0xf960",
- "email-search-outline": "0xf961",
- "email-variant": "0xf5f0",
- "ember": "0xfb15",
- "emby": "0xf6b3",
- "emoticon": "0xfc44",
- "emoticon-angry": "0xfc45",
- "emoticon-angry-outline": "0xfc46",
- "emoticon-cool": "0xfc47",
- "emoticon-cool-outline": "0xf1f3",
- "emoticon-cry": "0xfc48",
- "emoticon-cry-outline": "0xfc49",
- "emoticon-dead": "0xfc4a",
- "emoticon-dead-outline": "0xf69a",
- "emoticon-devil": "0xfc4b",
- "emoticon-devil-outline": "0xf1f4",
- "emoticon-excited": "0xfc4c",
- "emoticon-excited-outline": "0xf69b",
- "emoticon-happy": "0xfc4d",
- "emoticon-happy-outline": "0xf1f5",
- "emoticon-kiss": "0xfc4e",
- "emoticon-kiss-outline": "0xfc4f",
- "emoticon-neutral": "0xfc50",
- "emoticon-neutral-outline": "0xf1f6",
- "emoticon-outline": "0xf1f2",
- "emoticon-poop": "0xf1f7",
- "emoticon-poop-outline": "0xfc51",
- "emoticon-sad": "0xfc52",
- "emoticon-sad-outline": "0xf1f8",
- "emoticon-tongue": "0xf1f9",
- "emoticon-tongue-outline": "0xfc53",
- "emoticon-wink": "0xfc54",
- "emoticon-wink-outline": "0xfc55",
- "engine": "0xf1fa",
- "engine-off": "0xfa45",
- "engine-off-outline": "0xfa46",
- "engine-outline": "0xf1fb",
- "equal": "0xf1fc",
- "equal-box": "0xf1fd",
- "eraser": "0xf1fe",
- "eraser-variant": "0xf642",
- "escalator": "0xf1ff",
- "eslint": "0xfc56",
- "et": "0xfab2",
- "ethereum": "0xf869",
- "ethernet": "0xf200",
- "ethernet-cable": "0xf201",
- "ethernet-cable-off": "0xf202",
- "etsy": "0xf203",
- "ev-station": "0xf5f1",
- "eventbrite": "0xf7c6",
- "evernote": "0xf204",
- "exclamation": "0xf205",
- "exit-run": "0xfa47",
- "exit-to-app": "0xf206",
- "expand-all": "0xfab3",
- "expand-all-outline": "0xfab4",
- "exponent": "0xf962",
- "exponent-box": "0xf963",
- "export": "0xf207",
- "export-variant": "0xfb6f",
- "eye": "0xf208",
- "eye-check": "0xfce0",
- "eye-check-outline": "0xfce1",
- "eye-circle": "0xfb70",
- "eye-circle-outline": "0xfb71",
- "eye-off": "0xf209",
- "eye-off-outline": "0xf6d0",
- "eye-outline": "0xf6cf",
- "eye-plus": "0xf86a",
- "eye-plus-outline": "0xf86b",
- "eye-settings": "0xf86c",
- "eye-settings-outline": "0xf86d",
- "eyedropper": "0xf20a",
- "eyedropper-variant": "0xf20b",
- "face": "0xf643",
- "face-agent": "0xfd4c",
- "face-outline": "0xfb72",
- "face-profile": "0xf644",
- "face-recognition": "0xfc57",
- "facebook": "0xf20c",
- "facebook-box": "0xf20d",
- "facebook-messenger": "0xf20e",
- "facebook-workplace": "0xfb16",
- "factory": "0xf20f",
- "fan": "0xf210",
- "fan-off": "0xf81c",
- "fast-forward": "0xf211",
- "fast-forward-10": "0xfd4d",
- "fast-forward-30": "0xfce2",
- "fast-forward-outline": "0xf6d1",
- "fax": "0xf212",
- "feather": "0xf6d2",
- "feature-search": "0xfa48",
- "feature-search-outline": "0xfa49",
- "fedora": "0xf8da",
- "ferry": "0xf213",
- "file": "0xf214",
- "file-account": "0xf73a",
- "file-alert": "0xfa4a",
- "file-alert-outline": "0xfa4b",
- "file-cabinet": "0xfab5",
- "file-cancel": "0xfda2",
- "file-cancel-outline": "0xfda3",
- "file-chart": "0xf215",
- "file-check": "0xf216",
- "file-check-outline": "0xfe7b",
- "file-cloud": "0xf217",
- "file-compare": "0xf8a9",
- "file-delimited": "0xf218",
- "file-document": "0xf219",
- "file-document-box": "0xf21a",
- "file-document-box-multiple": "0xfab6",
- "file-document-box-multiple-outline": "0xfab7",
- "file-document-box-outline": "0xf9ec",
- "file-document-edit": "0xfda4",
- "file-document-edit-outline": "0xfda5",
- "file-document-outline": "0xf9ed",
- "file-download": "0xf964",
- "file-download-outline": "0xf965",
- "file-excel": "0xf21b",
- "file-excel-box": "0xf21c",
- "file-export": "0xf21d",
- "file-eye": "0xfda6",
- "file-eye-outline": "0xfda7",
- "file-find": "0xf21e",
- "file-find-outline": "0xfb73",
- "file-hidden": "0xf613",
- "file-image": "0xf21f",
- "file-import": "0xf220",
- "file-lock": "0xf221",
- "file-move": "0xfab8",
- "file-multiple": "0xf222",
- "file-music": "0xf223",
- "file-music-outline": "0xfe7c",
- "file-outline": "0xf224",
- "file-pdf": "0xf225",
- "file-pdf-box": "0xf226",
- "file-pdf-outline": "0xfe7d",
- "file-percent": "0xf81d",
- "file-plus": "0xf751",
- "file-powerpoint": "0xf227",
- "file-powerpoint-box": "0xf228",
- "file-presentation-box": "0xf229",
- "file-question": "0xf86e",
- "file-remove": "0xfb74",
- "file-replace": "0xfb17",
- "file-replace-outline": "0xfb18",
- "file-restore": "0xf670",
- "file-search": "0xfc58",
- "file-search-outline": "0xfc59",
- "file-send": "0xf22a",
- "file-table": "0xfc5a",
- "file-table-outline": "0xfc5b",
- "file-tree": "0xf645",
- "file-undo": "0xf8db",
- "file-upload": "0xfa4c",
- "file-upload-outline": "0xfa4d",
- "file-video": "0xf22b",
- "file-video-outline": "0xfe10",
- "file-word": "0xf22c",
- "file-word-box": "0xf22d",
- "file-xml": "0xf22e",
- "film": "0xf22f",
- "filmstrip": "0xf230",
- "filmstrip-off": "0xf231",
- "filter": "0xf232",
- "filter-outline": "0xf233",
- "filter-remove": "0xf234",
- "filter-remove-outline": "0xf235",
- "filter-variant": "0xf236",
- "finance": "0xf81e",
- "find-replace": "0xf6d3",
- "fingerprint": "0xf237",
- "fire": "0xf238",
- "fire-truck": "0xf8aa",
- "firebase": "0xf966",
- "firefox": "0xf239",
- "fireplace": "0xfe11",
- "fireplace-off": "0xfe12",
- "firework": "0xfe13",
- "fish": "0xf23a",
- "flag": "0xf23b",
- "flag-checkered": "0xf23c",
- "flag-minus": "0xfb75",
- "flag-outline": "0xf23d",
- "flag-plus": "0xfb76",
- "flag-remove": "0xfb77",
- "flag-triangle": "0xf23f",
- "flag-variant": "0xf240",
- "flag-variant-outline": "0xf23e",
- "flare": "0xfd4e",
- "flash": "0xf241",
- "flash-auto": "0xf242",
- "flash-circle": "0xf81f",
- "flash-off": "0xf243",
- "flash-outline": "0xf6d4",
- "flash-red-eye": "0xf67a",
- "flashlight": "0xf244",
- "flashlight-off": "0xf245",
- "flask": "0xf093",
- "flask-empty": "0xf094",
- "flask-empty-outline": "0xf095",
- "flask-outline": "0xf096",
- "flattr": "0xf246",
- "flickr": "0xfce3",
- "flip-to-back": "0xf247",
- "flip-to-front": "0xf248",
- "floor-lamp": "0xf8dc",
- "floor-plan": "0xf820",
- "floppy": "0xf249",
- "floppy-variant": "0xf9ee",
- "flower": "0xf24a",
- "flower-outline": "0xf9ef",
- "flower-poppy": "0xfce4",
- "flower-tulip": "0xf9f0",
- "flower-tulip-outline": "0xf9f1",
- "folder": "0xf24b",
- "folder-account": "0xf24c",
- "folder-account-outline": "0xfb78",
- "folder-alert": "0xfda8",
- "folder-alert-outline": "0xfda9",
- "folder-clock": "0xfab9",
- "folder-clock-outline": "0xfaba",
- "folder-download": "0xf24d",
- "folder-edit": "0xf8dd",
- "folder-edit-outline": "0xfdaa",
- "folder-google-drive": "0xf24e",
- "folder-image": "0xf24f",
- "folder-key": "0xf8ab",
- "folder-key-network": "0xf8ac",
- "folder-key-network-outline": "0xfc5c",
- "folder-lock": "0xf250",
- "folder-lock-open": "0xf251",
- "folder-move": "0xf252",
- "folder-multiple": "0xf253",
- "folder-multiple-image": "0xf254",
- "folder-multiple-outline": "0xf255",
- "folder-network": "0xf86f",
- "folder-network-outline": "0xfc5d",
- "folder-open": "0xf76f",
- "folder-open-outline": "0xfdab",
- "folder-outline": "0xf256",
- "folder-plus": "0xf257",
- "folder-plus-outline": "0xfb79",
- "folder-pound": "0xfce5",
- "folder-pound-outline": "0xfce6",
- "folder-remove": "0xf258",
- "folder-remove-outline": "0xfb7a",
- "folder-search": "0xf967",
- "folder-search-outline": "0xf968",
- "folder-star": "0xf69c",
- "folder-star-outline": "0xfb7b",
- "folder-sync": "0xfce7",
- "folder-sync-outline": "0xfce8",
- "folder-text": "0xfc5e",
- "folder-text-outline": "0xfc5f",
- "folder-upload": "0xf259",
- "font-awesome": "0xf03a",
- "food": "0xf25a",
- "food-apple": "0xf25b",
- "food-apple-outline": "0xfc60",
- "food-croissant": "0xf7c7",
- "food-fork-drink": "0xf5f2",
- "food-off": "0xf5f3",
- "food-variant": "0xf25c",
- "football": "0xf25d",
- "football-australian": "0xf25e",
- "football-helmet": "0xf25f",
- "forklift": "0xf7c8",
- "format-align-bottom": "0xf752",
- "format-align-center": "0xf260",
- "format-align-justify": "0xf261",
- "format-align-left": "0xf262",
- "format-align-middle": "0xf753",
- "format-align-right": "0xf263",
- "format-align-top": "0xf754",
- "format-annotation-minus": "0xfabb",
- "format-annotation-plus": "0xf646",
- "format-bold": "0xf264",
- "format-clear": "0xf265",
- "format-color-fill": "0xf266",
- "format-color-highlight": "0xfe14",
- "format-color-text": "0xf69d",
- "format-columns": "0xf8de",
- "format-float-center": "0xf267",
- "format-float-left": "0xf268",
- "format-float-none": "0xf269",
- "format-float-right": "0xf26a",
- "format-font": "0xf6d5",
- "format-font-size-decrease": "0xf9f2",
- "format-font-size-increase": "0xf9f3",
- "format-header-1": "0xf26b",
- "format-header-2": "0xf26c",
- "format-header-3": "0xf26d",
- "format-header-4": "0xf26e",
- "format-header-5": "0xf26f",
- "format-header-6": "0xf270",
- "format-header-decrease": "0xf271",
- "format-header-equal": "0xf272",
- "format-header-increase": "0xf273",
- "format-header-pound": "0xf274",
- "format-horizontal-align-center": "0xf61e",
- "format-horizontal-align-left": "0xf61f",
- "format-horizontal-align-right": "0xf620",
- "format-indent-decrease": "0xf275",
- "format-indent-increase": "0xf276",
- "format-italic": "0xf277",
- "format-letter-case": "0xfb19",
- "format-letter-case-lower": "0xfb1a",
- "format-letter-case-upper": "0xfb1b",
- "format-line-spacing": "0xf278",
- "format-line-style": "0xf5c8",
- "format-line-weight": "0xf5c9",
- "format-list-bulleted": "0xf279",
- "format-list-bulleted-square": "0xfdac",
- "format-list-bulleted-type": "0xf27a",
- "format-list-checkbox": "0xf969",
- "format-list-checks": "0xf755",
- "format-list-numbered": "0xf27b",
- "format-list-numbered-rtl": "0xfce9",
- "format-page-break": "0xf6d6",
- "format-paint": "0xf27c",
- "format-paragraph": "0xf27d",
- "format-pilcrow": "0xf6d7",
- "format-quote-close": "0xf27e",
- "format-quote-open": "0xf756",
- "format-rotate-90": "0xf6a9",
- "format-section": "0xf69e",
- "format-size": "0xf27f",
- "format-strikethrough": "0xf280",
- "format-strikethrough-variant": "0xf281",
- "format-subscript": "0xf282",
- "format-superscript": "0xf283",
- "format-text": "0xf284",
- "format-text-rotation-down": "0xfd4f",
- "format-text-rotation-none": "0xfd50",
- "format-text-variant": "0xfe15",
- "format-text-wrapping-clip": "0xfcea",
- "format-text-wrapping-overflow": "0xfceb",
- "format-text-wrapping-wrap": "0xfcec",
- "format-textbox": "0xfced",
- "format-textdirection-l-to-r": "0xf285",
- "format-textdirection-r-to-l": "0xf286",
- "format-title": "0xf5f4",
- "format-underline": "0xf287",
- "format-vertical-align-bottom": "0xf621",
- "format-vertical-align-center": "0xf622",
- "format-vertical-align-top": "0xf623",
- "format-wrap-inline": "0xf288",
- "format-wrap-square": "0xf289",
- "format-wrap-tight": "0xf28a",
- "format-wrap-top-bottom": "0xf28b",
- "forum": "0xf28c",
- "forum-outline": "0xf821",
- "forward": "0xf28d",
- "forwardburger": "0xfd51",
- "fountain": "0xf96a",
- "fountain-pen": "0xfcee",
- "fountain-pen-tip": "0xfcef",
- "foursquare": "0xf28e",
- "freebsd": "0xf8df",
- "fridge": "0xf290",
- "fridge-bottom": "0xf292",
- "fridge-outline": "0xf28f",
- "fridge-top": "0xf291",
- "fuel": "0xf7c9",
- "fullscreen": "0xf293",
- "fullscreen-exit": "0xf294",
- "function": "0xf295",
- "function-variant": "0xf870",
- "fuse": "0xfc61",
- "fuse-blade": "0xfc62",
- "gamepad": "0xf296",
- "gamepad-circle": "0xfe16",
- "gamepad-circle-down": "0xfe17",
- "gamepad-circle-left": "0xfe18",
- "gamepad-circle-outline": "0xfe19",
- "gamepad-circle-right": "0xfe1a",
- "gamepad-circle-up": "0xfe1b",
- "gamepad-down": "0xfe1c",
- "gamepad-left": "0xfe1d",
- "gamepad-right": "0xfe1e",
- "gamepad-round": "0xfe1f",
- "gamepad-round-down": "0xfe20",
- "gamepad-round-left": "0xfe21",
- "gamepad-round-outline": "0xfe22",
- "gamepad-round-right": "0xfe23",
- "gamepad-round-up": "0xfe24",
- "gamepad-up": "0xfe25",
- "gamepad-variant": "0xf297",
- "gantry-crane": "0xfdad",
- "garage": "0xf6d8",
- "garage-alert": "0xf871",
- "garage-open": "0xf6d9",
- "gas-cylinder": "0xf647",
- "gas-station": "0xf298",
- "gate": "0xf299",
- "gate-and": "0xf8e0",
- "gate-nand": "0xf8e1",
- "gate-nor": "0xf8e2",
- "gate-not": "0xf8e3",
- "gate-or": "0xf8e4",
- "gate-xnor": "0xf8e5",
- "gate-xor": "0xf8e6",
- "gatsby": "0xfe26",
- "gauge": "0xf29a",
- "gauge-empty": "0xf872",
- "gauge-full": "0xf873",
- "gauge-low": "0xf874",
- "gavel": "0xf29b",
- "gender-female": "0xf29c",
- "gender-male": "0xf29d",
- "gender-male-female": "0xf29e",
- "gender-transgender": "0xf29f",
- "gentoo": "0xf8e7",
- "gesture": "0xf7ca",
- "gesture-double-tap": "0xf73b",
- "gesture-pinch": "0xfabc",
- "gesture-spread": "0xfabd",
- "gesture-swipe": "0xfd52",
- "gesture-swipe-down": "0xf73c",
- "gesture-swipe-horizontal": "0xfabe",
- "gesture-swipe-left": "0xf73d",
- "gesture-swipe-right": "0xf73e",
- "gesture-swipe-up": "0xf73f",
- "gesture-swipe-vertical": "0xfabf",
- "gesture-tap": "0xf740",
- "gesture-tap-hold": "0xfd53",
- "gesture-two-double-tap": "0xf741",
- "gesture-two-tap": "0xf742",
- "ghost": "0xf2a0",
- "ghost-off": "0xf9f4",
- "gif": "0xfd54",
- "gift": "0xfe27",
- "gift-outline": "0xf2a1",
- "git": "0xf2a2",
- "github-box": "0xf2a3",
- "github-circle": "0xf2a4",
- "github-face": "0xf6da",
- "gitlab": "0xfb7c",
- "glass-cocktail": "0xf356",
- "glass-flute": "0xf2a5",
- "glass-mug": "0xf2a6",
- "glass-stange": "0xf2a7",
- "glass-tulip": "0xf2a8",
- "glass-wine": "0xf875",
- "glassdoor": "0xf2a9",
- "glasses": "0xf2aa",
- "globe-model": "0xf8e8",
- "gmail": "0xf2ab",
- "gnome": "0xf2ac",
- "go-kart": "0xfd55",
- "go-kart-track": "0xfd56",
- "gog": "0xfb7d",
- "golf": "0xf822",
- "gondola": "0xf685",
- "goodreads": "0xfd57",
- "google": "0xf2ad",
- "google-adwords": "0xfc63",
- "google-allo": "0xf801",
- "google-analytics": "0xf7cb",
- "google-assistant": "0xf7cc",
- "google-cardboard": "0xf2ae",
- "google-chrome": "0xf2af",
- "google-circles": "0xf2b0",
- "google-circles-communities": "0xf2b1",
- "google-circles-extended": "0xf2b2",
- "google-circles-group": "0xf2b3",
- "google-classroom": "0xf2c0",
- "google-controller": "0xf2b4",
- "google-controller-off": "0xf2b5",
- "google-drive": "0xf2b6",
- "google-earth": "0xf2b7",
- "google-fit": "0xf96b",
- "google-glass": "0xf2b8",
- "google-hangouts": "0xf2c9",
- "google-home": "0xf823",
- "google-keep": "0xf6db",
- "google-lens": "0xf9f5",
- "google-maps": "0xf5f5",
- "google-nearby": "0xf2b9",
- "google-pages": "0xf2ba",
- "google-photos": "0xf6dc",
- "google-physical-web": "0xf2bb",
- "google-play": "0xf2bc",
- "google-plus": "0xf2bd",
- "google-plus-box": "0xf2be",
- "google-spreadsheet": "0xf9f6",
- "google-street-view": "0xfc64",
- "google-translate": "0xf2bf",
- "gpu": "0xf8ad",
- "gradient": "0xf69f",
- "grain": "0xfd58",
- "graphql": "0xf876",
- "grave-stone": "0xfb7e",
- "grease-pencil": "0xf648",
- "greater-than": "0xf96c",
- "greater-than-or-equal": "0xf96d",
- "grid": "0xf2c1",
- "grid-large": "0xf757",
- "grid-off": "0xf2c2",
- "grill": "0xfe28",
- "group": "0xf2c3",
- "guitar-acoustic": "0xf770",
- "guitar-electric": "0xf2c4",
- "guitar-pick": "0xf2c5",
- "guitar-pick-outline": "0xf2c6",
- "guy-fawkes-mask": "0xf824",
- "hackernews": "0xf624",
- "hail": "0xfac0",
- "halloween": "0xfb7f",
- "hamburger": "0xf684",
- "hammer": "0xf8e9",
- "hand": "0xfa4e",
- "hand-left": "0xfe29",
- "hand-okay": "0xfa4f",
- "hand-peace": "0xfa50",
- "hand-peace-variant": "0xfa51",
- "hand-pointing-down": "0xfa52",
- "hand-pointing-left": "0xfa53",
- "hand-pointing-right": "0xf2c7",
- "hand-pointing-up": "0xfa54",
- "hand-right": "0xfe2a",
- "hand-saw": "0xfe2b",
- "hanger": "0xf2c8",
- "hard-hat": "0xf96e",
- "harddisk": "0xf2ca",
- "hat-fedora": "0xfb80",
- "hazard-lights": "0xfc65",
- "hdr": "0xfd59",
- "hdr-off": "0xfd5a",
- "headphones": "0xf2cb",
- "headphones-bluetooth": "0xf96f",
- "headphones-box": "0xf2cc",
- "headphones-off": "0xf7cd",
- "headphones-settings": "0xf2cd",
- "headset": "0xf2ce",
- "headset-dock": "0xf2cf",
- "headset-off": "0xf2d0",
- "heart": "0xf2d1",
- "heart-box": "0xf2d2",
- "heart-box-outline": "0xf2d3",
- "heart-broken": "0xf2d4",
- "heart-broken-outline": "0xfcf0",
- "heart-circle": "0xf970",
- "heart-circle-outline": "0xf971",
- "heart-half": "0xf6de",
- "heart-half-full": "0xf6dd",
- "heart-half-outline": "0xf6df",
- "heart-multiple": "0xfa55",
- "heart-multiple-outline": "0xfa56",
- "heart-off": "0xf758",
- "heart-outline": "0xf2d5",
- "heart-pulse": "0xf5f6",
- "helicopter": "0xfac1",
- "help": "0xf2d6",
- "help-box": "0xf78a",
- "help-circle": "0xf2d7",
- "help-circle-outline": "0xf625",
- "help-network": "0xf6f4",
- "help-network-outline": "0xfc66",
- "help-rhombus": "0xfb81",
- "help-rhombus-outline": "0xfb82",
- "hexagon": "0xf2d8",
- "hexagon-multiple": "0xf6e0",
- "hexagon-outline": "0xf2d9",
- "hexagon-slice-1": "0xfac2",
- "hexagon-slice-2": "0xfac3",
- "hexagon-slice-3": "0xfac4",
- "hexagon-slice-4": "0xfac5",
- "hexagon-slice-5": "0xfac6",
- "hexagon-slice-6": "0xfac7",
- "hexagram": "0xfac8",
- "hexagram-outline": "0xfac9",
- "high-definition": "0xf7ce",
- "high-definition-box": "0xf877",
- "highway": "0xf5f7",
- "hiking": "0xfd5b",
- "hinduism": "0xf972",
- "history": "0xf2da",
- "hockey-puck": "0xf878",
- "hockey-sticks": "0xf879",
- "hololens": "0xf2db",
- "home": "0xf2dc",
- "home-account": "0xf825",
- "home-alert": "0xf87a",
- "home-assistant": "0xf7cf",
- "home-automation": "0xf7d0",
- "home-circle": "0xf7d1",
- "home-city": "0xfcf1",
- "home-city-outline": "0xfcf2",
- "home-currency-usd": "0xf8ae",
- "home-floor-0": "0xfdae",
- "home-floor-1": "0xfd5c",
- "home-floor-2": "0xfd5d",
- "home-floor-3": "0xfd5e",
- "home-floor-a": "0xfd5f",
- "home-floor-b": "0xfd60",
- "home-floor-g": "0xfd61",
- "home-floor-l": "0xfd62",
- "home-floor-negative-1": "0xfdaf",
- "home-group": "0xfdb0",
- "home-heart": "0xf826",
- "home-lock": "0xf8ea",
- "home-lock-open": "0xf8eb",
- "home-map-marker": "0xf5f8",
- "home-minus": "0xf973",
- "home-modern": "0xf2dd",
- "home-outline": "0xf6a0",
- "home-plus": "0xf974",
- "home-variant": "0xf2de",
- "home-variant-outline": "0xfb83",
- "hook": "0xf6e1",
- "hook-off": "0xf6e2",
- "hops": "0xf2df",
- "horseshoe": "0xfa57",
- "hospital": "0xf2e0",
- "hospital-building": "0xf2e1",
- "hospital-marker": "0xf2e2",
- "hot-tub": "0xf827",
- "hotel": "0xf2e3",
- "houzz": "0xf2e4",
- "houzz-box": "0xf2e5",
- "hubspot": "0xfcf3",
- "hulu": "0xf828",
- "human": "0xf2e6",
- "human-child": "0xf2e7",
- "human-female": "0xf649",
- "human-female-boy": "0xfa58",
- "human-female-female": "0xfa59",
- "human-female-girl": "0xfa5a",
- "human-greeting": "0xf64a",
- "human-handsdown": "0xf64b",
- "human-handsup": "0xf64c",
- "human-male": "0xf64d",
- "human-male-boy": "0xfa5b",
- "human-male-female": "0xf2e8",
- "human-male-girl": "0xfa5c",
- "human-male-male": "0xfa5d",
- "human-pregnant": "0xf5cf",
- "humble-bundle": "0xf743",
- "ice-cream": "0xf829",
- "iframe": "0xfc67",
- "iframe-outline": "0xfc68",
- "image": "0xf2e9",
- "image-album": "0xf2ea",
- "image-area": "0xf2eb",
- "image-area-close": "0xf2ec",
- "image-broken": "0xf2ed",
- "image-broken-variant": "0xf2ee",
- "image-filter": "0xf2ef",
- "image-filter-black-white": "0xf2f0",
- "image-filter-center-focus": "0xf2f1",
- "image-filter-center-focus-weak": "0xf2f2",
- "image-filter-drama": "0xf2f3",
- "image-filter-frames": "0xf2f4",
- "image-filter-hdr": "0xf2f5",
- "image-filter-none": "0xf2f6",
- "image-filter-tilt-shift": "0xf2f7",
- "image-filter-vintage": "0xf2f8",
- "image-frame": "0xfe2c",
- "image-move": "0xf9f7",
- "image-multiple": "0xf2f9",
- "image-off": "0xf82a",
- "image-outline": "0xf975",
- "image-plus": "0xf87b",
- "image-search": "0xf976",
- "image-search-outline": "0xf977",
- "image-size-select-actual": "0xfc69",
- "image-size-select-large": "0xfc6a",
- "image-size-select-small": "0xfc6b",
- "import": "0xf2fa",
- "inbox": "0xf686",
- "inbox-arrow-down": "0xf2fb",
- "inbox-arrow-up": "0xf3d1",
- "inbox-multiple": "0xf8af",
- "inbox-multiple-outline": "0xfb84",
- "incognito": "0xf5f9",
- "infinity": "0xf6e3",
- "information": "0xf2fc",
- "information-outline": "0xf2fd",
- "information-variant": "0xf64e",
- "instagram": "0xf2fe",
- "instapaper": "0xf2ff",
- "internet-explorer": "0xf300",
- "invert-colors": "0xf301",
- "invert-colors-off": "0xfe2d",
- "ip": "0xfa5e",
- "ip-network": "0xfa5f",
- "ip-network-outline": "0xfc6c",
- "ipod": "0xfc6d",
- "islam": "0xf978",
- "itunes": "0xf676",
- "jabber": "0xfdb1",
- "jeepney": "0xf302",
- "jira": "0xf303",
- "jquery": "0xf87c",
- "jsfiddle": "0xf304",
- "json": "0xf626",
- "judaism": "0xf979",
- "kabaddi": "0xfd63",
- "karate": "0xf82b",
- "keg": "0xf305",
- "kettle": "0xf5fa",
- "key": "0xf306",
- "key-change": "0xf307",
- "key-minus": "0xf308",
- "key-outline": "0xfdb2",
- "key-plus": "0xf309",
- "key-remove": "0xf30a",
- "key-variant": "0xf30b",
- "keyboard": "0xf30c",
- "keyboard-backspace": "0xf30d",
- "keyboard-caps": "0xf30e",
- "keyboard-close": "0xf30f",
- "keyboard-off": "0xf310",
- "keyboard-off-outline": "0xfe2e",
- "keyboard-outline": "0xf97a",
- "keyboard-return": "0xf311",
- "keyboard-settings": "0xf9f8",
- "keyboard-settings-outline": "0xf9f9",
- "keyboard-tab": "0xf312",
- "keyboard-variant": "0xf313",
- "kickstarter": "0xf744",
- "knife": "0xf9fa",
- "knife-military": "0xf9fb",
- "kodi": "0xf314",
- "label": "0xf315",
- "label-off": "0xfaca",
- "label-off-outline": "0xfacb",
- "label-outline": "0xf316",
- "label-variant": "0xfacc",
- "label-variant-outline": "0xfacd",
- "ladybug": "0xf82c",
- "lambda": "0xf627",
- "lamp": "0xf6b4",
- "lan": "0xf317",
- "lan-connect": "0xf318",
- "lan-disconnect": "0xf319",
- "lan-pending": "0xf31a",
- "language-c": "0xf671",
- "language-cpp": "0xf672",
- "language-csharp": "0xf31b",
- "language-css3": "0xf31c",
- "language-go": "0xf7d2",
- "language-haskell": "0xfc6e",
- "language-html5": "0xf31d",
- "language-java": "0xfb1c",
- "language-javascript": "0xf31e",
- "language-lua": "0xf8b0",
- "language-php": "0xf31f",
- "language-python": "0xf320",
- "language-python-text": "0xf321",
- "language-r": "0xf7d3",
- "language-ruby-on-rails": "0xface",
- "language-swift": "0xf6e4",
- "language-typescript": "0xf6e5",
- "laptop": "0xf322",
- "laptop-chromebook": "0xf323",
- "laptop-mac": "0xf324",
- "laptop-off": "0xf6e6",
- "laptop-windows": "0xf325",
- "laravel": "0xfacf",
- "lastfm": "0xf326",
- "lastpass": "0xf446",
- "launch": "0xf327",
- "lava-lamp": "0xf7d4",
- "layers": "0xf328",
- "layers-minus": "0xfe2f",
- "layers-off": "0xf329",
- "layers-off-outline": "0xf9fc",
- "layers-outline": "0xf9fd",
- "layers-plus": "0xfe30",
- "layers-remove": "0xfe31",
- "lead-pencil": "0xf64f",
- "leaf": "0xf32a",
- "leaf-maple": "0xfc6f",
- "leak": "0xfdb3",
- "leak-off": "0xfdb4",
- "led-off": "0xf32b",
- "led-on": "0xf32c",
- "led-outline": "0xf32d",
- "led-strip": "0xf7d5",
- "led-variant-off": "0xf32e",
- "led-variant-on": "0xf32f",
- "led-variant-outline": "0xf330",
- "less-than": "0xf97b",
- "less-than-or-equal": "0xf97c",
- "library": "0xf331",
- "library-books": "0xf332",
- "library-movie": "0xfcf4",
- "library-music": "0xf333",
- "library-plus": "0xf334",
- "library-shelves": "0xfb85",
- "library-video": "0xfcf5",
- "lifebuoy": "0xf87d",
- "light-switch": "0xf97d",
- "lightbulb": "0xf335",
- "lightbulb-off": "0xfe32",
- "lightbulb-off-outline": "0xfe33",
- "lightbulb-on": "0xf6e7",
- "lightbulb-on-outline": "0xf6e8",
- "lightbulb-outline": "0xf336",
- "lighthouse": "0xf9fe",
- "lighthouse-on": "0xf9ff",
- "link": "0xf337",
- "link-box": "0xfcf6",
- "link-box-outline": "0xfcf7",
- "link-box-variant": "0xfcf8",
- "link-box-variant-outline": "0xfcf9",
- "link-off": "0xf338",
- "link-plus": "0xfc70",
- "link-variant": "0xf339",
- "link-variant-off": "0xf33a",
- "linkedin": "0xf33b",
- "linkedin-box": "0xf33c",
- "linux": "0xf33d",
- "linux-mint": "0xf8ec",
- "litecoin": "0xfa60",
- "loading": "0xf771",
- "lock": "0xf33e",
- "lock-alert": "0xf8ed",
- "lock-clock": "0xf97e",
- "lock-open": "0xf33f",
- "lock-open-outline": "0xf340",
- "lock-outline": "0xf341",
- "lock-pattern": "0xf6e9",
- "lock-plus": "0xf5fb",
- "lock-question": "0xf8ee",
- "lock-reset": "0xf772",
- "lock-smart": "0xf8b1",
- "locker": "0xf7d6",
- "locker-multiple": "0xf7d7",
- "login": "0xf342",
- "login-variant": "0xf5fc",
- "logout": "0xf343",
- "logout-variant": "0xf5fd",
- "looks": "0xf344",
- "loop": "0xf6ea",
- "loupe": "0xf345",
- "lumx": "0xf346",
- "lyft": "0xfb1d",
- "magnet": "0xf347",
- "magnet-on": "0xf348",
- "magnify": "0xf349",
- "magnify-close": "0xf97f",
- "magnify-minus": "0xf34a",
- "magnify-minus-cursor": "0xfa61",
- "magnify-minus-outline": "0xf6eb",
- "magnify-plus": "0xf34b",
- "magnify-plus-cursor": "0xfa62",
- "magnify-plus-outline": "0xf6ec",
- "mail-ru": "0xf34c",
- "mailbox": "0xf6ed",
- "mailbox-open": "0xfd64",
- "mailbox-open-outline": "0xfd65",
- "mailbox-open-up": "0xfd66",
- "mailbox-open-up-outline": "0xfd67",
- "mailbox-outline": "0xfd68",
- "mailbox-up": "0xfd69",
- "mailbox-up-outline": "0xfd6a",
- "map": "0xf34d",
- "map-clock": "0xfcfa",
- "map-clock-outline": "0xfcfb",
- "map-legend": "0xfa00",
- "map-marker": "0xf34e",
- "map-marker-check": "0xfc71",
- "map-marker-circle": "0xf34f",
- "map-marker-distance": "0xf8ef",
- "map-marker-minus": "0xf650",
- "map-marker-multiple": "0xf350",
- "map-marker-off": "0xf351",
- "map-marker-outline": "0xf7d8",
- "map-marker-path": "0xfcfc",
- "map-marker-plus": "0xf651",
- "map-marker-radius": "0xf352",
- "map-minus": "0xf980",
- "map-outline": "0xf981",
- "map-plus": "0xf982",
- "map-search": "0xf983",
- "map-search-outline": "0xf984",
- "mapbox": "0xfb86",
- "margin": "0xf353",
- "markdown": "0xf354",
- "marker": "0xf652",
- "marker-cancel": "0xfdb5",
- "marker-check": "0xf355",
- "mastodon": "0xfad0",
- "mastodon-variant": "0xfad1",
- "material-design": "0xf985",
- "material-ui": "0xf357",
- "math-compass": "0xf358",
- "math-cos": "0xfc72",
- "math-sin": "0xfc73",
- "math-tan": "0xfc74",
- "matrix": "0xf628",
- "maxcdn": "0xf359",
- "medal": "0xf986",
- "medical-bag": "0xf6ee",
- "medium": "0xf35a",
- "meetup": "0xfad2",
- "memory": "0xf35b",
- "menu": "0xf35c",
- "menu-down": "0xf35d",
- "menu-down-outline": "0xf6b5",
- "menu-left": "0xf35e",
- "menu-left-outline": "0xfa01",
- "menu-open": "0xfb87",
- "menu-right": "0xf35f",
- "menu-right-outline": "0xfa02",
- "menu-swap": "0xfa63",
- "menu-swap-outline": "0xfa64",
- "menu-up": "0xf360",
- "menu-up-outline": "0xf6b6",
- "message": "0xf361",
- "message-alert": "0xf362",
- "message-alert-outline": "0xfa03",
- "message-bulleted": "0xf6a1",
- "message-bulleted-off": "0xf6a2",
- "message-draw": "0xf363",
- "message-image": "0xf364",
- "message-outline": "0xf365",
- "message-plus": "0xf653",
- "message-processing": "0xf366",
- "message-reply": "0xf367",
- "message-reply-text": "0xf368",
- "message-settings": "0xf6ef",
- "message-settings-variant": "0xf6f0",
- "message-text": "0xf369",
- "message-text-outline": "0xf36a",
- "message-video": "0xf36b",
- "meteor": "0xf629",
- "metronome": "0xf7d9",
- "metronome-tick": "0xf7da",
- "micro-sd": "0xf7db",
- "microphone": "0xf36c",
- "microphone-minus": "0xf8b2",
- "microphone-off": "0xf36d",
- "microphone-outline": "0xf36e",
- "microphone-plus": "0xf8b3",
- "microphone-settings": "0xf36f",
- "microphone-variant": "0xf370",
- "microphone-variant-off": "0xf371",
- "microscope": "0xf654",
- "microsoft": "0xf372",
- "microsoft-dynamics": "0xf987",
- "microwave": "0xfc75",
- "midi": "0xf8f0",
- "midi-port": "0xf8f1",
- "mine": "0xfdb6",
- "minecraft": "0xf373",
- "mini-sd": "0xfa04",
- "minidisc": "0xfa05",
- "minus": "0xf374",
- "minus-box": "0xf375",
- "minus-box-outline": "0xf6f1",
- "minus-circle": "0xf376",
- "minus-circle-outline": "0xf377",
- "minus-network": "0xf378",
- "minus-network-outline": "0xfc76",
- "mixcloud": "0xf62a",
- "mixed-martial-arts": "0xfd6b",
- "mixed-reality": "0xf87e",
- "mixer": "0xf7dc",
- "molecule": "0xfb88",
- "monitor": "0xf379",
- "monitor-cellphone": "0xf988",
- "monitor-cellphone-star": "0xf989",
- "monitor-dashboard": "0xfa06",
- "monitor-lock": "0xfdb7",
- "monitor-multiple": "0xf37a",
- "monitor-off": "0xfd6c",
- "monitor-screenshot": "0xfe34",
- "monitor-star": "0xfdb8",
- "more": "0xf37b",
- "mother-nurse": "0xfcfd",
- "motion-sensor": "0xfd6d",
- "motorbike": "0xf37c",
- "mouse": "0xf37d",
- "mouse-bluetooth": "0xf98a",
- "mouse-off": "0xf37e",
- "mouse-variant": "0xf37f",
- "mouse-variant-off": "0xf380",
- "move-resize": "0xf655",
- "move-resize-variant": "0xf656",
- "movie": "0xf381",
- "movie-outline": "0xfdb9",
- "movie-roll": "0xf7dd",
- "muffin": "0xf98b",
- "multiplication": "0xf382",
- "multiplication-box": "0xf383",
- "mushroom": "0xf7de",
- "mushroom-outline": "0xf7df",
- "music": "0xf759",
- "music-box": "0xf384",
- "music-box-outline": "0xf385",
- "music-circle": "0xf386",
- "music-circle-outline": "0xfad3",
- "music-note": "0xf387",
- "music-note-bluetooth": "0xf5fe",
- "music-note-bluetooth-off": "0xf5ff",
- "music-note-eighth": "0xf388",
- "music-note-half": "0xf389",
- "music-note-off": "0xf38a",
- "music-note-plus": "0xfdba",
- "music-note-quarter": "0xf38b",
- "music-note-sixteenth": "0xf38c",
- "music-note-whole": "0xf38d",
- "music-off": "0xf75a",
- "nail": "0xfdbb",
- "nas": "0xf8f2",
- "nativescript": "0xf87f",
- "nature": "0xf38e",
- "nature-people": "0xf38f",
- "navigation": "0xf390",
- "near-me": "0xf5cd",
- "needle": "0xf391",
- "netflix": "0xf745",
- "network": "0xf6f2",
- "network-off": "0xfc77",
- "network-off-outline": "0xfc78",
- "network-outline": "0xfc79",
- "network-strength-1": "0xf8f3",
- "network-strength-1-alert": "0xf8f4",
- "network-strength-2": "0xf8f5",
- "network-strength-2-alert": "0xf8f6",
- "network-strength-3": "0xf8f7",
- "network-strength-3-alert": "0xf8f8",
- "network-strength-4": "0xf8f9",
- "network-strength-4-alert": "0xf8fa",
- "network-strength-off": "0xf8fb",
- "network-strength-off-outline": "0xf8fc",
- "network-strength-outline": "0xf8fd",
- "new-box": "0xf394",
- "newspaper": "0xf395",
- "nfc": "0xf396",
- "nfc-off": "0xfe35",
- "nfc-search-variant": "0xfe36",
- "nfc-tap": "0xf397",
- "nfc-variant": "0xf398",
- "nfc-variant-off": "0xfe37",
- "ninja": "0xf773",
- "nintendo-switch": "0xf7e0",
- "nodejs": "0xf399",
- "not-equal": "0xf98c",
- "not-equal-variant": "0xf98d",
- "note": "0xf39a",
- "note-multiple": "0xf6b7",
- "note-multiple-outline": "0xf6b8",
- "note-outline": "0xf39b",
- "note-plus": "0xf39c",
- "note-plus-outline": "0xf39d",
- "note-text": "0xf39e",
- "notebook": "0xf82d",
- "notebook-multiple": "0xfe38",
- "notification-clear-all": "0xf39f",
- "npm": "0xf6f6",
- "npm-variant": "0xf98e",
- "npm-variant-outline": "0xf98f",
- "nuke": "0xf6a3",
- "null": "0xf7e1",
- "numeric": "0xf3a0",
- "numeric-0": "0x30",
- "numeric-0-box": "0xf3a1",
- "numeric-0-box-multiple-outline": "0xf3a2",
- "numeric-0-box-outline": "0xf3a3",
- "numeric-0-circle": "0xfc7a",
- "numeric-0-circle-outline": "0xfc7b",
- "numeric-1": "0x31",
- "numeric-1-box": "0xf3a4",
- "numeric-1-box-multiple-outline": "0xf3a5",
- "numeric-1-box-outline": "0xf3a6",
- "numeric-1-circle": "0xfc7c",
- "numeric-1-circle-outline": "0xfc7d",
- "numeric-2": "0x32",
- "numeric-2-box": "0xf3a7",
- "numeric-2-box-multiple-outline": "0xf3a8",
- "numeric-2-box-outline": "0xf3a9",
- "numeric-2-circle": "0xfc7e",
- "numeric-2-circle-outline": "0xfc7f",
- "numeric-3": "0x33",
- "numeric-3-box": "0xf3aa",
- "numeric-3-box-multiple-outline": "0xf3ab",
- "numeric-3-box-outline": "0xf3ac",
- "numeric-3-circle": "0xfc80",
- "numeric-3-circle-outline": "0xfc81",
- "numeric-4": "0x34",
- "numeric-4-box": "0xf3ad",
- "numeric-4-box-multiple-outline": "0xf3ae",
- "numeric-4-box-outline": "0xf3af",
- "numeric-4-circle": "0xfc82",
- "numeric-4-circle-outline": "0xfc83",
- "numeric-5": "0x35",
- "numeric-5-box": "0xf3b0",
- "numeric-5-box-multiple-outline": "0xf3b1",
- "numeric-5-box-outline": "0xf3b2",
- "numeric-5-circle": "0xfc84",
- "numeric-5-circle-outline": "0xfc85",
- "numeric-6": "0x36",
- "numeric-6-box": "0xf3b3",
- "numeric-6-box-multiple-outline": "0xf3b4",
- "numeric-6-box-outline": "0xf3b5",
- "numeric-6-circle": "0xfc86",
- "numeric-6-circle-outline": "0xfc87",
- "numeric-7": "0x37",
- "numeric-7-box": "0xf3b6",
- "numeric-7-box-multiple-outline": "0xf3b7",
- "numeric-7-box-outline": "0xf3b8",
- "numeric-7-circle": "0xfc88",
- "numeric-7-circle-outline": "0xfc89",
- "numeric-8": "0x38",
- "numeric-8-box": "0xf3b9",
- "numeric-8-box-multiple-outline": "0xf3ba",
- "numeric-8-box-outline": "0xf3bb",
- "numeric-8-circle": "0xfc8a",
- "numeric-8-circle-outline": "0xfc8b",
- "numeric-9": "0x39",
- "numeric-9-box": "0xf3bc",
- "numeric-9-box-multiple-outline": "0xf3bd",
- "numeric-9-box-outline": "0xf3be",
- "numeric-9-circle": "0xfc8c",
- "numeric-9-circle-outline": "0xfc8d",
- "numeric-9-plus-box": "0xf3bf",
- "numeric-9-plus-box-multiple-outline": "0xf3c0",
- "numeric-9-plus-box-outline": "0xf3c1",
- "numeric-9-plus-circle": "0xfc8e",
- "numeric-9-plus-circle-outline": "0xfc8f",
- "nut": "0xf6f7",
- "nutrition": "0xf3c2",
- "oar": "0xf67b",
- "ocarina": "0xfdbc",
- "octagon": "0xf3c3",
- "octagon-outline": "0xf3c4",
- "octagram": "0xf6f8",
- "octagram-outline": "0xf774",
- "odnoklassniki": "0xf3c5",
- "office": "0xf3c6",
- "office-building": "0xf990",
- "oil": "0xf3c7",
- "oil-temperature": "0xf3c8",
- "omega": "0xf3c9",
- "one-up": "0xfb89",
- "onedrive": "0xf3ca",
- "onenote": "0xf746",
- "onepassword": "0xf880",
- "opacity": "0xf5cc",
- "open-in-app": "0xf3cb",
- "open-in-new": "0xf3cc",
- "open-source-initiative": "0xfb8a",
- "openid": "0xf3cd",
- "opera": "0xf3ce",
- "orbit": "0xf018",
- "origin": "0xfb2b",
- "ornament": "0xf3cf",
- "ornament-variant": "0xf3d0",
- "outlook": "0xfcfe",
- "owl": "0xf3d2",
- "pac-man": "0xfb8b",
- "package": "0xf3d3",
- "package-down": "0xf3d4",
- "package-up": "0xf3d5",
- "package-variant": "0xf3d6",
- "package-variant-closed": "0xf3d7",
- "page-first": "0xf600",
- "page-last": "0xf601",
- "page-layout-body": "0xf6f9",
- "page-layout-footer": "0xf6fa",
- "page-layout-header": "0xf6fb",
- "page-layout-sidebar-left": "0xf6fc",
- "page-layout-sidebar-right": "0xf6fd",
- "page-next": "0xfb8c",
- "page-next-outline": "0xfb8d",
- "page-previous": "0xfb8e",
- "page-previous-outline": "0xfb8f",
- "palette": "0xf3d8",
- "palette-advanced": "0xf3d9",
- "palette-outline": "0xfe6c",
- "palette-swatch": "0xf8b4",
- "pan": "0xfb90",
- "pan-bottom-left": "0xfb91",
- "pan-bottom-right": "0xfb92",
- "pan-down": "0xfb93",
- "pan-horizontal": "0xfb94",
- "pan-left": "0xfb95",
- "pan-right": "0xfb96",
- "pan-top-left": "0xfb97",
- "pan-top-right": "0xfb98",
- "pan-up": "0xfb99",
- "pan-vertical": "0xfb9a",
- "panda": "0xf3da",
- "pandora": "0xf3db",
- "panorama": "0xf3dc",
- "panorama-fisheye": "0xf3dd",
- "panorama-horizontal": "0xf3de",
- "panorama-vertical": "0xf3df",
- "panorama-wide-angle": "0xf3e0",
- "paper-cut-vertical": "0xf3e1",
- "paperclip": "0xf3e2",
- "parachute": "0xfc90",
- "parachute-outline": "0xfc91",
- "parking": "0xf3e3",
- "passport": "0xf7e2",
- "passport-biometric": "0xfdbd",
- "patreon": "0xf881",
- "pause": "0xf3e4",
- "pause-circle": "0xf3e5",
- "pause-circle-outline": "0xf3e6",
- "pause-octagon": "0xf3e7",
- "pause-octagon-outline": "0xf3e8",
- "paw": "0xf3e9",
- "paw-off": "0xf657",
- "paypal": "0xf882",
- "pdf-box": "0xfe39",
- "peace": "0xf883",
- "pen": "0xf3ea",
- "pen-lock": "0xfdbe",
- "pen-minus": "0xfdbf",
- "pen-off": "0xfdc0",
- "pen-plus": "0xfdc1",
- "pen-remove": "0xfdc2",
- "pencil": "0xf3eb",
- "pencil-box": "0xf3ec",
- "pencil-box-outline": "0xf3ed",
- "pencil-circle": "0xf6fe",
- "pencil-circle-outline": "0xf775",
- "pencil-lock": "0xf3ee",
- "pencil-lock-outline": "0xfdc3",
- "pencil-minus": "0xfdc4",
- "pencil-minus-outline": "0xfdc5",
- "pencil-off": "0xf3ef",
- "pencil-off-outline": "0xfdc6",
- "pencil-outline": "0xfc92",
- "pencil-plus": "0xfdc7",
- "pencil-plus-outline": "0xfdc8",
- "pencil-remove": "0xfdc9",
- "pencil-remove-outline": "0xfdca",
- "pentagon": "0xf6ff",
- "pentagon-outline": "0xf700",
- "percent": "0xf3f0",
- "periodic-table": "0xf8b5",
- "periodic-table-co2": "0xf7e3",
- "periscope": "0xf747",
- "perspective-less": "0xfcff",
- "perspective-more": "0xfd00",
- "pharmacy": "0xf3f1",
- "phone": "0xf3f2",
- "phone-bluetooth": "0xf3f3",
- "phone-classic": "0xf602",
- "phone-forward": "0xf3f4",
- "phone-hangup": "0xf3f5",
- "phone-in-talk": "0xf3f6",
- "phone-incoming": "0xf3f7",
- "phone-lock": "0xf3f8",
- "phone-log": "0xf3f9",
- "phone-minus": "0xf658",
- "phone-missed": "0xf3fa",
- "phone-off": "0xfdcb",
- "phone-outgoing": "0xf3fb",
- "phone-outline": "0xfdcc",
- "phone-paused": "0xf3fc",
- "phone-plus": "0xf659",
- "phone-return": "0xf82e",
- "phone-rotate-landscape": "0xf884",
- "phone-rotate-portrait": "0xf885",
- "phone-settings": "0xf3fd",
- "phone-voip": "0xf3fe",
- "pi": "0xf3ff",
- "pi-box": "0xf400",
- "pi-hole": "0xfdcd",
- "piano": "0xf67c",
- "pickaxe": "0xf8b6",
- "picture-in-picture-bottom-right": "0xfe3a",
- "picture-in-picture-bottom-right-outline": "0xfe3b",
- "picture-in-picture-top-right": "0xfe3c",
- "picture-in-picture-top-right-outline": "0xfe3d",
- "pier": "0xf886",
- "pier-crane": "0xf887",
- "pig": "0xf401",
- "pill": "0xf402",
- "pillar": "0xf701",
- "pin": "0xf403",
- "pin-off": "0xf404",
- "pin-off-outline": "0xf92f",
- "pin-outline": "0xf930",
- "pine-tree": "0xf405",
- "pine-tree-box": "0xf406",
- "pinterest": "0xf407",
- "pinterest-box": "0xf408",
- "pinwheel": "0xfad4",
- "pinwheel-outline": "0xfad5",
- "pipe": "0xf7e4",
- "pipe-disconnected": "0xf7e5",
- "pipe-leak": "0xf888",
- "pirate": "0xfa07",
- "pistol": "0xf702",
- "piston": "0xf889",
- "pizza": "0xf409",
- "play": "0xf40a",
- "play-box-outline": "0xf40b",
- "play-circle": "0xf40c",
- "play-circle-outline": "0xf40d",
- "play-network": "0xf88a",
- "play-network-outline": "0xfc93",
- "play-pause": "0xf40e",
- "play-protected-content": "0xf40f",
- "play-speed": "0xf8fe",
- "playlist-check": "0xf5c7",
- "playlist-edit": "0xf8ff",
- "playlist-minus": "0xf410",
- "playlist-music": "0xfc94",
- "playlist-music-outline": "0xfc95",
- "playlist-play": "0xf411",
- "playlist-plus": "0xf412",
- "playlist-remove": "0xf413",
- "playlist-star": "0xfdce",
- "playstation": "0xf414",
- "plex": "0xf6b9",
- "plus": "0xf415",
- "plus-box": "0xf416",
- "plus-box-outline": "0xf703",
- "plus-circle": "0xf417",
- "plus-circle-multiple-outline": "0xf418",
- "plus-circle-outline": "0xf419",
- "plus-minus": "0xf991",
- "plus-minus-box": "0xf992",
- "plus-network": "0xf41a",
- "plus-network-outline": "0xfc96",
- "plus-one": "0xf41b",
- "plus-outline": "0xf704",
- "pocket": "0xf41c",
- "podcast": "0xf993",
- "podium": "0xfd01",
- "podium-bronze": "0xfd02",
- "podium-gold": "0xfd03",
- "podium-silver": "0xfd04",
- "point-of-sale": "0xfd6e",
- "pokeball": "0xf41d",
- "pokemon-go": "0xfa08",
- "poker-chip": "0xf82f",
- "polaroid": "0xf41e",
- "poll": "0xf41f",
- "poll-box": "0xf420",
- "polymer": "0xf421",
- "pool": "0xf606",
- "popcorn": "0xf422",
- "postage-stamp": "0xfc97",
- "pot": "0xf65a",
- "pot-mix": "0xf65b",
- "pound": "0xf423",
- "pound-box": "0xf424",
- "power": "0xf425",
- "power-cycle": "0xf900",
- "power-off": "0xf901",
- "power-on": "0xf902",
- "power-plug": "0xf6a4",
- "power-plug-off": "0xf6a5",
- "power-settings": "0xf426",
- "power-sleep": "0xf903",
- "power-socket": "0xf427",
- "power-socket-au": "0xf904",
- "power-socket-eu": "0xf7e6",
- "power-socket-uk": "0xf7e7",
- "power-socket-us": "0xf7e8",
- "power-standby": "0xf905",
- "powershell": "0xfa09",
- "prescription": "0xf705",
- "presentation": "0xf428",
- "presentation-play": "0xf429",
- "printer": "0xf42a",
- "printer-3d": "0xf42b",
- "printer-3d-nozzle": "0xfe3e",
- "printer-3d-nozzle-outline": "0xfe3f",
- "printer-alert": "0xf42c",
- "printer-off": "0xfe40",
- "printer-settings": "0xf706",
- "printer-wireless": "0xfa0a",
- "priority-high": "0xf603",
- "priority-low": "0xf604",
- "professional-hexagon": "0xf42d",
- "progress-alert": "0xfc98",
- "progress-check": "0xf994",
- "progress-clock": "0xf995",
- "progress-download": "0xf996",
- "progress-upload": "0xf997",
- "progress-wrench": "0xfc99",
- "projector": "0xf42e",
- "projector-screen": "0xf42f",
- "publish": "0xf6a6",
- "pulse": "0xf430",
- "pumpkin": "0xfb9b",
- "puzzle": "0xf431",
- "puzzle-outline": "0xfa65",
- "qi": "0xf998",
- "qqchat": "0xf605",
- "qrcode": "0xf432",
- "qrcode-edit": "0xf8b7",
- "qrcode-scan": "0xf433",
- "quadcopter": "0xf434",
- "quality-high": "0xf435",
- "quality-low": "0xfa0b",
- "quality-medium": "0xfa0c",
- "quicktime": "0xf436",
- "quora": "0xfd05",
- "rabbit": "0xf906",
- "racing-helmet": "0xfd6f",
- "racquetball": "0xfd70",
- "radar": "0xf437",
- "radiator": "0xf438",
- "radiator-disabled": "0xfad6",
- "radiator-off": "0xfad7",
- "radio": "0xf439",
- "radio-am": "0xfc9a",
- "radio-fm": "0xfc9b",
- "radio-handheld": "0xf43a",
- "radio-tower": "0xf43b",
- "radioactive": "0xf43c",
- "radiobox-blank": "0xf43d",
- "radiobox-marked": "0xf43e",
- "radius": "0xfc9c",
- "radius-outline": "0xfc9d",
- "raspberry-pi": "0xf43f",
- "ray-end": "0xf440",
- "ray-end-arrow": "0xf441",
- "ray-start": "0xf442",
- "ray-start-arrow": "0xf443",
- "ray-start-end": "0xf444",
- "ray-vertex": "0xf445",
- "react": "0xf707",
- "read": "0xf447",
- "receipt": "0xf449",
- "record": "0xf44a",
- "record-player": "0xf999",
- "record-rec": "0xf44b",
- "rectangle": "0xfe41",
- "rectangle-outline": "0xfe42",
- "recycle": "0xf44c",
- "reddit": "0xf44d",
- "redo": "0xf44e",
- "redo-variant": "0xf44f",
- "reflect-horizontal": "0xfa0d",
- "reflect-vertical": "0xfa0e",
- "refresh": "0xf450",
- "regex": "0xf451",
- "registered-trademark": "0xfa66",
- "relative-scale": "0xf452",
- "reload": "0xf453",
- "reminder": "0xf88b",
- "remote": "0xf454",
- "remote-desktop": "0xf8b8",
- "rename-box": "0xf455",
- "reorder-horizontal": "0xf687",
- "reorder-vertical": "0xf688",
- "repeat": "0xf456",
- "repeat-off": "0xf457",
- "repeat-once": "0xf458",
- "replay": "0xf459",
- "reply": "0xf45a",
- "reply-all": "0xf45b",
- "reproduction": "0xf45c",
- "resistor": "0xfb1f",
- "resistor-nodes": "0xfb20",
- "resize": "0xfa67",
- "resize-bottom-right": "0xf45d",
- "responsive": "0xf45e",
- "restart": "0xf708",
- "restart-off": "0xfd71",
- "restore": "0xf99a",
- "restore-clock": "0xf6a7",
- "rewind": "0xf45f",
- "rewind-10": "0xfd06",
- "rewind-30": "0xfd72",
- "rewind-outline": "0xf709",
- "rhombus": "0xf70a",
- "rhombus-medium": "0xfa0f",
- "rhombus-outline": "0xf70b",
- "rhombus-split": "0xfa10",
- "ribbon": "0xf460",
- "rice": "0xf7e9",
- "ring": "0xf7ea",
- "rivet": "0xfe43",
- "road": "0xf461",
- "road-variant": "0xf462",
- "robot": "0xf6a8",
- "robot-industrial": "0xfb21",
- "robot-vacuum": "0xf70c",
- "robot-vacuum-variant": "0xf907",
- "rocket": "0xf463",
- "roller-skate": "0xfd07",
- "rollerblade": "0xfd08",
- "rollupjs": "0xfb9c",
- "room-service": "0xf88c",
- "room-service-outline": "0xfd73",
- "rotate-3d": "0xf464",
- "rotate-left": "0xf465",
- "rotate-left-variant": "0xf466",
- "rotate-orbit": "0xfd74",
- "rotate-right": "0xf467",
- "rotate-right-variant": "0xf468",
- "rounded-corner": "0xf607",
- "router-wireless": "0xf469",
- "router-wireless-settings": "0xfa68",
- "routes": "0xf46a",
- "rowing": "0xf608",
- "rss": "0xf46b",
- "rss-box": "0xf46c",
- "ruby": "0xfd09",
- "rugby": "0xfd75",
- "ruler": "0xf46d",
- "ruler-square": "0xfc9e",
- "run": "0xf70d",
- "run-fast": "0xf46e",
- "sack": "0xfd0a",
- "sack-percent": "0xfd0b",
- "safe": "0xfa69",
- "safety-goggles": "0xfd0c",
- "sale": "0xf46f",
- "salesforce": "0xf88d",
- "sass": "0xf7eb",
- "satellite": "0xf470",
- "satellite-uplink": "0xf908",
- "satellite-variant": "0xf471",
- "sausage": "0xf8b9",
- "saw-blade": "0xfe44",
- "saxophone": "0xf609",
- "scale": "0xf472",
- "scale-balance": "0xf5d1",
- "scale-bathroom": "0xf473",
- "scanner": "0xf6aa",
- "scanner-off": "0xf909",
- "school": "0xf474",
- "scissors-cutting": "0xfa6a",
- "screen-rotation": "0xf475",
- "screen-rotation-lock": "0xf476",
- "screw-flat-top": "0xfdcf",
- "screw-lag": "0xfe54",
- "screw-machine-flat-top": "0xfe55",
- "screw-machine-round-top": "0xfe56",
- "screw-round-top": "0xfe57",
- "screwdriver": "0xf477",
- "script": "0xfb9d",
- "script-outline": "0xf478",
- "script-text": "0xfb9e",
- "script-text-outline": "0xfb9f",
- "sd": "0xf479",
- "seal": "0xf47a",
- "search-web": "0xf70e",
- "seat": "0xfc9f",
- "seat-flat": "0xf47b",
- "seat-flat-angled": "0xf47c",
- "seat-individual-suite": "0xf47d",
- "seat-legroom-extra": "0xf47e",
- "seat-legroom-normal": "0xf47f",
- "seat-legroom-reduced": "0xf480",
- "seat-outline": "0xfca0",
- "seat-recline-extra": "0xf481",
- "seat-recline-normal": "0xf482",
- "seatbelt": "0xfca1",
- "security": "0xf483",
- "security-network": "0xf484",
- "seed": "0xfe45",
- "seed-outline": "0xfe46",
- "select": "0xf485",
- "select-all": "0xf486",
- "select-color": "0xfd0d",
- "select-compare": "0xfad8",
- "select-drag": "0xfa6b",
- "select-inverse": "0xf487",
- "select-off": "0xf488",
- "selection": "0xf489",
- "selection-drag": "0xfa6c",
- "selection-ellipse": "0xfd0e",
- "selection-off": "0xf776",
- "send": "0xf48a",
- "send-circle": "0xfe58",
- "send-circle-outline": "0xfe59",
- "send-lock": "0xf7ec",
- "serial-port": "0xf65c",
- "server": "0xf48b",
- "server-minus": "0xf48c",
- "server-network": "0xf48d",
- "server-network-off": "0xf48e",
- "server-off": "0xf48f",
- "server-plus": "0xf490",
- "server-remove": "0xf491",
- "server-security": "0xf492",
- "set-all": "0xf777",
- "set-center": "0xf778",
- "set-center-right": "0xf779",
- "set-left": "0xf77a",
- "set-left-center": "0xf77b",
- "set-left-right": "0xf77c",
- "set-none": "0xf77d",
- "set-right": "0xf77e",
- "set-top-box": "0xf99e",
- "settings": "0xf493",
- "settings-box": "0xf494",
- "settings-helper": "0xfa6d",
- "settings-outline": "0xf8ba",
- "shape": "0xf830",
- "shape-circle-plus": "0xf65d",
- "shape-outline": "0xf831",
- "shape-plus": "0xf495",
- "shape-polygon-plus": "0xf65e",
- "shape-rectangle-plus": "0xf65f",
- "shape-square-plus": "0xf660",
- "share": "0xf496",
- "share-outline": "0xf931",
- "share-variant": "0xf497",
- "sheep": "0xfca2",
- "shield": "0xf498",
- "shield-account": "0xf88e",
- "shield-account-outline": "0xfa11",
- "shield-airplane": "0xf6ba",
- "shield-airplane-outline": "0xfca3",
- "shield-check": "0xf565",
- "shield-check-outline": "0xfca4",
- "shield-cross": "0xfca5",
- "shield-cross-outline": "0xfca6",
- "shield-half-full": "0xf77f",
- "shield-home": "0xf689",
- "shield-home-outline": "0xfca7",
- "shield-key": "0xfba0",
- "shield-key-outline": "0xfba1",
- "shield-link-variant": "0xfd0f",
- "shield-link-variant-outline": "0xfd10",
- "shield-lock": "0xf99c",
- "shield-lock-outline": "0xfca8",
- "shield-off": "0xf99d",
- "shield-off-outline": "0xf99b",
- "shield-outline": "0xf499",
- "shield-plus": "0xfad9",
- "shield-plus-outline": "0xfada",
- "shield-remove": "0xfadb",
- "shield-remove-outline": "0xfadc",
- "shield-search": "0xfd76",
- "ship-wheel": "0xf832",
- "shoe-formal": "0xfb22",
- "shoe-heel": "0xfb23",
- "shoe-print": "0xfe5a",
- "shopify": "0xfadd",
- "shopping": "0xf49a",
- "shopping-music": "0xf49b",
- "shovel": "0xf70f",
- "shovel-off": "0xf710",
- "shower": "0xf99f",
- "shower-head": "0xf9a0",
- "shredder": "0xf49c",
- "shuffle": "0xf49d",
- "shuffle-disabled": "0xf49e",
- "shuffle-variant": "0xf49f",
- "sigma": "0xf4a0",
- "sigma-lower": "0xf62b",
- "sign-caution": "0xf4a1",
- "sign-direction": "0xf780",
- "sign-text": "0xf781",
- "signal": "0xf4a2",
- "signal-2g": "0xf711",
- "signal-3g": "0xf712",
- "signal-4g": "0xf713",
- "signal-5g": "0xfa6e",
- "signal-cellular-1": "0xf8bb",
- "signal-cellular-2": "0xf8bc",
- "signal-cellular-3": "0xf8bd",
- "signal-cellular-outline": "0xf8be",
- "signal-distance-variant": "0xfe47",
- "signal-hspa": "0xf714",
- "signal-hspa-plus": "0xf715",
- "signal-off": "0xf782",
- "signal-variant": "0xf60a",
- "signature": "0xfe5b",
- "signature-freehand": "0xfe5c",
- "signature-image": "0xfe5d",
- "signature-text": "0xfe5e",
- "silo": "0xfb24",
- "silverware": "0xf4a3",
- "silverware-fork": "0xf4a4",
- "silverware-fork-knife": "0xfa6f",
- "silverware-spoon": "0xf4a5",
- "silverware-variant": "0xf4a6",
- "sim": "0xf4a7",
- "sim-alert": "0xf4a8",
- "sim-off": "0xf4a9",
- "sina-weibo": "0xfade",
- "sitemap": "0xf4aa",
- "skate": "0xfd11",
- "skew-less": "0xfd12",
- "skew-more": "0xfd13",
- "skip-backward": "0xf4ab",
- "skip-forward": "0xf4ac",
- "skip-next": "0xf4ad",
- "skip-next-circle": "0xf661",
- "skip-next-circle-outline": "0xf662",
- "skip-previous": "0xf4ae",
- "skip-previous-circle": "0xf663",
- "skip-previous-circle-outline": "0xf664",
- "skull": "0xf68b",
- "skull-crossbones": "0xfba2",
- "skull-crossbones-outline": "0xfba3",
- "skull-outline": "0xfba4",
- "skype": "0xf4af",
- "skype-business": "0xf4b0",
- "slack": "0xf4b1",
- "slackware": "0xf90a",
- "sleep": "0xf4b2",
- "sleep-off": "0xf4b3",
- "slope-downhill": "0xfe5f",
- "slope-uphill": "0xfe60",
- "smog": "0xfa70",
- "smoke-detector": "0xf392",
- "smoking": "0xf4b4",
- "smoking-off": "0xf4b5",
- "snapchat": "0xf4b6",
- "snowflake": "0xf716",
- "snowman": "0xf4b7",
- "soccer": "0xf4b8",
- "soccer-field": "0xf833",
- "sofa": "0xf4b9",
- "solar-panel": "0xfd77",
- "solar-panel-large": "0xfd78",
- "solar-power": "0xfa71",
- "solid": "0xf68c",
- "sort": "0xf4ba",
- "sort-alphabetical": "0xf4bb",
- "sort-ascending": "0xf4bc",
- "sort-descending": "0xf4bd",
- "sort-numeric": "0xf4be",
- "sort-variant": "0xf4bf",
- "sort-variant-lock": "0xfca9",
- "sort-variant-lock-open": "0xfcaa",
- "soundcloud": "0xf4c0",
- "source-branch": "0xf62c",
- "source-commit": "0xf717",
- "source-commit-end": "0xf718",
- "source-commit-end-local": "0xf719",
- "source-commit-local": "0xf71a",
- "source-commit-next-local": "0xf71b",
- "source-commit-start": "0xf71c",
- "source-commit-start-next-local": "0xf71d",
- "source-fork": "0xf4c1",
- "source-merge": "0xf62d",
- "source-pull": "0xf4c2",
- "source-repository": "0xfcab",
- "source-repository-multiple": "0xfcac",
- "soy-sauce": "0xf7ed",
- "spa": "0xfcad",
- "spa-outline": "0xfcae",
- "space-invaders": "0xfba5",
- "spade": "0xfe48",
- "speaker": "0xf4c3",
- "speaker-bluetooth": "0xf9a1",
- "speaker-multiple": "0xfd14",
- "speaker-off": "0xf4c4",
- "speaker-wireless": "0xf71e",
- "speedometer": "0xf4c5",
- "spellcheck": "0xf4c6",
- "spider-web": "0xfba6",
- "spotify": "0xf4c7",
- "spotlight": "0xf4c8",
- "spotlight-beam": "0xf4c9",
- "spray": "0xf665",
- "spray-bottle": "0xfadf",
- "sprout": "0xfe49",
- "sprout-outline": "0xfe4a",
- "square": "0xf763",
- "square-edit-outline": "0xf90b",
- "square-inc": "0xf4ca",
- "square-inc-cash": "0xf4cb",
- "square-medium": "0xfa12",
- "square-medium-outline": "0xfa13",
- "square-outline": "0xf762",
- "square-root": "0xf783",
- "square-root-box": "0xf9a2",
- "square-small": "0xfa14",
- "squeegee": "0xfae0",
- "ssh": "0xf8bf",
- "stack-exchange": "0xf60b",
- "stack-overflow": "0xf4cc",
- "stadium": "0xf71f",
- "stairs": "0xf4cd",
- "stamper": "0xfd15",
- "standard-definition": "0xf7ee",
- "star": "0xf4ce",
- "star-box": "0xfa72",
- "star-box-outline": "0xfa73",
- "star-circle": "0xf4cf",
- "star-circle-outline": "0xf9a3",
- "star-face": "0xf9a4",
- "star-four-points": "0xfae1",
- "star-four-points-outline": "0xfae2",
- "star-half": "0xf4d0",
- "star-off": "0xf4d1",
- "star-outline": "0xf4d2",
- "star-three-points": "0xfae3",
- "star-three-points-outline": "0xfae4",
- "steam": "0xf4d3",
- "steam-box": "0xf90c",
- "steering": "0xf4d4",
- "steering-off": "0xf90d",
- "step-backward": "0xf4d5",
- "step-backward-2": "0xf4d6",
- "step-forward": "0xf4d7",
- "step-forward-2": "0xf4d8",
- "stethoscope": "0xf4d9",
- "sticker": "0xf5d0",
- "sticker-emoji": "0xf784",
- "stocking": "0xf4da",
- "stop": "0xf4db",
- "stop-circle": "0xf666",
- "stop-circle-outline": "0xf667",
- "store": "0xf4dc",
- "store-24-hour": "0xf4dd",
- "stove": "0xf4de",
- "strava": "0xfb25",
- "subdirectory-arrow-left": "0xf60c",
- "subdirectory-arrow-right": "0xf60d",
- "subtitles": "0xfa15",
- "subtitles-outline": "0xfa16",
- "subway": "0xf6ab",
- "subway-alert-variant": "0xfd79",
- "subway-variant": "0xf4df",
- "summit": "0xf785",
- "sunglasses": "0xf4e0",
- "surround-sound": "0xf5c5",
- "surround-sound-2-0": "0xf7ef",
- "surround-sound-3-1": "0xf7f0",
- "surround-sound-5-1": "0xf7f1",
- "surround-sound-7-1": "0xf7f2",
- "svg": "0xf720",
- "swap-horizontal": "0xf4e1",
- "swap-horizontal-bold": "0xfba9",
- "swap-horizontal-variant": "0xf8c0",
- "swap-vertical": "0xf4e2",
- "swap-vertical-bold": "0xfbaa",
- "swap-vertical-variant": "0xf8c1",
- "swim": "0xf4e3",
- "switch": "0xf4e4",
- "sword": "0xf4e5",
- "sword-cross": "0xf786",
- "symfony": "0xfae5",
- "sync": "0xf4e6",
- "sync-alert": "0xf4e7",
- "sync-off": "0xf4e8",
- "tab": "0xf4e9",
- "tab-minus": "0xfb26",
- "tab-plus": "0xf75b",
- "tab-remove": "0xfb27",
- "tab-unselected": "0xf4ea",
- "table": "0xf4eb",
- "table-border": "0xfa17",
- "table-column": "0xf834",
- "table-column-plus-after": "0xf4ec",
- "table-column-plus-before": "0xf4ed",
- "table-column-remove": "0xf4ee",
- "table-column-width": "0xf4ef",
- "table-edit": "0xf4f0",
- "table-large": "0xf4f1",
- "table-merge-cells": "0xf9a5",
- "table-of-contents": "0xf835",
- "table-plus": "0xfa74",
- "table-remove": "0xfa75",
- "table-row": "0xf836",
- "table-row-height": "0xf4f2",
- "table-row-plus-after": "0xf4f3",
- "table-row-plus-before": "0xf4f4",
- "table-row-remove": "0xf4f5",
- "table-search": "0xf90e",
- "table-settings": "0xf837",
- "table-tennis": "0xfe4b",
- "tablet": "0xf4f6",
- "tablet-android": "0xf4f7",
- "tablet-cellphone": "0xf9a6",
- "tablet-ipad": "0xf4f8",
- "taco": "0xf761",
- "tag": "0xf4f9",
- "tag-faces": "0xf4fa",
- "tag-heart": "0xf68a",
- "tag-heart-outline": "0xfbab",
- "tag-minus": "0xf90f",
- "tag-multiple": "0xf4fb",
- "tag-outline": "0xf4fc",
- "tag-plus": "0xf721",
- "tag-remove": "0xf722",
- "tag-text-outline": "0xf4fd",
- "tank": "0xfd16",
- "tape-measure": "0xfb28",
- "target": "0xf4fe",
- "target-account": "0xfbac",
- "target-variant": "0xfa76",
- "taxi": "0xf4ff",
- "tea": "0xfd7a",
- "tea-outline": "0xfd7b",
- "teach": "0xf88f",
- "teamviewer": "0xf500",
- "telegram": "0xf501",
- "telescope": "0xfb29",
- "television": "0xf502",
- "television-box": "0xf838",
- "television-classic": "0xf7f3",
- "television-classic-off": "0xf839",
- "television-guide": "0xf503",
- "television-off": "0xf83a",
- "temperature-celsius": "0xf504",
- "temperature-fahrenheit": "0xf505",
- "temperature-kelvin": "0xf506",
- "tennis": "0xfd7c",
- "tennis-ball": "0xf507",
- "tent": "0xf508",
- "terrain": "0xf509",
- "test-tube": "0xf668",
- "test-tube-empty": "0xf910",
- "test-tube-off": "0xf911",
- "text": "0xf9a7",
- "text-shadow": "0xf669",
- "text-short": "0xf9a8",
- "text-subject": "0xf9a9",
- "text-to-speech": "0xf50a",
- "text-to-speech-off": "0xf50b",
- "textbox": "0xf60e",
- "textbox-password": "0xf7f4",
- "texture": "0xf50c",
- "theater": "0xf50d",
- "theme-light-dark": "0xf50e",
- "thermometer": "0xf50f",
- "thermometer-alert": "0xfe61",
- "thermometer-chevron-down": "0xfe62",
- "thermometer-chevron-up": "0xfe63",
- "thermometer-lines": "0xf510",
- "thermometer-minus": "0xfe64",
- "thermometer-plus": "0xfe65",
- "thermostat": "0xf393",
- "thermostat-box": "0xf890",
- "thought-bubble": "0xf7f5",
- "thought-bubble-outline": "0xf7f6",
- "thumb-down": "0xf511",
- "thumb-down-outline": "0xf512",
- "thumb-up": "0xf513",
- "thumb-up-outline": "0xf514",
- "thumbs-up-down": "0xf515",
- "ticket": "0xf516",
- "ticket-account": "0xf517",
- "ticket-confirmation": "0xf518",
- "ticket-outline": "0xf912",
- "ticket-percent": "0xf723",
- "tie": "0xf519",
- "tilde": "0xf724",
- "timelapse": "0xf51a",
- "timeline": "0xfbad",
- "timeline-outline": "0xfbae",
- "timeline-text": "0xfbaf",
- "timeline-text-outline": "0xfbb0",
- "timer": "0xf51b",
- "timer-10": "0xf51c",
- "timer-3": "0xf51d",
- "timer-off": "0xf51e",
- "timer-sand": "0xf51f",
- "timer-sand-empty": "0xf6ac",
- "timer-sand-full": "0xf78b",
- "timetable": "0xf520",
- "toaster-oven": "0xfcaf",
- "toggle-switch": "0xf521",
- "toggle-switch-off": "0xf522",
- "toggle-switch-off-outline": "0xfa18",
- "toggle-switch-outline": "0xfa19",
- "toilet": "0xf9aa",
- "toolbox": "0xf9ab",
- "toolbox-outline": "0xf9ac",
- "tooltip": "0xf523",
- "tooltip-account": "0xf00c",
- "tooltip-edit": "0xf524",
- "tooltip-image": "0xf525",
- "tooltip-image-outline": "0xfbb1",
- "tooltip-outline": "0xf526",
- "tooltip-plus": "0xfbb2",
- "tooltip-plus-outline": "0xf527",
- "tooltip-text": "0xf528",
- "tooltip-text-outline": "0xfbb3",
- "tooth": "0xf8c2",
- "tooth-outline": "0xf529",
- "tor": "0xf52a",
- "tortoise": "0xfd17",
- "tournament": "0xf9ad",
- "tower-beach": "0xf680",
- "tower-fire": "0xf681",
- "towing": "0xf83b",
- "track-light": "0xf913",
- "trackpad": "0xf7f7",
- "trackpad-lock": "0xf932",
- "tractor": "0xf891",
- "trademark": "0xfa77",
- "traffic-light": "0xf52b",
- "train": "0xf52c",
- "train-car": "0xfbb4",
- "train-variant": "0xf8c3",
- "tram": "0xf52d",
- "transcribe": "0xf52e",
- "transcribe-close": "0xf52f",
- "transfer-down": "0xfd7d",
- "transfer-left": "0xfd7e",
- "transfer-right": "0xf530",
- "transfer-up": "0xfd7f",
- "transit-connection": "0xfd18",
- "transit-connection-variant": "0xfd19",
- "transit-transfer": "0xf6ad",
- "transition": "0xf914",
- "transition-masked": "0xf915",
- "translate": "0xf5ca",
- "translate-off": "0xfe66",
- "transmission-tower": "0xfd1a",
- "trash-can": "0xfa78",
- "trash-can-outline": "0xfa79",
- "treasure-chest": "0xf725",
- "tree": "0xf531",
- "tree-outline": "0xfe4c",
- "trello": "0xf532",
- "trending-down": "0xf533",
- "trending-neutral": "0xf534",
- "trending-up": "0xf535",
- "triangle": "0xf536",
- "triangle-outline": "0xf537",
- "triforce": "0xfbb5",
- "trophy": "0xf538",
- "trophy-award": "0xf539",
- "trophy-broken": "0xfd80",
- "trophy-outline": "0xf53a",
- "trophy-variant": "0xf53b",
- "trophy-variant-outline": "0xf53c",
- "truck": "0xf53d",
- "truck-check": "0xfcb0",
- "truck-delivery": "0xf53e",
- "truck-fast": "0xf787",
- "truck-trailer": "0xf726",
- "tshirt-crew": "0xfa7a",
- "tshirt-crew-outline": "0xf53f",
- "tshirt-v": "0xfa7b",
- "tshirt-v-outline": "0xf540",
- "tumble-dryer": "0xf916",
- "tumblr": "0xf541",
- "tumblr-box": "0xf917",
- "tumblr-reblog": "0xf542",
- "tune": "0xf62e",
- "tune-vertical": "0xf66a",
- "turnstile": "0xfcb1",
- "turnstile-outline": "0xfcb2",
- "turtle": "0xfcb3",
- "twitch": "0xf543",
- "twitter": "0xf544",
- "twitter-box": "0xf545",
- "twitter-circle": "0xf546",
- "twitter-retweet": "0xf547",
- "two-factor-authentication": "0xf9ae",
- "uber": "0xf748",
- "ubisoft": "0xfbb6",
- "ubuntu": "0xf548",
- "ultra-high-definition": "0xf7f8",
- "umbraco": "0xf549",
- "umbrella": "0xf54a",
- "umbrella-closed": "0xf9af",
- "umbrella-outline": "0xf54b",
- "undo": "0xf54c",
- "undo-variant": "0xf54d",
- "unfold-less-horizontal": "0xf54e",
- "unfold-less-vertical": "0xf75f",
- "unfold-more-horizontal": "0xf54f",
- "unfold-more-vertical": "0xf760",
- "ungroup": "0xf550",
- "unity": "0xf6ae",
- "unreal": "0xf9b0",
- "untappd": "0xf551",
- "update": "0xf6af",
- "upload": "0xf552",
- "upload-multiple": "0xf83c",
- "upload-network": "0xf6f5",
- "upload-network-outline": "0xfcb4",
- "upload-outline": "0xfe67",
- "usb": "0xf553",
- "van-passenger": "0xf7f9",
- "van-utility": "0xf7fa",
- "vanish": "0xf7fb",
- "variable": "0xfae6",
- "vector-arrange-above": "0xf554",
- "vector-arrange-below": "0xf555",
- "vector-bezier": "0xfae7",
- "vector-circle": "0xf556",
- "vector-circle-variant": "0xf557",
- "vector-combine": "0xf558",
- "vector-curve": "0xf559",
- "vector-difference": "0xf55a",
- "vector-difference-ab": "0xf55b",
- "vector-difference-ba": "0xf55c",
- "vector-ellipse": "0xf892",
- "vector-intersection": "0xf55d",
- "vector-line": "0xf55e",
- "vector-point": "0xf55f",
- "vector-polygon": "0xf560",
- "vector-polyline": "0xf561",
- "vector-radius": "0xf749",
- "vector-rectangle": "0xf5c6",
- "vector-selection": "0xf562",
- "vector-square": "0xf001",
- "vector-triangle": "0xf563",
- "vector-union": "0xf564",
- "venmo": "0xf578",
- "vhs": "0xfa1a",
- "vibrate": "0xf566",
- "vibrate-off": "0xfcb5",
- "video": "0xf567",
- "video-3d": "0xf7fc",
- "video-4k-box": "0xf83d",
- "video-account": "0xf918",
- "video-image": "0xf919",
- "video-input-antenna": "0xf83e",
- "video-input-component": "0xf83f",
- "video-input-hdmi": "0xf840",
- "video-input-svideo": "0xf841",
- "video-minus": "0xf9b1",
- "video-off": "0xf568",
- "video-off-outline": "0xfbb7",
- "video-outline": "0xfbb8",
- "video-plus": "0xf9b2",
- "video-stabilization": "0xf91a",
- "video-switch": "0xf569",
- "video-vintage": "0xfa1b",
- "view-agenda": "0xf56a",
- "view-array": "0xf56b",
- "view-carousel": "0xf56c",
- "view-column": "0xf56d",
- "view-comfy": "0xfe4d",
- "view-compact": "0xfe4e",
- "view-compact-outline": "0xfe4f",
- "view-dashboard": "0xf56e",
- "view-dashboard-outline": "0xfa1c",
- "view-dashboard-variant": "0xf842",
- "view-day": "0xf56f",
- "view-grid": "0xf570",
- "view-headline": "0xf571",
- "view-list": "0xf572",
- "view-module": "0xf573",
- "view-parallel": "0xf727",
- "view-quilt": "0xf574",
- "view-sequential": "0xf728",
- "view-split-horizontal": "0xfba7",
- "view-split-vertical": "0xfba8",
- "view-stream": "0xf575",
- "view-week": "0xf576",
- "vimeo": "0xf577",
- "violin": "0xf60f",
- "virtual-reality": "0xf893",
- "visual-studio": "0xf610",
- "visual-studio-code": "0xfa1d",
- "vk": "0xf579",
- "vk-box": "0xf57a",
- "vk-circle": "0xf57b",
- "vlc": "0xf57c",
- "voice": "0xf5cb",
- "voicemail": "0xf57d",
- "volleyball": "0xf9b3",
- "volume-high": "0xf57e",
- "volume-low": "0xf57f",
- "volume-medium": "0xf580",
- "volume-minus": "0xf75d",
- "volume-mute": "0xf75e",
- "volume-off": "0xf581",
- "volume-plus": "0xf75c",
- "volume-variant-off": "0xfe68",
- "vote": "0xfa1e",
- "vote-outline": "0xfa1f",
- "vpn": "0xf582",
- "vuejs": "0xf843",
- "vuetify": "0xfe50",
- "walk": "0xf583",
- "wall": "0xf7fd",
- "wall-sconce": "0xf91b",
- "wall-sconce-flat": "0xf91c",
- "wall-sconce-variant": "0xf91d",
- "wallet": "0xf584",
- "wallet-giftcard": "0xf585",
- "wallet-membership": "0xf586",
- "wallet-outline": "0xfbb9",
- "wallet-travel": "0xf587",
- "wallpaper": "0xfe69",
- "wan": "0xf588",
- "washing-machine": "0xf729",
- "watch": "0xf589",
- "watch-export": "0xf58a",
- "watch-export-variant": "0xf894",
- "watch-import": "0xf58b",
- "watch-import-variant": "0xf895",
- "watch-variant": "0xf896",
- "watch-vibrate": "0xf6b0",
- "watch-vibrate-off": "0xfcb6",
- "water": "0xf58c",
- "water-off": "0xf58d",
- "water-outline": "0xfe6a",
- "water-percent": "0xf58e",
- "water-pump": "0xf58f",
- "watermark": "0xf612",
- "waves": "0xf78c",
- "waze": "0xfbba",
- "weather-cloudy": "0xf590",
- "weather-cloudy-arrow-right": "0xfe51",
- "weather-fog": "0xf591",
- "weather-hail": "0xf592",
- "weather-hurricane": "0xf897",
- "weather-lightning": "0xf593",
- "weather-lightning-rainy": "0xf67d",
- "weather-night": "0xf594",
- "weather-partlycloudy": "0xf595",
- "weather-pouring": "0xf596",
- "weather-rainy": "0xf597",
- "weather-snowy": "0xf598",
- "weather-snowy-rainy": "0xf67e",
- "weather-sunny": "0xf599",
- "weather-sunset": "0xf59a",
- "weather-sunset-down": "0xf59b",
- "weather-sunset-up": "0xf59c",
- "weather-windy": "0xf59d",
- "weather-windy-variant": "0xf59e",
- "web": "0xf59f",
- "webcam": "0xf5a0",
- "webhook": "0xf62f",
- "webpack": "0xf72a",
- "wechat": "0xf611",
- "weight": "0xf5a1",
- "weight-gram": "0xfd1b",
- "weight-kilogram": "0xf5a2",
- "weight-pound": "0xf9b4",
- "whatsapp": "0xf5a3",
- "wheelchair-accessibility": "0xf5a4",
- "whistle": "0xf9b5",
- "white-balance-auto": "0xf5a5",
- "white-balance-incandescent": "0xf5a6",
- "white-balance-iridescent": "0xf5a7",
- "white-balance-sunny": "0xf5a8",
- "widgets": "0xf72b",
- "wifi": "0xf5a9",
- "wifi-off": "0xf5aa",
- "wifi-star": "0xfe6b",
- "wifi-strength-1": "0xf91e",
- "wifi-strength-1-alert": "0xf91f",
- "wifi-strength-1-lock": "0xf920",
- "wifi-strength-2": "0xf921",
- "wifi-strength-2-alert": "0xf922",
- "wifi-strength-2-lock": "0xf923",
- "wifi-strength-3": "0xf924",
- "wifi-strength-3-alert": "0xf925",
- "wifi-strength-3-lock": "0xf926",
- "wifi-strength-4": "0xf927",
- "wifi-strength-4-alert": "0xf928",
- "wifi-strength-4-lock": "0xf929",
- "wifi-strength-alert-outline": "0xf92a",
- "wifi-strength-lock-outline": "0xf92b",
- "wifi-strength-off": "0xf92c",
- "wifi-strength-off-outline": "0xf92d",
- "wifi-strength-outline": "0xf92e",
- "wii": "0xf5ab",
- "wiiu": "0xf72c",
- "wikipedia": "0xf5ac",
- "wind-turbine": "0xfd81",
- "window-close": "0xf5ad",
- "window-closed": "0xf5ae",
- "window-maximize": "0xf5af",
- "window-minimize": "0xf5b0",
- "window-open": "0xf5b1",
- "window-restore": "0xf5b2",
- "windows": "0xf5b3",
- "windows-classic": "0xfa20",
- "wiper": "0xfae8",
- "wiper-wash": "0xfd82",
- "wordpress": "0xf5b4",
- "worker": "0xf5b5",
- "wrap": "0xf5b6",
- "wrap-disabled": "0xfbbb",
- "wrench": "0xf5b7",
- "wrench-outline": "0xfbbc",
- "wunderlist": "0xf5b8",
- "xamarin": "0xf844",
- "xamarin-outline": "0xf845",
- "xaml": "0xf673",
- "xbox": "0xf5b9",
- "xbox-controller": "0xf5ba",
- "xbox-controller-battery-alert": "0xf74a",
- "xbox-controller-battery-charging": "0xfa21",
- "xbox-controller-battery-empty": "0xf74b",
- "xbox-controller-battery-full": "0xf74c",
- "xbox-controller-battery-low": "0xf74d",
- "xbox-controller-battery-medium": "0xf74e",
- "xbox-controller-battery-unknown": "0xf74f",
- "xbox-controller-menu": "0xfe52",
- "xbox-controller-off": "0xf5bb",
- "xbox-controller-view": "0xfe53",
- "xda": "0xf5bc",
- "xing": "0xf5bd",
- "xing-box": "0xf5be",
- "xing-circle": "0xf5bf",
- "xml": "0xf5c0",
- "xmpp": "0xf7fe",
- "yahoo": "0xfb2a",
- "yammer": "0xf788",
- "yeast": "0xf5c1",
- "yelp": "0xf5c2",
- "yin-yang": "0xf67f",
- "youtube": "0xf5c3",
- "youtube-creator-studio": "0xf846",
- "youtube-gaming": "0xf847",
- "youtube-subscription": "0xfd1c",
- "youtube-tv": "0xf448",
- "z-wave": "0xfae9",
- "zend": "0xfaea",
- "zigbee": "0xfd1d",
- "zip-box": "0xf5c4",
- "zip-disk": "0xfa22",
- "zodiac-aquarius": "0xfa7c",
- "zodiac-aries": "0xfa7d",
- "zodiac-cancer": "0xfa7e",
- "zodiac-capricorn": "0xfa7f",
- "zodiac-gemini": "0xfa80",
- "zodiac-leo": "0xfa81",
- "zodiac-libra": "0xfa82",
- "zodiac-pisces": "0xfa83",
- "zodiac-sagittarius": "0xfa84",
- "zodiac-scorpio": "0xfa85",
- "zodiac-taurus": "0xfa86",
+ "access-point": "0xf002",
+ "access-point-network": "0xf003",
+ "access-point-network-off": "0xfbbd",
+ "account": "0xf004",
+ "account-alert": "0xf005",
+ "account-alert-outline": "0xfb2c",
+ "account-arrow-left": "0xfb2d",
+ "account-arrow-left-outline": "0xfb2e",
+ "account-arrow-right": "0xfb2f",
+ "account-arrow-right-outline": "0xfb30",
+ "account-badge": "0xfd83",
+ "account-badge-alert": "0xfd84",
+ "account-badge-alert-outline": "0xfd85",
+ "account-badge-horizontal": "0xfdf0",
+ "account-badge-horizontal-outline": "0xfdf1",
+ "account-badge-outline": "0xfd86",
+ "account-box": "0xf006",
+ "account-box-multiple": "0xf933",
+ "account-box-outline": "0xf007",
+ "account-card-details": "0xf5d2",
+ "account-card-details-outline": "0xfd87",
+ "account-check": "0xf008",
+ "account-check-outline": "0xfbbe",
+ "account-child": "0xfa88",
+ "account-child-circle": "0xfa89",
+ "account-circle": "0xf009",
+ "account-circle-outline": "0xfb31",
+ "account-clock": "0xfb32",
+ "account-clock-outline": "0xfb33",
+ "account-convert": "0xf00a",
+ "account-details": "0xf631",
+ "account-edit": "0xf6bb",
+ "account-group": "0xf848",
+ "account-group-outline": "0xfb34",
+ "account-heart": "0xf898",
+ "account-heart-outline": "0xfbbf",
+ "account-key": "0xf00b",
+ "account-key-outline": "0xfbc0",
+ "account-minus": "0xf00d",
+ "account-minus-outline": "0xfaeb",
+ "account-multiple": "0xf00e",
+ "account-multiple-check": "0xf8c4",
+ "account-multiple-minus": "0xf5d3",
+ "account-multiple-minus-outline": "0xfbc1",
+ "account-multiple-outline": "0xf00f",
+ "account-multiple-plus": "0xf010",
+ "account-multiple-plus-outline": "0xf7ff",
+ "account-network": "0xf011",
+ "account-network-outline": "0xfbc2",
+ "account-off": "0xf012",
+ "account-off-outline": "0xfbc3",
+ "account-outline": "0xf013",
+ "account-plus": "0xf014",
+ "account-plus-outline": "0xf800",
+ "account-question": "0xfb35",
+ "account-question-outline": "0xfb36",
+ "account-remove": "0xf015",
+ "account-remove-outline": "0xfaec",
+ "account-search": "0xf016",
+ "account-search-outline": "0xf934",
+ "account-settings": "0xf630",
+ "account-star": "0xf017",
+ "account-star-outline": "0xfbc4",
+ "account-supervisor": "0xfa8a",
+ "account-supervisor-circle": "0xfa8b",
+ "account-switch": "0xf019",
+ "account-tie": "0xfcbf",
+ "accusoft": "0xf849",
+ "adchoices": "0xfd1e",
+ "adjust": "0xf01a",
+ "adobe": "0xf935",
+ "air-conditioner": "0xf01b",
+ "air-filter": "0xfd1f",
+ "air-horn": "0xfd88",
+ "air-purifier": "0xfd20",
+ "airbag": "0xfbc5",
+ "airballoon": "0xf01c",
+ "airplane": "0xf01d",
+ "airplane-landing": "0xf5d4",
+ "airplane-off": "0xf01e",
+ "airplane-takeoff": "0xf5d5",
+ "airplay": "0xf01f",
+ "airport": "0xf84a",
+ "alarm": "0xf020",
+ "alarm-bell": "0xf78d",
+ "alarm-check": "0xf021",
+ "alarm-light": "0xf78e",
+ "alarm-light-outline": "0xfbc6",
+ "alarm-multiple": "0xf022",
+ "alarm-off": "0xf023",
+ "alarm-plus": "0xf024",
+ "alarm-snooze": "0xf68d",
+ "album": "0xf025",
+ "alert": "0xf026",
+ "alert-box": "0xf027",
+ "alert-box-outline": "0xfcc0",
+ "alert-circle": "0xf028",
+ "alert-circle-outline": "0xf5d6",
+ "alert-decagram": "0xf6bc",
+ "alert-decagram-outline": "0xfcc1",
+ "alert-octagon": "0xf029",
+ "alert-octagon-outline": "0xfcc2",
+ "alert-octagram": "0xf766",
+ "alert-octagram-outline": "0xfcc3",
+ "alert-outline": "0xf02a",
+ "alien": "0xf899",
+ "all-inclusive": "0xf6bd",
+ "alpha": "0xf02b",
+ "alpha-a": "0x41",
+ "alpha-a-box": "0xfaed",
+ "alpha-a-box-outline": "0xfbc7",
+ "alpha-a-circle": "0xfbc8",
+ "alpha-a-circle-outline": "0xfbc9",
+ "alpha-b": "0x42",
+ "alpha-b-box": "0xfaee",
+ "alpha-b-box-outline": "0xfbca",
+ "alpha-b-circle": "0xfbcb",
+ "alpha-b-circle-outline": "0xfbcc",
+ "alpha-c": "0x43",
+ "alpha-c-box": "0xfaef",
+ "alpha-c-box-outline": "0xfbcd",
+ "alpha-c-circle": "0xfbce",
+ "alpha-c-circle-outline": "0xfbcf",
+ "alpha-d": "0x44",
+ "alpha-d-box": "0xfaf0",
+ "alpha-d-box-outline": "0xfbd0",
+ "alpha-d-circle": "0xfbd1",
+ "alpha-d-circle-outline": "0xfbd2",
+ "alpha-e": "0x45",
+ "alpha-e-box": "0xfaf1",
+ "alpha-e-box-outline": "0xfbd3",
+ "alpha-e-circle": "0xfbd4",
+ "alpha-e-circle-outline": "0xfbd5",
+ "alpha-f": "0x46",
+ "alpha-f-box": "0xfaf2",
+ "alpha-f-box-outline": "0xfbd6",
+ "alpha-f-circle": "0xfbd7",
+ "alpha-f-circle-outline": "0xfbd8",
+ "alpha-g": "0x47",
+ "alpha-g-box": "0xfaf3",
+ "alpha-g-box-outline": "0xfbd9",
+ "alpha-g-circle": "0xfbda",
+ "alpha-g-circle-outline": "0xfbdb",
+ "alpha-h": "0x48",
+ "alpha-h-box": "0xfaf4",
+ "alpha-h-box-outline": "0xfbdc",
+ "alpha-h-circle": "0xfbdd",
+ "alpha-h-circle-outline": "0xfbde",
+ "alpha-i": "0x49",
+ "alpha-i-box": "0xfaf5",
+ "alpha-i-box-outline": "0xfbdf",
+ "alpha-i-circle": "0xfbe0",
+ "alpha-i-circle-outline": "0xfbe1",
+ "alpha-j": "0x4a",
+ "alpha-j-box": "0xfaf6",
+ "alpha-j-box-outline": "0xfbe2",
+ "alpha-j-circle": "0xfbe3",
+ "alpha-j-circle-outline": "0xfbe4",
+ "alpha-k": "0x4b",
+ "alpha-k-box": "0xfaf7",
+ "alpha-k-box-outline": "0xfbe5",
+ "alpha-k-circle": "0xfbe6",
+ "alpha-k-circle-outline": "0xfbe7",
+ "alpha-l": "0x4c",
+ "alpha-l-box": "0xfaf8",
+ "alpha-l-box-outline": "0xfbe8",
+ "alpha-l-circle": "0xfbe9",
+ "alpha-l-circle-outline": "0xfbea",
+ "alpha-m": "0x4d",
+ "alpha-m-box": "0xfaf9",
+ "alpha-m-box-outline": "0xfbeb",
+ "alpha-m-circle": "0xfbec",
+ "alpha-m-circle-outline": "0xfbed",
+ "alpha-n": "0x4e",
+ "alpha-n-box": "0xfafa",
+ "alpha-n-box-outline": "0xfbee",
+ "alpha-n-circle": "0xfbef",
+ "alpha-n-circle-outline": "0xfbf0",
+ "alpha-o": "0x4f",
+ "alpha-o-box": "0xfafb",
+ "alpha-o-box-outline": "0xfbf1",
+ "alpha-o-circle": "0xfbf2",
+ "alpha-o-circle-outline": "0xfbf3",
+ "alpha-p": "0x50",
+ "alpha-p-box": "0xfafc",
+ "alpha-p-box-outline": "0xfbf4",
+ "alpha-p-circle": "0xfbf5",
+ "alpha-p-circle-outline": "0xfbf6",
+ "alpha-q": "0x51",
+ "alpha-q-box": "0xfafd",
+ "alpha-q-box-outline": "0xfbf7",
+ "alpha-q-circle": "0xfbf8",
+ "alpha-q-circle-outline": "0xfbf9",
+ "alpha-r": "0x52",
+ "alpha-r-box": "0xfafe",
+ "alpha-r-box-outline": "0xfbfa",
+ "alpha-r-circle": "0xfbfb",
+ "alpha-r-circle-outline": "0xfbfc",
+ "alpha-s": "0x53",
+ "alpha-s-box": "0xfaff",
+ "alpha-s-box-outline": "0xfbfd",
+ "alpha-s-circle": "0xfbfe",
+ "alpha-s-circle-outline": "0xfbff",
+ "alpha-t": "0x54",
+ "alpha-t-box": "0xfb00",
+ "alpha-t-box-outline": "0xfc00",
+ "alpha-t-circle": "0xfc01",
+ "alpha-t-circle-outline": "0xfc02",
+ "alpha-u": "0x55",
+ "alpha-u-box": "0xfb01",
+ "alpha-u-box-outline": "0xfc03",
+ "alpha-u-circle": "0xfc04",
+ "alpha-u-circle-outline": "0xfc05",
+ "alpha-v": "0x56",
+ "alpha-v-box": "0xfb02",
+ "alpha-v-box-outline": "0xfc06",
+ "alpha-v-circle": "0xfc07",
+ "alpha-v-circle-outline": "0xfc08",
+ "alpha-w": "0x57",
+ "alpha-w-box": "0xfb03",
+ "alpha-w-box-outline": "0xfc09",
+ "alpha-w-circle": "0xfc0a",
+ "alpha-w-circle-outline": "0xfc0b",
+ "alpha-x": "0x58",
+ "alpha-x-box": "0xfb04",
+ "alpha-x-box-outline": "0xfc0c",
+ "alpha-x-circle": "0xfc0d",
+ "alpha-x-circle-outline": "0xfc0e",
+ "alpha-y": "0x59",
+ "alpha-y-box": "0xfb05",
+ "alpha-y-box-outline": "0xfc0f",
+ "alpha-y-circle": "0xfc10",
+ "alpha-y-circle-outline": "0xfc11",
+ "alpha-z": "0x5a",
+ "alpha-z-box": "0xfb06",
+ "alpha-z-box-outline": "0xfc12",
+ "alpha-z-circle": "0xfc13",
+ "alpha-z-circle-outline": "0xfc14",
+ "alphabetical": "0xf02c",
+ "altimeter": "0xf5d7",
+ "amazon": "0xf02d",
+ "amazon-alexa": "0xf8c5",
+ "amazon-drive": "0xf02e",
+ "ambulance": "0xf02f",
+ "ammunition": "0xfcc4",
+ "ampersand": "0xfa8c",
+ "amplifier": "0xf030",
+ "anchor": "0xf031",
+ "android": "0xf032",
+ "android-auto": "0xfa8d",
+ "android-debug-bridge": "0xf033",
+ "android-head": "0xf78f",
+ "android-messages": "0xfd21",
+ "android-studio": "0xf034",
+ "angle-acute": "0xf936",
+ "angle-obtuse": "0xf937",
+ "angle-right": "0xf938",
+ "angular": "0xf6b1",
+ "angularjs": "0xf6be",
+ "animation": "0xf5d8",
+ "animation-outline": "0xfa8e",
+ "animation-play": "0xf939",
+ "animation-play-outline": "0xfa8f",
+ "anvil": "0xf89a",
+ "apple": "0xf035",
+ "apple-finder": "0xf036",
+ "apple-icloud": "0xf038",
+ "apple-ios": "0xf037",
+ "apple-keyboard-caps": "0xf632",
+ "apple-keyboard-command": "0xf633",
+ "apple-keyboard-control": "0xf634",
+ "apple-keyboard-option": "0xf635",
+ "apple-keyboard-shift": "0xf636",
+ "apple-safari": "0xf039",
+ "application": "0xf614",
+ "application-export": "0xfd89",
+ "application-import": "0xfd8a",
+ "apps": "0xf03b",
+ "apps-box": "0xfd22",
+ "arch": "0xf8c6",
+ "archive": "0xf03c",
+ "arrange-bring-forward": "0xf03d",
+ "arrange-bring-to-front": "0xf03e",
+ "arrange-send-backward": "0xf03f",
+ "arrange-send-to-back": "0xf040",
+ "arrow-all": "0xf041",
+ "arrow-bottom-left": "0xf042",
+ "arrow-bottom-left-bold-outline": "0xf9b6",
+ "arrow-bottom-left-thick": "0xf9b7",
+ "arrow-bottom-right": "0xf043",
+ "arrow-bottom-right-bold-outline": "0xf9b8",
+ "arrow-bottom-right-thick": "0xf9b9",
+ "arrow-collapse": "0xf615",
+ "arrow-collapse-all": "0xf044",
+ "arrow-collapse-down": "0xf791",
+ "arrow-collapse-horizontal": "0xf84b",
+ "arrow-collapse-left": "0xf792",
+ "arrow-collapse-right": "0xf793",
+ "arrow-collapse-up": "0xf794",
+ "arrow-collapse-vertical": "0xf84c",
+ "arrow-decision": "0xf9ba",
+ "arrow-decision-auto": "0xf9bb",
+ "arrow-decision-auto-outline": "0xf9bc",
+ "arrow-decision-outline": "0xf9bd",
+ "arrow-down": "0xf045",
+ "arrow-down-bold": "0xf72d",
+ "arrow-down-bold-box": "0xf72e",
+ "arrow-down-bold-box-outline": "0xf72f",
+ "arrow-down-bold-circle": "0xf047",
+ "arrow-down-bold-circle-outline": "0xf048",
+ "arrow-down-bold-hexagon-outline": "0xf049",
+ "arrow-down-bold-outline": "0xf9be",
+ "arrow-down-box": "0xf6bf",
+ "arrow-down-circle": "0xfcb7",
+ "arrow-down-circle-outline": "0xfcb8",
+ "arrow-down-drop-circle": "0xf04a",
+ "arrow-down-drop-circle-outline": "0xf04b",
+ "arrow-down-thick": "0xf046",
+ "arrow-expand": "0xf616",
+ "arrow-expand-all": "0xf04c",
+ "arrow-expand-down": "0xf795",
+ "arrow-expand-horizontal": "0xf84d",
+ "arrow-expand-left": "0xf796",
+ "arrow-expand-right": "0xf797",
+ "arrow-expand-up": "0xf798",
+ "arrow-expand-vertical": "0xf84e",
+ "arrow-left": "0xf04d",
+ "arrow-left-bold": "0xf730",
+ "arrow-left-bold-box": "0xf731",
+ "arrow-left-bold-box-outline": "0xf732",
+ "arrow-left-bold-circle": "0xf04f",
+ "arrow-left-bold-circle-outline": "0xf050",
+ "arrow-left-bold-hexagon-outline": "0xf051",
+ "arrow-left-bold-outline": "0xf9bf",
+ "arrow-left-box": "0xf6c0",
+ "arrow-left-circle": "0xfcb9",
+ "arrow-left-circle-outline": "0xfcba",
+ "arrow-left-drop-circle": "0xf052",
+ "arrow-left-drop-circle-outline": "0xf053",
+ "arrow-left-right-bold-outline": "0xf9c0",
+ "arrow-left-thick": "0xf04e",
+ "arrow-right": "0xf054",
+ "arrow-right-bold": "0xf733",
+ "arrow-right-bold-box": "0xf734",
+ "arrow-right-bold-box-outline": "0xf735",
+ "arrow-right-bold-circle": "0xf056",
+ "arrow-right-bold-circle-outline": "0xf057",
+ "arrow-right-bold-hexagon-outline": "0xf058",
+ "arrow-right-bold-outline": "0xf9c1",
+ "arrow-right-box": "0xf6c1",
+ "arrow-right-circle": "0xfcbb",
+ "arrow-right-circle-outline": "0xfcbc",
+ "arrow-right-drop-circle": "0xf059",
+ "arrow-right-drop-circle-outline": "0xf05a",
+ "arrow-right-thick": "0xf055",
+ "arrow-split-horizontal": "0xf93a",
+ "arrow-split-vertical": "0xf93b",
+ "arrow-top-left": "0xf05b",
+ "arrow-top-left-bold-outline": "0xf9c2",
+ "arrow-top-left-thick": "0xf9c3",
+ "arrow-top-right": "0xf05c",
+ "arrow-top-right-bold-outline": "0xf9c4",
+ "arrow-top-right-thick": "0xf9c5",
+ "arrow-up": "0xf05d",
+ "arrow-up-bold": "0xf736",
+ "arrow-up-bold-box": "0xf737",
+ "arrow-up-bold-box-outline": "0xf738",
+ "arrow-up-bold-circle": "0xf05f",
+ "arrow-up-bold-circle-outline": "0xf060",
+ "arrow-up-bold-hexagon-outline": "0xf061",
+ "arrow-up-bold-outline": "0xf9c6",
+ "arrow-up-box": "0xf6c2",
+ "arrow-up-circle": "0xfcbd",
+ "arrow-up-circle-outline": "0xfcbe",
+ "arrow-up-down-bold-outline": "0xf9c7",
+ "arrow-up-drop-circle": "0xf062",
+ "arrow-up-drop-circle-outline": "0xf063",
+ "arrow-up-thick": "0xf05e",
+ "artist": "0xf802",
+ "artist-outline": "0xfcc5",
+ "artstation": "0xfb37",
+ "aspect-ratio": "0xfa23",
+ "assistant": "0xf064",
+ "asterisk": "0xf6c3",
+ "at": "0xf065",
+ "atlassian": "0xf803",
+ "atm": "0xfd23",
+ "atom": "0xf767",
+ "attachment": "0xf066",
+ "audio-video": "0xf93c",
+ "audiobook": "0xf067",
+ "augmented-reality": "0xf84f",
+ "auto-fix": "0xf068",
+ "auto-upload": "0xf069",
+ "autorenew": "0xf06a",
+ "av-timer": "0xf06b",
+ "aws": "0xfdf2",
+ "axe": "0xf8c7",
+ "axis": "0xfd24",
+ "axis-arrow": "0xfd25",
+ "axis-arrow-lock": "0xfd26",
+ "axis-lock": "0xfd27",
+ "axis-x-arrow": "0xfd28",
+ "axis-x-arrow-lock": "0xfd29",
+ "axis-x-rotate-clockwise": "0xfd2a",
+ "axis-x-rotate-counterclockwise": "0xfd2b",
+ "axis-x-y-arrow-lock": "0xfd2c",
+ "axis-y-arrow": "0xfd2d",
+ "axis-y-arrow-lock": "0xfd2e",
+ "axis-y-rotate-clockwise": "0xfd2f",
+ "axis-y-rotate-counterclockwise": "0xfd30",
+ "axis-z-arrow": "0xfd31",
+ "axis-z-arrow-lock": "0xfd32",
+ "axis-z-rotate-clockwise": "0xfd33",
+ "axis-z-rotate-counterclockwise": "0xfd34",
+ "azure": "0xf804",
+ "babel": "0xfa24",
+ "baby": "0xf06c",
+ "baby-buggy": "0xf68e",
+ "backburger": "0xf06d",
+ "backspace": "0xf06e",
+ "backspace-outline": "0xfb38",
+ "backup-restore": "0xf06f",
+ "badminton": "0xf850",
+ "bag-personal": "0xfdf3",
+ "bag-personal-off": "0xfdf4",
+ "bag-personal-off-outline": "0xfdf5",
+ "bag-personal-outline": "0xfdf6",
+ "balloon": "0xfa25",
+ "ballot": "0xf9c8",
+ "ballot-outline": "0xf9c9",
+ "ballot-recount": "0xfc15",
+ "ballot-recount-outline": "0xfc16",
+ "bandage": "0xfd8b",
+ "bandcamp": "0xf674",
+ "bank": "0xf070",
+ "bank-minus": "0xfd8c",
+ "bank-plus": "0xfd8d",
+ "bank-remove": "0xfd8e",
+ "bank-transfer": "0xfa26",
+ "bank-transfer-in": "0xfa27",
+ "bank-transfer-out": "0xfa28",
+ "barcode": "0xf071",
+ "barcode-scan": "0xf072",
+ "barley": "0xf073",
+ "barley-off": "0xfb39",
+ "barn": "0xfb3a",
+ "barrel": "0xf074",
+ "baseball": "0xf851",
+ "baseball-bat": "0xf852",
+ "basecamp": "0xf075",
+ "basket": "0xf076",
+ "basket-fill": "0xf077",
+ "basket-unfill": "0xf078",
+ "basketball": "0xf805",
+ "basketball-hoop": "0xfc17",
+ "basketball-hoop-outline": "0xfc18",
+ "bat": "0xfb3b",
+ "battery": "0xf079",
+ "battery-10": "0xf07a",
+ "battery-10-bluetooth": "0xf93d",
+ "battery-20": "0xf07b",
+ "battery-20-bluetooth": "0xf93e",
+ "battery-30": "0xf07c",
+ "battery-30-bluetooth": "0xf93f",
+ "battery-40": "0xf07d",
+ "battery-40-bluetooth": "0xf940",
+ "battery-50": "0xf07e",
+ "battery-50-bluetooth": "0xf941",
+ "battery-60": "0xf07f",
+ "battery-60-bluetooth": "0xf942",
+ "battery-70": "0xf080",
+ "battery-70-bluetooth": "0xf943",
+ "battery-80": "0xf081",
+ "battery-80-bluetooth": "0xf944",
+ "battery-90": "0xf082",
+ "battery-90-bluetooth": "0xf945",
+ "battery-alert": "0xf083",
+ "battery-alert-bluetooth": "0xf946",
+ "battery-bluetooth": "0xf947",
+ "battery-bluetooth-variant": "0xf948",
+ "battery-charging": "0xf084",
+ "battery-charging-10": "0xf89b",
+ "battery-charging-100": "0xf085",
+ "battery-charging-20": "0xf086",
+ "battery-charging-30": "0xf087",
+ "battery-charging-40": "0xf088",
+ "battery-charging-50": "0xf89c",
+ "battery-charging-60": "0xf089",
+ "battery-charging-70": "0xf89d",
+ "battery-charging-80": "0xf08a",
+ "battery-charging-90": "0xf08b",
+ "battery-charging-outline": "0xf89e",
+ "battery-charging-wireless": "0xf806",
+ "battery-charging-wireless-10": "0xf807",
+ "battery-charging-wireless-20": "0xf808",
+ "battery-charging-wireless-30": "0xf809",
+ "battery-charging-wireless-40": "0xf80a",
+ "battery-charging-wireless-50": "0xf80b",
+ "battery-charging-wireless-60": "0xf80c",
+ "battery-charging-wireless-70": "0xf80d",
+ "battery-charging-wireless-80": "0xf80e",
+ "battery-charging-wireless-90": "0xf80f",
+ "battery-charging-wireless-alert": "0xf810",
+ "battery-charging-wireless-outline": "0xf811",
+ "battery-minus": "0xf08c",
+ "battery-negative": "0xf08d",
+ "battery-outline": "0xf08e",
+ "battery-plus": "0xf08f",
+ "battery-positive": "0xf090",
+ "battery-unknown": "0xf091",
+ "battery-unknown-bluetooth": "0xf949",
+ "battlenet": "0xfb3c",
+ "beach": "0xf092",
+ "beaker": "0xfcc6",
+ "beaker-outline": "0xf68f",
+ "beats": "0xf097",
+ "bed-empty": "0xf89f",
+ "beer": "0xf098",
+ "behance": "0xf099",
+ "bell": "0xf09a",
+ "bell-alert": "0xfd35",
+ "bell-circle": "0xfd36",
+ "bell-circle-outline": "0xfd37",
+ "bell-off": "0xf09b",
+ "bell-off-outline": "0xfa90",
+ "bell-outline": "0xf09c",
+ "bell-plus": "0xf09d",
+ "bell-plus-outline": "0xfa91",
+ "bell-ring": "0xf09e",
+ "bell-ring-outline": "0xf09f",
+ "bell-sleep": "0xf0a0",
+ "bell-sleep-outline": "0xfa92",
+ "beta": "0xf0a1",
+ "betamax": "0xf9ca",
+ "biathlon": "0xfdf7",
+ "bible": "0xf0a2",
+ "bike": "0xf0a3",
+ "billiards": "0xfb3d",
+ "billiards-rack": "0xfb3e",
+ "bing": "0xf0a4",
+ "binoculars": "0xf0a5",
+ "bio": "0xf0a6",
+ "biohazard": "0xf0a7",
+ "bitbucket": "0xf0a8",
+ "bitcoin": "0xf812",
+ "black-mesa": "0xf0a9",
+ "blackberry": "0xf0aa",
+ "blender": "0xfcc7",
+ "blender-software": "0xf0ab",
+ "blinds": "0xf0ac",
+ "block-helper": "0xf0ad",
+ "blogger": "0xf0ae",
+ "blood-bag": "0xfcc8",
+ "bluetooth": "0xf0af",
+ "bluetooth-audio": "0xf0b0",
+ "bluetooth-connect": "0xf0b1",
+ "bluetooth-off": "0xf0b2",
+ "bluetooth-settings": "0xf0b3",
+ "bluetooth-transfer": "0xf0b4",
+ "blur": "0xf0b5",
+ "blur-linear": "0xf0b6",
+ "blur-off": "0xf0b7",
+ "blur-radial": "0xf0b8",
+ "bolnisi-cross": "0xfcc9",
+ "bolt": "0xfd8f",
+ "bomb": "0xf690",
+ "bomb-off": "0xf6c4",
+ "bone": "0xf0b9",
+ "book": "0xf0ba",
+ "book-lock": "0xf799",
+ "book-lock-open": "0xf79a",
+ "book-minus": "0xf5d9",
+ "book-multiple": "0xf0bb",
+ "book-multiple-minus": "0xfa93",
+ "book-multiple-plus": "0xfa94",
+ "book-multiple-remove": "0xfa95",
+ "book-multiple-variant": "0xf0bc",
+ "book-open": "0xf0bd",
+ "book-open-outline": "0xfb3f",
+ "book-open-page-variant": "0xf5da",
+ "book-open-variant": "0xf0be",
+ "book-outline": "0xfb40",
+ "book-plus": "0xf5db",
+ "book-remove": "0xfa96",
+ "book-variant": "0xf0bf",
+ "bookmark": "0xf0c0",
+ "bookmark-check": "0xf0c1",
+ "bookmark-minus": "0xf9cb",
+ "bookmark-minus-outline": "0xf9cc",
+ "bookmark-multiple": "0xfdf8",
+ "bookmark-multiple-outline": "0xfdf9",
+ "bookmark-music": "0xf0c2",
+ "bookmark-off": "0xf9cd",
+ "bookmark-off-outline": "0xf9ce",
+ "bookmark-outline": "0xf0c3",
+ "bookmark-plus": "0xf0c5",
+ "bookmark-plus-outline": "0xf0c4",
+ "bookmark-remove": "0xf0c6",
+ "boombox": "0xf5dc",
+ "bootstrap": "0xf6c5",
+ "border-all": "0xf0c7",
+ "border-all-variant": "0xf8a0",
+ "border-bottom": "0xf0c8",
+ "border-bottom-variant": "0xf8a1",
+ "border-color": "0xf0c9",
+ "border-horizontal": "0xf0ca",
+ "border-inside": "0xf0cb",
+ "border-left": "0xf0cc",
+ "border-left-variant": "0xf8a2",
+ "border-none": "0xf0cd",
+ "border-none-variant": "0xf8a3",
+ "border-outside": "0xf0ce",
+ "border-right": "0xf0cf",
+ "border-right-variant": "0xf8a4",
+ "border-style": "0xf0d0",
+ "border-top": "0xf0d1",
+ "border-top-variant": "0xf8a5",
+ "border-vertical": "0xf0d2",
+ "bottle-wine": "0xf853",
+ "bow-tie": "0xf677",
+ "bowl": "0xf617",
+ "bowling": "0xf0d3",
+ "box": "0xf0d4",
+ "box-cutter": "0xf0d5",
+ "box-shadow": "0xf637",
+ "boxing-glove": "0xfb41",
+ "braille": "0xf9cf",
+ "brain": "0xf9d0",
+ "bread-slice": "0xfcca",
+ "bread-slice-outline": "0xfccb",
+ "bridge": "0xf618",
+ "briefcase": "0xf0d6",
+ "briefcase-account": "0xfccc",
+ "briefcase-account-outline": "0xfccd",
+ "briefcase-check": "0xf0d7",
+ "briefcase-download": "0xf0d8",
+ "briefcase-download-outline": "0xfc19",
+ "briefcase-edit": "0xfa97",
+ "briefcase-edit-outline": "0xfc1a",
+ "briefcase-minus": "0xfa29",
+ "briefcase-minus-outline": "0xfc1b",
+ "briefcase-outline": "0xf813",
+ "briefcase-plus": "0xfa2a",
+ "briefcase-plus-outline": "0xfc1c",
+ "briefcase-remove": "0xfa2b",
+ "briefcase-remove-outline": "0xfc1d",
+ "briefcase-search": "0xfa2c",
+ "briefcase-search-outline": "0xfc1e",
+ "briefcase-upload": "0xf0d9",
+ "briefcase-upload-outline": "0xfc1f",
+ "brightness-1": "0xf0da",
+ "brightness-2": "0xf0db",
+ "brightness-3": "0xf0dc",
+ "brightness-4": "0xf0dd",
+ "brightness-5": "0xf0de",
+ "brightness-6": "0xf0df",
+ "brightness-7": "0xf0e0",
+ "brightness-auto": "0xf0e1",
+ "brightness-percent": "0xfcce",
+ "broom": "0xf0e2",
+ "brush": "0xf0e3",
+ "buddhism": "0xf94a",
+ "buffer": "0xf619",
+ "bug": "0xf0e4",
+ "bug-check": "0xfa2d",
+ "bug-check-outline": "0xfa2e",
+ "bug-outline": "0xfa2f",
+ "bugle": "0xfd90",
+ "bulldozer": "0xfb07",
+ "bullet": "0xfccf",
+ "bulletin-board": "0xf0e5",
+ "bullhorn": "0xf0e6",
+ "bullhorn-outline": "0xfb08",
+ "bullseye": "0xf5dd",
+ "bullseye-arrow": "0xf8c8",
+ "bus": "0xf0e7",
+ "bus-alert": "0xfa98",
+ "bus-articulated-end": "0xf79b",
+ "bus-articulated-front": "0xf79c",
+ "bus-clock": "0xf8c9",
+ "bus-double-decker": "0xf79d",
+ "bus-school": "0xf79e",
+ "bus-side": "0xf79f",
+ "cached": "0xf0e8",
+ "cactus": "0xfd91",
+ "cake": "0xf0e9",
+ "cake-layered": "0xf0ea",
+ "cake-variant": "0xf0eb",
+ "calculator": "0xf0ec",
+ "calculator-variant": "0xfa99",
+ "calendar": "0xf0ed",
+ "calendar-alert": "0xfa30",
+ "calendar-blank": "0xf0ee",
+ "calendar-blank-outline": "0xfb42",
+ "calendar-check": "0xf0ef",
+ "calendar-check-outline": "0xfc20",
+ "calendar-clock": "0xf0f0",
+ "calendar-edit": "0xf8a6",
+ "calendar-export": "0xfb09",
+ "calendar-heart": "0xf9d1",
+ "calendar-import": "0xfb0a",
+ "calendar-minus": "0xfd38",
+ "calendar-month": "0xfdfa",
+ "calendar-month-outline": "0xfdfb",
+ "calendar-multiple": "0xf0f1",
+ "calendar-multiple-check": "0xf0f2",
+ "calendar-multiselect": "0xfa31",
+ "calendar-outline": "0xfb43",
+ "calendar-plus": "0xf0f3",
+ "calendar-question": "0xf691",
+ "calendar-range": "0xf678",
+ "calendar-range-outline": "0xfb44",
+ "calendar-remove": "0xf0f4",
+ "calendar-remove-outline": "0xfc21",
+ "calendar-search": "0xf94b",
+ "calendar-star": "0xf9d2",
+ "calendar-text": "0xf0f5",
+ "calendar-text-outline": "0xfc22",
+ "calendar-today": "0xf0f6",
+ "calendar-week": "0xfa32",
+ "calendar-week-begin": "0xfa33",
+ "call-made": "0xf0f7",
+ "call-merge": "0xf0f8",
+ "call-missed": "0xf0f9",
+ "call-received": "0xf0fa",
+ "call-split": "0xf0fb",
+ "camcorder": "0xf0fc",
+ "camcorder-box": "0xf0fd",
+ "camcorder-box-off": "0xf0fe",
+ "camcorder-off": "0xf0ff",
+ "camera": "0xf100",
+ "camera-account": "0xf8ca",
+ "camera-burst": "0xf692",
+ "camera-control": "0xfb45",
+ "camera-enhance": "0xf101",
+ "camera-enhance-outline": "0xfb46",
+ "camera-front": "0xf102",
+ "camera-front-variant": "0xf103",
+ "camera-gopro": "0xf7a0",
+ "camera-image": "0xf8cb",
+ "camera-iris": "0xf104",
+ "camera-metering-center": "0xf7a1",
+ "camera-metering-matrix": "0xf7a2",
+ "camera-metering-partial": "0xf7a3",
+ "camera-metering-spot": "0xf7a4",
+ "camera-off": "0xf5df",
+ "camera-outline": "0xfd39",
+ "camera-party-mode": "0xf105",
+ "camera-rear": "0xf106",
+ "camera-rear-variant": "0xf107",
+ "camera-retake": "0xfdfc",
+ "camera-retake-outline": "0xfdfd",
+ "camera-switch": "0xf108",
+ "camera-timer": "0xf109",
+ "camera-wireless": "0xfd92",
+ "camera-wireless-outline": "0xfd93",
+ "cancel": "0xf739",
+ "candle": "0xf5e2",
+ "candycane": "0xf10a",
+ "cannabis": "0xf7a5",
+ "caps-lock": "0xfa9a",
+ "car": "0xf10b",
+ "car-back": "0xfdfe",
+ "car-battery": "0xf10c",
+ "car-brake-abs": "0xfc23",
+ "car-brake-alert": "0xfc24",
+ "car-brake-hold": "0xfd3a",
+ "car-brake-parking": "0xfd3b",
+ "car-connected": "0xf10d",
+ "car-convertible": "0xf7a6",
+ "car-cruise-control": "0xfd3c",
+ "car-defrost-front": "0xfd3d",
+ "car-defrost-rear": "0xfd3e",
+ "car-door": "0xfb47",
+ "car-electric": "0xfb48",
+ "car-esp": "0xfc25",
+ "car-estate": "0xf7a7",
+ "car-hatchback": "0xf7a8",
+ "car-key": "0xfb49",
+ "car-light-dimmed": "0xfc26",
+ "car-light-fog": "0xfc27",
+ "car-light-high": "0xfc28",
+ "car-limousine": "0xf8cc",
+ "car-multiple": "0xfb4a",
+ "car-off": "0xfdff",
+ "car-parking-lights": "0xfd3f",
+ "car-pickup": "0xf7a9",
+ "car-side": "0xf7aa",
+ "car-sports": "0xf7ab",
+ "car-tire-alert": "0xfc29",
+ "car-traction-control": "0xfd40",
+ "car-wash": "0xf10e",
+ "caravan": "0xf7ac",
+ "card": "0xfb4b",
+ "card-bulleted": "0xfb4c",
+ "card-bulleted-off": "0xfb4d",
+ "card-bulleted-off-outline": "0xfb4e",
+ "card-bulleted-outline": "0xfb4f",
+ "card-bulleted-settings": "0xfb50",
+ "card-bulleted-settings-outline": "0xfb51",
+ "card-outline": "0xfb52",
+ "card-text": "0xfb53",
+ "card-text-outline": "0xfb54",
+ "cards": "0xf638",
+ "cards-club": "0xf8cd",
+ "cards-diamond": "0xf8ce",
+ "cards-heart": "0xf8cf",
+ "cards-outline": "0xf639",
+ "cards-playing-outline": "0xf63a",
+ "cards-spade": "0xf8d0",
+ "cards-variant": "0xf6c6",
+ "carrot": "0xf10f",
+ "carry-on-bag-check": "0xfd41",
+ "cart": "0xf110",
+ "cart-arrow-down": "0xfd42",
+ "cart-arrow-right": "0xfc2a",
+ "cart-arrow-up": "0xfd43",
+ "cart-minus": "0xfd44",
+ "cart-off": "0xf66b",
+ "cart-outline": "0xf111",
+ "cart-plus": "0xf112",
+ "cart-remove": "0xfd45",
+ "case-sensitive-alt": "0xf113",
+ "cash": "0xf114",
+ "cash-100": "0xf115",
+ "cash-marker": "0xfd94",
+ "cash-multiple": "0xf116",
+ "cash-refund": "0xfa9b",
+ "cash-register": "0xfcd0",
+ "cash-usd": "0xf117",
+ "cassette": "0xf9d3",
+ "cast": "0xf118",
+ "cast-connected": "0xf119",
+ "cast-education": "0xfe6d",
+ "cast-off": "0xf789",
+ "castle": "0xf11a",
+ "cat": "0xf11b",
+ "cctv": "0xf7ad",
+ "ceiling-light": "0xf768",
+ "cellphone": "0xf11c",
+ "cellphone-android": "0xf11d",
+ "cellphone-arrow-down": "0xf9d4",
+ "cellphone-basic": "0xf11e",
+ "cellphone-dock": "0xf11f",
+ "cellphone-erase": "0xf94c",
+ "cellphone-iphone": "0xf120",
+ "cellphone-key": "0xf94d",
+ "cellphone-link": "0xf121",
+ "cellphone-link-off": "0xf122",
+ "cellphone-lock": "0xf94e",
+ "cellphone-message": "0xf8d2",
+ "cellphone-off": "0xf94f",
+ "cellphone-screenshot": "0xfa34",
+ "cellphone-settings": "0xf123",
+ "cellphone-settings-variant": "0xf950",
+ "cellphone-sound": "0xf951",
+ "cellphone-text": "0xf8d1",
+ "cellphone-wireless": "0xf814",
+ "celtic-cross": "0xfcd1",
+ "certificate": "0xf124",
+ "chair-school": "0xf125",
+ "charity": "0xfc2b",
+ "chart-arc": "0xf126",
+ "chart-areaspline": "0xf127",
+ "chart-bar": "0xf128",
+ "chart-bar-stacked": "0xf769",
+ "chart-bell-curve": "0xfc2c",
+ "chart-bubble": "0xf5e3",
+ "chart-donut": "0xf7ae",
+ "chart-donut-variant": "0xf7af",
+ "chart-gantt": "0xf66c",
+ "chart-histogram": "0xf129",
+ "chart-line": "0xf12a",
+ "chart-line-stacked": "0xf76a",
+ "chart-line-variant": "0xf7b0",
+ "chart-multiline": "0xf8d3",
+ "chart-pie": "0xf12b",
+ "chart-scatterplot-hexbin": "0xf66d",
+ "chart-timeline": "0xf66e",
+ "chat": "0xfb55",
+ "chat-alert": "0xfb56",
+ "chat-processing": "0xfb57",
+ "check": "0xf12c",
+ "check-all": "0xf12d",
+ "check-bold": "0xfe6e",
+ "check-box-multiple-outline": "0xfc2d",
+ "check-box-outline": "0xfc2e",
+ "check-circle": "0xf5e0",
+ "check-circle-outline": "0xf5e1",
+ "check-decagram": "0xf790",
+ "check-network": "0xfc2f",
+ "check-network-outline": "0xfc30",
+ "check-outline": "0xf854",
+ "check-underline": "0xfe70",
+ "check-underline-circle": "0xfe71",
+ "check-underline-circle-outline": "0xfe72",
+ "checkbook": "0xfa9c",
+ "checkbox-blank": "0xf12e",
+ "checkbox-blank-circle": "0xf12f",
+ "checkbox-blank-circle-outline": "0xf130",
+ "checkbox-blank-outline": "0xf131",
+ "checkbox-intermediate": "0xf855",
+ "checkbox-marked": "0xf132",
+ "checkbox-marked-circle": "0xf133",
+ "checkbox-marked-circle-outline": "0xf134",
+ "checkbox-marked-outline": "0xf135",
+ "checkbox-multiple-blank": "0xf136",
+ "checkbox-multiple-blank-circle": "0xf63b",
+ "checkbox-multiple-blank-circle-outline": "0xf63c",
+ "checkbox-multiple-blank-outline": "0xf137",
+ "checkbox-multiple-marked": "0xf138",
+ "checkbox-multiple-marked-circle": "0xf63d",
+ "checkbox-multiple-marked-circle-outline": "0xf63e",
+ "checkbox-multiple-marked-outline": "0xf139",
+ "checkerboard": "0xf13a",
+ "chef-hat": "0xfb58",
+ "chemical-weapon": "0xf13b",
+ "chess-bishop": "0xf85b",
+ "chess-king": "0xf856",
+ "chess-knight": "0xf857",
+ "chess-pawn": "0xf858",
+ "chess-queen": "0xf859",
+ "chess-rook": "0xf85a",
+ "chevron-double-down": "0xf13c",
+ "chevron-double-left": "0xf13d",
+ "chevron-double-right": "0xf13e",
+ "chevron-double-up": "0xf13f",
+ "chevron-down": "0xf140",
+ "chevron-down-box": "0xf9d5",
+ "chevron-down-box-outline": "0xf9d6",
+ "chevron-down-circle": "0xfb0b",
+ "chevron-down-circle-outline": "0xfb0c",
+ "chevron-left": "0xf141",
+ "chevron-left-box": "0xf9d7",
+ "chevron-left-box-outline": "0xf9d8",
+ "chevron-left-circle": "0xfb0d",
+ "chevron-left-circle-outline": "0xfb0e",
+ "chevron-right": "0xf142",
+ "chevron-right-box": "0xf9d9",
+ "chevron-right-box-outline": "0xf9da",
+ "chevron-right-circle": "0xfb0f",
+ "chevron-right-circle-outline": "0xfb10",
+ "chevron-triple-down": "0xfd95",
+ "chevron-triple-left": "0xfd96",
+ "chevron-triple-right": "0xfd97",
+ "chevron-triple-up": "0xfd98",
+ "chevron-up": "0xf143",
+ "chevron-up-box": "0xf9db",
+ "chevron-up-box-outline": "0xf9dc",
+ "chevron-up-circle": "0xfb11",
+ "chevron-up-circle-outline": "0xfb12",
+ "chili-hot": "0xf7b1",
+ "chili-medium": "0xf7b2",
+ "chili-mild": "0xf7b3",
+ "chip": "0xf61a",
+ "christianity": "0xf952",
+ "christianity-outline": "0xfcd2",
+ "church": "0xf144",
+ "circle": "0xf764",
+ "circle-edit-outline": "0xf8d4",
+ "circle-medium": "0xf9dd",
+ "circle-outline": "0xf765",
+ "circle-slice-1": "0xfa9d",
+ "circle-slice-2": "0xfa9e",
+ "circle-slice-3": "0xfa9f",
+ "circle-slice-4": "0xfaa0",
+ "circle-slice-5": "0xfaa1",
+ "circle-slice-6": "0xfaa2",
+ "circle-slice-7": "0xfaa3",
+ "circle-slice-8": "0xfaa4",
+ "circle-small": "0xf9de",
+ "circular-saw": "0xfe73",
+ "cisco-webex": "0xf145",
+ "city": "0xf146",
+ "city-variant": "0xfa35",
+ "city-variant-outline": "0xfa36",
+ "clipboard": "0xf147",
+ "clipboard-account": "0xf148",
+ "clipboard-account-outline": "0xfc31",
+ "clipboard-alert": "0xf149",
+ "clipboard-alert-outline": "0xfcd3",
+ "clipboard-arrow-down": "0xf14a",
+ "clipboard-arrow-down-outline": "0xfc32",
+ "clipboard-arrow-left": "0xf14b",
+ "clipboard-arrow-left-outline": "0xfcd4",
+ "clipboard-arrow-right": "0xfcd5",
+ "clipboard-arrow-right-outline": "0xfcd6",
+ "clipboard-arrow-up": "0xfc33",
+ "clipboard-arrow-up-outline": "0xfc34",
+ "clipboard-check": "0xf14c",
+ "clipboard-check-outline": "0xf8a7",
+ "clipboard-flow": "0xf6c7",
+ "clipboard-outline": "0xf14d",
+ "clipboard-play": "0xfc35",
+ "clipboard-play-outline": "0xfc36",
+ "clipboard-plus": "0xf750",
+ "clipboard-pulse": "0xf85c",
+ "clipboard-pulse-outline": "0xf85d",
+ "clipboard-text": "0xf14e",
+ "clipboard-text-outline": "0xfa37",
+ "clipboard-text-play": "0xfc37",
+ "clipboard-text-play-outline": "0xfc38",
+ "clippy": "0xf14f",
+ "clock": "0xf953",
+ "clock-alert": "0xf954",
+ "clock-alert-outline": "0xf5ce",
+ "clock-end": "0xf151",
+ "clock-fast": "0xf152",
+ "clock-in": "0xf153",
+ "clock-out": "0xf154",
+ "clock-outline": "0xf150",
+ "clock-start": "0xf155",
+ "close": "0xf156",
+ "close-box": "0xf157",
+ "close-box-multiple": "0xfc39",
+ "close-box-multiple-outline": "0xfc3a",
+ "close-box-outline": "0xf158",
+ "close-circle": "0xf159",
+ "close-circle-outline": "0xf15a",
+ "close-network": "0xf15b",
+ "close-network-outline": "0xfc3b",
+ "close-octagon": "0xf15c",
+ "close-octagon-outline": "0xf15d",
+ "close-outline": "0xf6c8",
+ "closed-caption": "0xf15e",
+ "closed-caption-outline": "0xfd99",
+ "cloud": "0xf15f",
+ "cloud-alert": "0xf9df",
+ "cloud-braces": "0xf7b4",
+ "cloud-check": "0xf160",
+ "cloud-circle": "0xf161",
+ "cloud-download": "0xf162",
+ "cloud-download-outline": "0xfb59",
+ "cloud-off-outline": "0xf164",
+ "cloud-outline": "0xf163",
+ "cloud-print": "0xf165",
+ "cloud-print-outline": "0xf166",
+ "cloud-question": "0xfa38",
+ "cloud-search": "0xf955",
+ "cloud-search-outline": "0xf956",
+ "cloud-sync": "0xf63f",
+ "cloud-tags": "0xf7b5",
+ "cloud-upload": "0xf167",
+ "cloud-upload-outline": "0xfb5a",
+ "clover": "0xf815",
+ "code-array": "0xf168",
+ "code-braces": "0xf169",
+ "code-brackets": "0xf16a",
+ "code-equal": "0xf16b",
+ "code-greater-than": "0xf16c",
+ "code-greater-than-or-equal": "0xf16d",
+ "code-less-than": "0xf16e",
+ "code-less-than-or-equal": "0xf16f",
+ "code-not-equal": "0xf170",
+ "code-not-equal-variant": "0xf171",
+ "code-parentheses": "0xf172",
+ "code-string": "0xf173",
+ "code-tags": "0xf174",
+ "code-tags-check": "0xf693",
+ "codepen": "0xf175",
+ "coffee": "0xf176",
+ "coffee-outline": "0xf6c9",
+ "coffee-to-go": "0xf177",
+ "coffin": "0xfb5b",
+ "cogs": "0xf8d5",
+ "coin": "0xf178",
+ "coins": "0xf694",
+ "collage": "0xf640",
+ "collapse-all": "0xfaa5",
+ "collapse-all-outline": "0xfaa6",
+ "color-helper": "0xf179",
+ "comma": "0xfe74",
+ "comma-box": "0xfe75",
+ "comma-box-outline": "0xfe76",
+ "comma-circle": "0xfe77",
+ "comma-circle-outline": "0xfe78",
+ "comment": "0xf17a",
+ "comment-account": "0xf17b",
+ "comment-account-outline": "0xf17c",
+ "comment-alert": "0xf17d",
+ "comment-alert-outline": "0xf17e",
+ "comment-arrow-left": "0xf9e0",
+ "comment-arrow-left-outline": "0xf9e1",
+ "comment-arrow-right": "0xf9e2",
+ "comment-arrow-right-outline": "0xf9e3",
+ "comment-check": "0xf17f",
+ "comment-check-outline": "0xf180",
+ "comment-eye": "0xfa39",
+ "comment-eye-outline": "0xfa3a",
+ "comment-multiple": "0xf85e",
+ "comment-multiple-outline": "0xf181",
+ "comment-outline": "0xf182",
+ "comment-plus": "0xf9e4",
+ "comment-plus-outline": "0xf183",
+ "comment-processing": "0xf184",
+ "comment-processing-outline": "0xf185",
+ "comment-question": "0xf816",
+ "comment-question-outline": "0xf186",
+ "comment-remove": "0xf5de",
+ "comment-remove-outline": "0xf187",
+ "comment-search": "0xfa3b",
+ "comment-search-outline": "0xfa3c",
+ "comment-text": "0xf188",
+ "comment-text-multiple": "0xf85f",
+ "comment-text-multiple-outline": "0xf860",
+ "comment-text-outline": "0xf189",
+ "compare": "0xf18a",
+ "compass": "0xf18b",
+ "compass-off": "0xfb5c",
+ "compass-off-outline": "0xfb5d",
+ "compass-outline": "0xf18c",
+ "console": "0xf18d",
+ "console-line": "0xf7b6",
+ "console-network": "0xf8a8",
+ "console-network-outline": "0xfc3c",
+ "contact-mail": "0xf18e",
+ "contactless-payment": "0xfd46",
+ "contacts": "0xf6ca",
+ "contain": "0xfa3d",
+ "contain-end": "0xfa3e",
+ "contain-start": "0xfa3f",
+ "content-copy": "0xf18f",
+ "content-cut": "0xf190",
+ "content-duplicate": "0xf191",
+ "content-paste": "0xf192",
+ "content-save": "0xf193",
+ "content-save-all": "0xf194",
+ "content-save-edit": "0xfcd7",
+ "content-save-edit-outline": "0xfcd8",
+ "content-save-move": "0xfe79",
+ "content-save-move-outline": "0xfe7a",
+ "content-save-outline": "0xf817",
+ "content-save-settings": "0xf61b",
+ "content-save-settings-outline": "0xfb13",
+ "contrast": "0xf195",
+ "contrast-box": "0xf196",
+ "contrast-circle": "0xf197",
+ "controller-classic": "0xfb5e",
+ "controller-classic-outline": "0xfb5f",
+ "cookie": "0xf198",
+ "copyright": "0xf5e6",
+ "cordova": "0xf957",
+ "corn": "0xf7b7",
+ "counter": "0xf199",
+ "cow": "0xf19a",
+ "crane": "0xf861",
+ "creation": "0xf1c9",
+ "creative-commons": "0xfd47",
+ "credit-card": "0xf19b",
+ "credit-card-marker": "0xfd9a",
+ "credit-card-multiple": "0xf19c",
+ "credit-card-off": "0xf5e4",
+ "credit-card-plus": "0xf675",
+ "credit-card-refund": "0xfaa7",
+ "credit-card-scan": "0xf19d",
+ "credit-card-settings": "0xf8d6",
+ "credit-card-wireless": "0xfd48",
+ "cricket": "0xfd49",
+ "crop": "0xf19e",
+ "crop-free": "0xf19f",
+ "crop-landscape": "0xf1a0",
+ "crop-portrait": "0xf1a1",
+ "crop-rotate": "0xf695",
+ "crop-square": "0xf1a2",
+ "crosshairs": "0xf1a3",
+ "crosshairs-gps": "0xf1a4",
+ "crown": "0xf1a5",
+ "cryengine": "0xf958",
+ "crystal-ball": "0xfb14",
+ "cube": "0xf1a6",
+ "cube-outline": "0xf1a7",
+ "cube-scan": "0xfb60",
+ "cube-send": "0xf1a8",
+ "cube-unfolded": "0xf1a9",
+ "cup": "0xf1aa",
+ "cup-off": "0xf5e5",
+ "cup-water": "0xf1ab",
+ "cupcake": "0xf959",
+ "curling": "0xf862",
+ "currency-bdt": "0xf863",
+ "currency-brl": "0xfb61",
+ "currency-btc": "0xf1ac",
+ "currency-chf": "0xf7b8",
+ "currency-cny": "0xf7b9",
+ "currency-eth": "0xf7ba",
+ "currency-eur": "0xf1ad",
+ "currency-gbp": "0xf1ae",
+ "currency-ils": "0xfc3d",
+ "currency-inr": "0xf1af",
+ "currency-jpy": "0xf7bb",
+ "currency-krw": "0xf7bc",
+ "currency-kzt": "0xf864",
+ "currency-ngn": "0xf1b0",
+ "currency-php": "0xf9e5",
+ "currency-rub": "0xf1b1",
+ "currency-sign": "0xf7bd",
+ "currency-try": "0xf1b2",
+ "currency-twd": "0xf7be",
+ "currency-usd": "0xf1b3",
+ "currency-usd-off": "0xf679",
+ "current-ac": "0xf95a",
+ "current-dc": "0xf95b",
+ "cursor-default": "0xf1b4",
+ "cursor-default-click": "0xfcd9",
+ "cursor-default-click-outline": "0xfcda",
+ "cursor-default-outline": "0xf1b5",
+ "cursor-move": "0xf1b6",
+ "cursor-pointer": "0xf1b7",
+ "cursor-text": "0xf5e7",
+ "database": "0xf1b8",
+ "database-check": "0xfaa8",
+ "database-edit": "0xfb62",
+ "database-export": "0xf95d",
+ "database-import": "0xf95c",
+ "database-lock": "0xfaa9",
+ "database-minus": "0xf1b9",
+ "database-plus": "0xf1ba",
+ "database-refresh": "0xfcdb",
+ "database-remove": "0xfcdc",
+ "database-search": "0xf865",
+ "database-settings": "0xfcdd",
+ "death-star": "0xf8d7",
+ "death-star-variant": "0xf8d8",
+ "deathly-hallows": "0xfb63",
+ "debian": "0xf8d9",
+ "debug-step-into": "0xf1bb",
+ "debug-step-out": "0xf1bc",
+ "debug-step-over": "0xf1bd",
+ "decagram": "0xf76b",
+ "decagram-outline": "0xf76c",
+ "decimal-decrease": "0xf1be",
+ "decimal-increase": "0xf1bf",
+ "delete": "0xf1c0",
+ "delete-circle": "0xf682",
+ "delete-circle-outline": "0xfb64",
+ "delete-empty": "0xf6cb",
+ "delete-forever": "0xf5e8",
+ "delete-forever-outline": "0xfb65",
+ "delete-outline": "0xf9e6",
+ "delete-restore": "0xf818",
+ "delete-sweep": "0xf5e9",
+ "delete-sweep-outline": "0xfc3e",
+ "delete-variant": "0xf1c1",
+ "delta": "0xf1c2",
+ "desk-lamp": "0xf95e",
+ "deskphone": "0xf1c3",
+ "desktop-classic": "0xf7bf",
+ "desktop-mac": "0xf1c4",
+ "desktop-mac-dashboard": "0xf9e7",
+ "desktop-tower": "0xf1c5",
+ "desktop-tower-monitor": "0xfaaa",
+ "details": "0xf1c6",
+ "dev-to": "0xfd4a",
+ "developer-board": "0xf696",
+ "deviantart": "0xf1c7",
+ "dialpad": "0xf61c",
+ "diameter": "0xfc3f",
+ "diameter-outline": "0xfc40",
+ "diameter-variant": "0xfc41",
+ "diamond": "0xfb66",
+ "diamond-outline": "0xfb67",
+ "diamond-stone": "0xf1c8",
+ "dice-1": "0xf1ca",
+ "dice-2": "0xf1cb",
+ "dice-3": "0xf1cc",
+ "dice-4": "0xf1cd",
+ "dice-5": "0xf1ce",
+ "dice-6": "0xf1cf",
+ "dice-d10": "0xf76e",
+ "dice-d12": "0xf866",
+ "dice-d20": "0xf5ea",
+ "dice-d4": "0xf5eb",
+ "dice-d6": "0xf5ec",
+ "dice-d8": "0xf5ed",
+ "dice-multiple": "0xf76d",
+ "dictionary": "0xf61d",
+ "dip-switch": "0xf7c0",
+ "directions": "0xf1d0",
+ "directions-fork": "0xf641",
+ "disc": "0xf5ee",
+ "disc-alert": "0xf1d1",
+ "disc-player": "0xf95f",
+ "discord": "0xf66f",
+ "dishwasher": "0xfaab",
+ "disqus": "0xf1d2",
+ "disqus-outline": "0xf1d3",
+ "diving-flippers": "0xfd9b",
+ "diving-helmet": "0xfd9c",
+ "diving-scuba": "0xfd9d",
+ "diving-scuba-flag": "0xfd9e",
+ "diving-scuba-tank": "0xfd9f",
+ "diving-scuba-tank-multiple": "0xfda0",
+ "diving-snorkel": "0xfda1",
+ "division": "0xf1d4",
+ "division-box": "0xf1d5",
+ "dlna": "0xfa40",
+ "dna": "0xf683",
+ "dns": "0xf1d6",
+ "dns-outline": "0xfb68",
+ "do-not-disturb": "0xf697",
+ "do-not-disturb-off": "0xf698",
+ "docker": "0xf867",
+ "doctor": "0xfa41",
+ "dog": "0xfa42",
+ "dog-service": "0xfaac",
+ "dog-side": "0xfa43",
+ "dolby": "0xf6b2",
+ "domain": "0xf1d7",
+ "domain-off": "0xfd4b",
+ "donkey": "0xf7c1",
+ "door": "0xf819",
+ "door-closed": "0xf81a",
+ "door-open": "0xf81b",
+ "doorbell-video": "0xf868",
+ "dot-net": "0xfaad",
+ "dots-horizontal": "0xf1d8",
+ "dots-horizontal-circle": "0xf7c2",
+ "dots-horizontal-circle-outline": "0xfb69",
+ "dots-vertical": "0xf1d9",
+ "dots-vertical-circle": "0xf7c3",
+ "dots-vertical-circle-outline": "0xfb6a",
+ "douban": "0xf699",
+ "download": "0xf1da",
+ "download-multiple": "0xf9e8",
+ "download-network": "0xf6f3",
+ "download-network-outline": "0xfc42",
+ "download-outline": "0xfb6b",
+ "drag": "0xf1db",
+ "drag-horizontal": "0xf1dc",
+ "drag-variant": "0xfb6c",
+ "drag-vertical": "0xf1dd",
+ "drama-masks": "0xfcde",
+ "drawing": "0xf1de",
+ "drawing-box": "0xf1df",
+ "dribbble": "0xf1e0",
+ "dribbble-box": "0xf1e1",
+ "drone": "0xf1e2",
+ "dropbox": "0xf1e3",
+ "drupal": "0xf1e4",
+ "duck": "0xf1e5",
+ "dumbbell": "0xf1e6",
+ "dump-truck": "0xfc43",
+ "ear-hearing": "0xf7c4",
+ "ear-hearing-off": "0xfa44",
+ "earth": "0xf1e7",
+ "earth-box": "0xf6cc",
+ "earth-box-off": "0xf6cd",
+ "earth-off": "0xf1e8",
+ "edge": "0xf1e9",
+ "egg": "0xfaae",
+ "egg-easter": "0xfaaf",
+ "eight-track": "0xf9e9",
+ "eject": "0xf1ea",
+ "eject-outline": "0xfb6d",
+ "elephant": "0xf7c5",
+ "elevation-decline": "0xf1eb",
+ "elevation-rise": "0xf1ec",
+ "elevator": "0xf1ed",
+ "email": "0xf1ee",
+ "email-alert": "0xf6ce",
+ "email-box": "0xfcdf",
+ "email-check": "0xfab0",
+ "email-check-outline": "0xfab1",
+ "email-lock": "0xf1f1",
+ "email-mark-as-unread": "0xfb6e",
+ "email-open": "0xf1ef",
+ "email-open-outline": "0xf5ef",
+ "email-outline": "0xf1f0",
+ "email-plus": "0xf9ea",
+ "email-plus-outline": "0xf9eb",
+ "email-search": "0xf960",
+ "email-search-outline": "0xf961",
+ "email-variant": "0xf5f0",
+ "ember": "0xfb15",
+ "emby": "0xf6b3",
+ "emoticon": "0xfc44",
+ "emoticon-angry": "0xfc45",
+ "emoticon-angry-outline": "0xfc46",
+ "emoticon-cool": "0xfc47",
+ "emoticon-cool-outline": "0xf1f3",
+ "emoticon-cry": "0xfc48",
+ "emoticon-cry-outline": "0xfc49",
+ "emoticon-dead": "0xfc4a",
+ "emoticon-dead-outline": "0xf69a",
+ "emoticon-devil": "0xfc4b",
+ "emoticon-devil-outline": "0xf1f4",
+ "emoticon-excited": "0xfc4c",
+ "emoticon-excited-outline": "0xf69b",
+ "emoticon-happy": "0xfc4d",
+ "emoticon-happy-outline": "0xf1f5",
+ "emoticon-kiss": "0xfc4e",
+ "emoticon-kiss-outline": "0xfc4f",
+ "emoticon-neutral": "0xfc50",
+ "emoticon-neutral-outline": "0xf1f6",
+ "emoticon-outline": "0xf1f2",
+ "emoticon-poop": "0xf1f7",
+ "emoticon-poop-outline": "0xfc51",
+ "emoticon-sad": "0xfc52",
+ "emoticon-sad-outline": "0xf1f8",
+ "emoticon-tongue": "0xf1f9",
+ "emoticon-tongue-outline": "0xfc53",
+ "emoticon-wink": "0xfc54",
+ "emoticon-wink-outline": "0xfc55",
+ "engine": "0xf1fa",
+ "engine-off": "0xfa45",
+ "engine-off-outline": "0xfa46",
+ "engine-outline": "0xf1fb",
+ "equal": "0xf1fc",
+ "equal-box": "0xf1fd",
+ "eraser": "0xf1fe",
+ "eraser-variant": "0xf642",
+ "escalator": "0xf1ff",
+ "eslint": "0xfc56",
+ "et": "0xfab2",
+ "ethereum": "0xf869",
+ "ethernet": "0xf200",
+ "ethernet-cable": "0xf201",
+ "ethernet-cable-off": "0xf202",
+ "etsy": "0xf203",
+ "ev-station": "0xf5f1",
+ "eventbrite": "0xf7c6",
+ "evernote": "0xf204",
+ "exclamation": "0xf205",
+ "exit-run": "0xfa47",
+ "exit-to-app": "0xf206",
+ "expand-all": "0xfab3",
+ "expand-all-outline": "0xfab4",
+ "exponent": "0xf962",
+ "exponent-box": "0xf963",
+ "export": "0xf207",
+ "export-variant": "0xfb6f",
+ "eye": "0xf208",
+ "eye-check": "0xfce0",
+ "eye-check-outline": "0xfce1",
+ "eye-circle": "0xfb70",
+ "eye-circle-outline": "0xfb71",
+ "eye-off": "0xf209",
+ "eye-off-outline": "0xf6d0",
+ "eye-outline": "0xf6cf",
+ "eye-plus": "0xf86a",
+ "eye-plus-outline": "0xf86b",
+ "eye-settings": "0xf86c",
+ "eye-settings-outline": "0xf86d",
+ "eyedropper": "0xf20a",
+ "eyedropper-variant": "0xf20b",
+ "face": "0xf643",
+ "face-agent": "0xfd4c",
+ "face-outline": "0xfb72",
+ "face-profile": "0xf644",
+ "face-recognition": "0xfc57",
+ "facebook": "0xf20c",
+ "facebook-box": "0xf20d",
+ "facebook-messenger": "0xf20e",
+ "facebook-workplace": "0xfb16",
+ "factory": "0xf20f",
+ "fan": "0xf210",
+ "fan-off": "0xf81c",
+ "fast-forward": "0xf211",
+ "fast-forward-10": "0xfd4d",
+ "fast-forward-30": "0xfce2",
+ "fast-forward-outline": "0xf6d1",
+ "fax": "0xf212",
+ "feather": "0xf6d2",
+ "feature-search": "0xfa48",
+ "feature-search-outline": "0xfa49",
+ "fedora": "0xf8da",
+ "ferry": "0xf213",
+ "file": "0xf214",
+ "file-account": "0xf73a",
+ "file-alert": "0xfa4a",
+ "file-alert-outline": "0xfa4b",
+ "file-cabinet": "0xfab5",
+ "file-cancel": "0xfda2",
+ "file-cancel-outline": "0xfda3",
+ "file-chart": "0xf215",
+ "file-check": "0xf216",
+ "file-check-outline": "0xfe7b",
+ "file-cloud": "0xf217",
+ "file-compare": "0xf8a9",
+ "file-delimited": "0xf218",
+ "file-document": "0xf219",
+ "file-document-box": "0xf21a",
+ "file-document-box-multiple": "0xfab6",
+ "file-document-box-multiple-outline": "0xfab7",
+ "file-document-box-outline": "0xf9ec",
+ "file-document-edit": "0xfda4",
+ "file-document-edit-outline": "0xfda5",
+ "file-document-outline": "0xf9ed",
+ "file-download": "0xf964",
+ "file-download-outline": "0xf965",
+ "file-excel": "0xf21b",
+ "file-excel-box": "0xf21c",
+ "file-export": "0xf21d",
+ "file-eye": "0xfda6",
+ "file-eye-outline": "0xfda7",
+ "file-find": "0xf21e",
+ "file-find-outline": "0xfb73",
+ "file-hidden": "0xf613",
+ "file-image": "0xf21f",
+ "file-import": "0xf220",
+ "file-lock": "0xf221",
+ "file-move": "0xfab8",
+ "file-multiple": "0xf222",
+ "file-music": "0xf223",
+ "file-music-outline": "0xfe7c",
+ "file-outline": "0xf224",
+ "file-pdf": "0xf225",
+ "file-pdf-box": "0xf226",
+ "file-pdf-outline": "0xfe7d",
+ "file-percent": "0xf81d",
+ "file-plus": "0xf751",
+ "file-powerpoint": "0xf227",
+ "file-powerpoint-box": "0xf228",
+ "file-presentation-box": "0xf229",
+ "file-question": "0xf86e",
+ "file-remove": "0xfb74",
+ "file-replace": "0xfb17",
+ "file-replace-outline": "0xfb18",
+ "file-restore": "0xf670",
+ "file-search": "0xfc58",
+ "file-search-outline": "0xfc59",
+ "file-send": "0xf22a",
+ "file-table": "0xfc5a",
+ "file-table-outline": "0xfc5b",
+ "file-tree": "0xf645",
+ "file-undo": "0xf8db",
+ "file-upload": "0xfa4c",
+ "file-upload-outline": "0xfa4d",
+ "file-video": "0xf22b",
+ "file-video-outline": "0xfe10",
+ "file-word": "0xf22c",
+ "file-word-box": "0xf22d",
+ "file-xml": "0xf22e",
+ "film": "0xf22f",
+ "filmstrip": "0xf230",
+ "filmstrip-off": "0xf231",
+ "filter": "0xf232",
+ "filter-outline": "0xf233",
+ "filter-remove": "0xf234",
+ "filter-remove-outline": "0xf235",
+ "filter-variant": "0xf236",
+ "finance": "0xf81e",
+ "find-replace": "0xf6d3",
+ "fingerprint": "0xf237",
+ "fire": "0xf238",
+ "fire-truck": "0xf8aa",
+ "firebase": "0xf966",
+ "firefox": "0xf239",
+ "fireplace": "0xfe11",
+ "fireplace-off": "0xfe12",
+ "firework": "0xfe13",
+ "fish": "0xf23a",
+ "flag": "0xf23b",
+ "flag-checkered": "0xf23c",
+ "flag-minus": "0xfb75",
+ "flag-outline": "0xf23d",
+ "flag-plus": "0xfb76",
+ "flag-remove": "0xfb77",
+ "flag-triangle": "0xf23f",
+ "flag-variant": "0xf240",
+ "flag-variant-outline": "0xf23e",
+ "flare": "0xfd4e",
+ "flash": "0xf241",
+ "flash-auto": "0xf242",
+ "flash-circle": "0xf81f",
+ "flash-off": "0xf243",
+ "flash-outline": "0xf6d4",
+ "flash-red-eye": "0xf67a",
+ "flashlight": "0xf244",
+ "flashlight-off": "0xf245",
+ "flask": "0xf093",
+ "flask-empty": "0xf094",
+ "flask-empty-outline": "0xf095",
+ "flask-outline": "0xf096",
+ "flattr": "0xf246",
+ "flickr": "0xfce3",
+ "flip-to-back": "0xf247",
+ "flip-to-front": "0xf248",
+ "floor-lamp": "0xf8dc",
+ "floor-plan": "0xf820",
+ "floppy": "0xf249",
+ "floppy-variant": "0xf9ee",
+ "flower": "0xf24a",
+ "flower-outline": "0xf9ef",
+ "flower-poppy": "0xfce4",
+ "flower-tulip": "0xf9f0",
+ "flower-tulip-outline": "0xf9f1",
+ "folder": "0xf24b",
+ "folder-account": "0xf24c",
+ "folder-account-outline": "0xfb78",
+ "folder-alert": "0xfda8",
+ "folder-alert-outline": "0xfda9",
+ "folder-clock": "0xfab9",
+ "folder-clock-outline": "0xfaba",
+ "folder-download": "0xf24d",
+ "folder-edit": "0xf8dd",
+ "folder-edit-outline": "0xfdaa",
+ "folder-google-drive": "0xf24e",
+ "folder-image": "0xf24f",
+ "folder-key": "0xf8ab",
+ "folder-key-network": "0xf8ac",
+ "folder-key-network-outline": "0xfc5c",
+ "folder-lock": "0xf250",
+ "folder-lock-open": "0xf251",
+ "folder-move": "0xf252",
+ "folder-multiple": "0xf253",
+ "folder-multiple-image": "0xf254",
+ "folder-multiple-outline": "0xf255",
+ "folder-network": "0xf86f",
+ "folder-network-outline": "0xfc5d",
+ "folder-open": "0xf76f",
+ "folder-open-outline": "0xfdab",
+ "folder-outline": "0xf256",
+ "folder-plus": "0xf257",
+ "folder-plus-outline": "0xfb79",
+ "folder-pound": "0xfce5",
+ "folder-pound-outline": "0xfce6",
+ "folder-remove": "0xf258",
+ "folder-remove-outline": "0xfb7a",
+ "folder-search": "0xf967",
+ "folder-search-outline": "0xf968",
+ "folder-star": "0xf69c",
+ "folder-star-outline": "0xfb7b",
+ "folder-sync": "0xfce7",
+ "folder-sync-outline": "0xfce8",
+ "folder-text": "0xfc5e",
+ "folder-text-outline": "0xfc5f",
+ "folder-upload": "0xf259",
+ "font-awesome": "0xf03a",
+ "food": "0xf25a",
+ "food-apple": "0xf25b",
+ "food-apple-outline": "0xfc60",
+ "food-croissant": "0xf7c7",
+ "food-fork-drink": "0xf5f2",
+ "food-off": "0xf5f3",
+ "food-variant": "0xf25c",
+ "football": "0xf25d",
+ "football-australian": "0xf25e",
+ "football-helmet": "0xf25f",
+ "forklift": "0xf7c8",
+ "format-align-bottom": "0xf752",
+ "format-align-center": "0xf260",
+ "format-align-justify": "0xf261",
+ "format-align-left": "0xf262",
+ "format-align-middle": "0xf753",
+ "format-align-right": "0xf263",
+ "format-align-top": "0xf754",
+ "format-annotation-minus": "0xfabb",
+ "format-annotation-plus": "0xf646",
+ "format-bold": "0xf264",
+ "format-clear": "0xf265",
+ "format-color-fill": "0xf266",
+ "format-color-highlight": "0xfe14",
+ "format-color-text": "0xf69d",
+ "format-columns": "0xf8de",
+ "format-float-center": "0xf267",
+ "format-float-left": "0xf268",
+ "format-float-none": "0xf269",
+ "format-float-right": "0xf26a",
+ "format-font": "0xf6d5",
+ "format-font-size-decrease": "0xf9f2",
+ "format-font-size-increase": "0xf9f3",
+ "format-header-1": "0xf26b",
+ "format-header-2": "0xf26c",
+ "format-header-3": "0xf26d",
+ "format-header-4": "0xf26e",
+ "format-header-5": "0xf26f",
+ "format-header-6": "0xf270",
+ "format-header-decrease": "0xf271",
+ "format-header-equal": "0xf272",
+ "format-header-increase": "0xf273",
+ "format-header-pound": "0xf274",
+ "format-horizontal-align-center": "0xf61e",
+ "format-horizontal-align-left": "0xf61f",
+ "format-horizontal-align-right": "0xf620",
+ "format-indent-decrease": "0xf275",
+ "format-indent-increase": "0xf276",
+ "format-italic": "0xf277",
+ "format-letter-case": "0xfb19",
+ "format-letter-case-lower": "0xfb1a",
+ "format-letter-case-upper": "0xfb1b",
+ "format-line-spacing": "0xf278",
+ "format-line-style": "0xf5c8",
+ "format-line-weight": "0xf5c9",
+ "format-list-bulleted": "0xf279",
+ "format-list-bulleted-square": "0xfdac",
+ "format-list-bulleted-type": "0xf27a",
+ "format-list-checkbox": "0xf969",
+ "format-list-checks": "0xf755",
+ "format-list-numbered": "0xf27b",
+ "format-list-numbered-rtl": "0xfce9",
+ "format-page-break": "0xf6d6",
+ "format-paint": "0xf27c",
+ "format-paragraph": "0xf27d",
+ "format-pilcrow": "0xf6d7",
+ "format-quote-close": "0xf27e",
+ "format-quote-open": "0xf756",
+ "format-rotate-90": "0xf6a9",
+ "format-section": "0xf69e",
+ "format-size": "0xf27f",
+ "format-strikethrough": "0xf280",
+ "format-strikethrough-variant": "0xf281",
+ "format-subscript": "0xf282",
+ "format-superscript": "0xf283",
+ "format-text": "0xf284",
+ "format-text-rotation-down": "0xfd4f",
+ "format-text-rotation-none": "0xfd50",
+ "format-text-variant": "0xfe15",
+ "format-text-wrapping-clip": "0xfcea",
+ "format-text-wrapping-overflow": "0xfceb",
+ "format-text-wrapping-wrap": "0xfcec",
+ "format-textbox": "0xfced",
+ "format-textdirection-l-to-r": "0xf285",
+ "format-textdirection-r-to-l": "0xf286",
+ "format-title": "0xf5f4",
+ "format-underline": "0xf287",
+ "format-vertical-align-bottom": "0xf621",
+ "format-vertical-align-center": "0xf622",
+ "format-vertical-align-top": "0xf623",
+ "format-wrap-inline": "0xf288",
+ "format-wrap-square": "0xf289",
+ "format-wrap-tight": "0xf28a",
+ "format-wrap-top-bottom": "0xf28b",
+ "forum": "0xf28c",
+ "forum-outline": "0xf821",
+ "forward": "0xf28d",
+ "forwardburger": "0xfd51",
+ "fountain": "0xf96a",
+ "fountain-pen": "0xfcee",
+ "fountain-pen-tip": "0xfcef",
+ "foursquare": "0xf28e",
+ "freebsd": "0xf8df",
+ "fridge": "0xf290",
+ "fridge-bottom": "0xf292",
+ "fridge-outline": "0xf28f",
+ "fridge-top": "0xf291",
+ "fuel": "0xf7c9",
+ "fullscreen": "0xf293",
+ "fullscreen-exit": "0xf294",
+ "function": "0xf295",
+ "function-variant": "0xf870",
+ "fuse": "0xfc61",
+ "fuse-blade": "0xfc62",
+ "gamepad": "0xf296",
+ "gamepad-circle": "0xfe16",
+ "gamepad-circle-down": "0xfe17",
+ "gamepad-circle-left": "0xfe18",
+ "gamepad-circle-outline": "0xfe19",
+ "gamepad-circle-right": "0xfe1a",
+ "gamepad-circle-up": "0xfe1b",
+ "gamepad-down": "0xfe1c",
+ "gamepad-left": "0xfe1d",
+ "gamepad-right": "0xfe1e",
+ "gamepad-round": "0xfe1f",
+ "gamepad-round-down": "0xfe20",
+ "gamepad-round-left": "0xfe21",
+ "gamepad-round-outline": "0xfe22",
+ "gamepad-round-right": "0xfe23",
+ "gamepad-round-up": "0xfe24",
+ "gamepad-up": "0xfe25",
+ "gamepad-variant": "0xf297",
+ "gantry-crane": "0xfdad",
+ "garage": "0xf6d8",
+ "garage-alert": "0xf871",
+ "garage-open": "0xf6d9",
+ "gas-cylinder": "0xf647",
+ "gas-station": "0xf298",
+ "gate": "0xf299",
+ "gate-and": "0xf8e0",
+ "gate-nand": "0xf8e1",
+ "gate-nor": "0xf8e2",
+ "gate-not": "0xf8e3",
+ "gate-or": "0xf8e4",
+ "gate-xnor": "0xf8e5",
+ "gate-xor": "0xf8e6",
+ "gatsby": "0xfe26",
+ "gauge": "0xf29a",
+ "gauge-empty": "0xf872",
+ "gauge-full": "0xf873",
+ "gauge-low": "0xf874",
+ "gavel": "0xf29b",
+ "gender-female": "0xf29c",
+ "gender-male": "0xf29d",
+ "gender-male-female": "0xf29e",
+ "gender-transgender": "0xf29f",
+ "gentoo": "0xf8e7",
+ "gesture": "0xf7ca",
+ "gesture-double-tap": "0xf73b",
+ "gesture-pinch": "0xfabc",
+ "gesture-spread": "0xfabd",
+ "gesture-swipe": "0xfd52",
+ "gesture-swipe-down": "0xf73c",
+ "gesture-swipe-horizontal": "0xfabe",
+ "gesture-swipe-left": "0xf73d",
+ "gesture-swipe-right": "0xf73e",
+ "gesture-swipe-up": "0xf73f",
+ "gesture-swipe-vertical": "0xfabf",
+ "gesture-tap": "0xf740",
+ "gesture-tap-hold": "0xfd53",
+ "gesture-two-double-tap": "0xf741",
+ "gesture-two-tap": "0xf742",
+ "ghost": "0xf2a0",
+ "ghost-off": "0xf9f4",
+ "gif": "0xfd54",
+ "gift": "0xfe27",
+ "gift-outline": "0xf2a1",
+ "git": "0xf2a2",
+ "github-box": "0xf2a3",
+ "github-circle": "0xf2a4",
+ "github-face": "0xf6da",
+ "gitlab": "0xfb7c",
+ "glass-cocktail": "0xf356",
+ "glass-flute": "0xf2a5",
+ "glass-mug": "0xf2a6",
+ "glass-stange": "0xf2a7",
+ "glass-tulip": "0xf2a8",
+ "glass-wine": "0xf875",
+ "glassdoor": "0xf2a9",
+ "glasses": "0xf2aa",
+ "globe-model": "0xf8e8",
+ "gmail": "0xf2ab",
+ "gnome": "0xf2ac",
+ "go-kart": "0xfd55",
+ "go-kart-track": "0xfd56",
+ "gog": "0xfb7d",
+ "golf": "0xf822",
+ "gondola": "0xf685",
+ "goodreads": "0xfd57",
+ "google": "0xf2ad",
+ "google-adwords": "0xfc63",
+ "google-allo": "0xf801",
+ "google-analytics": "0xf7cb",
+ "google-assistant": "0xf7cc",
+ "google-cardboard": "0xf2ae",
+ "google-chrome": "0xf2af",
+ "google-circles": "0xf2b0",
+ "google-circles-communities": "0xf2b1",
+ "google-circles-extended": "0xf2b2",
+ "google-circles-group": "0xf2b3",
+ "google-classroom": "0xf2c0",
+ "google-controller": "0xf2b4",
+ "google-controller-off": "0xf2b5",
+ "google-drive": "0xf2b6",
+ "google-earth": "0xf2b7",
+ "google-fit": "0xf96b",
+ "google-glass": "0xf2b8",
+ "google-hangouts": "0xf2c9",
+ "google-home": "0xf823",
+ "google-keep": "0xf6db",
+ "google-lens": "0xf9f5",
+ "google-maps": "0xf5f5",
+ "google-nearby": "0xf2b9",
+ "google-pages": "0xf2ba",
+ "google-photos": "0xf6dc",
+ "google-physical-web": "0xf2bb",
+ "google-play": "0xf2bc",
+ "google-plus": "0xf2bd",
+ "google-plus-box": "0xf2be",
+ "google-spreadsheet": "0xf9f6",
+ "google-street-view": "0xfc64",
+ "google-translate": "0xf2bf",
+ "gpu": "0xf8ad",
+ "gradient": "0xf69f",
+ "grain": "0xfd58",
+ "graphql": "0xf876",
+ "grave-stone": "0xfb7e",
+ "grease-pencil": "0xf648",
+ "greater-than": "0xf96c",
+ "greater-than-or-equal": "0xf96d",
+ "grid": "0xf2c1",
+ "grid-large": "0xf757",
+ "grid-off": "0xf2c2",
+ "grill": "0xfe28",
+ "group": "0xf2c3",
+ "guitar-acoustic": "0xf770",
+ "guitar-electric": "0xf2c4",
+ "guitar-pick": "0xf2c5",
+ "guitar-pick-outline": "0xf2c6",
+ "guy-fawkes-mask": "0xf824",
+ "hackernews": "0xf624",
+ "hail": "0xfac0",
+ "halloween": "0xfb7f",
+ "hamburger": "0xf684",
+ "hammer": "0xf8e9",
+ "hand": "0xfa4e",
+ "hand-left": "0xfe29",
+ "hand-okay": "0xfa4f",
+ "hand-peace": "0xfa50",
+ "hand-peace-variant": "0xfa51",
+ "hand-pointing-down": "0xfa52",
+ "hand-pointing-left": "0xfa53",
+ "hand-pointing-right": "0xf2c7",
+ "hand-pointing-up": "0xfa54",
+ "hand-right": "0xfe2a",
+ "hand-saw": "0xfe2b",
+ "hanger": "0xf2c8",
+ "hard-hat": "0xf96e",
+ "harddisk": "0xf2ca",
+ "hat-fedora": "0xfb80",
+ "hazard-lights": "0xfc65",
+ "hdr": "0xfd59",
+ "hdr-off": "0xfd5a",
+ "headphones": "0xf2cb",
+ "headphones-bluetooth": "0xf96f",
+ "headphones-box": "0xf2cc",
+ "headphones-off": "0xf7cd",
+ "headphones-settings": "0xf2cd",
+ "headset": "0xf2ce",
+ "headset-dock": "0xf2cf",
+ "headset-off": "0xf2d0",
+ "heart": "0xf2d1",
+ "heart-box": "0xf2d2",
+ "heart-box-outline": "0xf2d3",
+ "heart-broken": "0xf2d4",
+ "heart-broken-outline": "0xfcf0",
+ "heart-circle": "0xf970",
+ "heart-circle-outline": "0xf971",
+ "heart-half": "0xf6de",
+ "heart-half-full": "0xf6dd",
+ "heart-half-outline": "0xf6df",
+ "heart-multiple": "0xfa55",
+ "heart-multiple-outline": "0xfa56",
+ "heart-off": "0xf758",
+ "heart-outline": "0xf2d5",
+ "heart-pulse": "0xf5f6",
+ "helicopter": "0xfac1",
+ "help": "0xf2d6",
+ "help-box": "0xf78a",
+ "help-circle": "0xf2d7",
+ "help-circle-outline": "0xf625",
+ "help-network": "0xf6f4",
+ "help-network-outline": "0xfc66",
+ "help-rhombus": "0xfb81",
+ "help-rhombus-outline": "0xfb82",
+ "hexagon": "0xf2d8",
+ "hexagon-multiple": "0xf6e0",
+ "hexagon-outline": "0xf2d9",
+ "hexagon-slice-1": "0xfac2",
+ "hexagon-slice-2": "0xfac3",
+ "hexagon-slice-3": "0xfac4",
+ "hexagon-slice-4": "0xfac5",
+ "hexagon-slice-5": "0xfac6",
+ "hexagon-slice-6": "0xfac7",
+ "hexagram": "0xfac8",
+ "hexagram-outline": "0xfac9",
+ "high-definition": "0xf7ce",
+ "high-definition-box": "0xf877",
+ "highway": "0xf5f7",
+ "hiking": "0xfd5b",
+ "hinduism": "0xf972",
+ "history": "0xf2da",
+ "hockey-puck": "0xf878",
+ "hockey-sticks": "0xf879",
+ "hololens": "0xf2db",
+ "home": "0xf2dc",
+ "home-account": "0xf825",
+ "home-alert": "0xf87a",
+ "home-assistant": "0xf7cf",
+ "home-automation": "0xf7d0",
+ "home-circle": "0xf7d1",
+ "home-city": "0xfcf1",
+ "home-city-outline": "0xfcf2",
+ "home-currency-usd": "0xf8ae",
+ "home-floor-0": "0xfdae",
+ "home-floor-1": "0xfd5c",
+ "home-floor-2": "0xfd5d",
+ "home-floor-3": "0xfd5e",
+ "home-floor-a": "0xfd5f",
+ "home-floor-b": "0xfd60",
+ "home-floor-g": "0xfd61",
+ "home-floor-l": "0xfd62",
+ "home-floor-negative-1": "0xfdaf",
+ "home-group": "0xfdb0",
+ "home-heart": "0xf826",
+ "home-lock": "0xf8ea",
+ "home-lock-open": "0xf8eb",
+ "home-map-marker": "0xf5f8",
+ "home-minus": "0xf973",
+ "home-modern": "0xf2dd",
+ "home-outline": "0xf6a0",
+ "home-plus": "0xf974",
+ "home-variant": "0xf2de",
+ "home-variant-outline": "0xfb83",
+ "hook": "0xf6e1",
+ "hook-off": "0xf6e2",
+ "hops": "0xf2df",
+ "horseshoe": "0xfa57",
+ "hospital": "0xf2e0",
+ "hospital-building": "0xf2e1",
+ "hospital-marker": "0xf2e2",
+ "hot-tub": "0xf827",
+ "hotel": "0xf2e3",
+ "houzz": "0xf2e4",
+ "houzz-box": "0xf2e5",
+ "hubspot": "0xfcf3",
+ "hulu": "0xf828",
+ "human": "0xf2e6",
+ "human-child": "0xf2e7",
+ "human-female": "0xf649",
+ "human-female-boy": "0xfa58",
+ "human-female-female": "0xfa59",
+ "human-female-girl": "0xfa5a",
+ "human-greeting": "0xf64a",
+ "human-handsdown": "0xf64b",
+ "human-handsup": "0xf64c",
+ "human-male": "0xf64d",
+ "human-male-boy": "0xfa5b",
+ "human-male-female": "0xf2e8",
+ "human-male-girl": "0xfa5c",
+ "human-male-male": "0xfa5d",
+ "human-pregnant": "0xf5cf",
+ "humble-bundle": "0xf743",
+ "ice-cream": "0xf829",
+ "iframe": "0xfc67",
+ "iframe-outline": "0xfc68",
+ "image": "0xf2e9",
+ "image-album": "0xf2ea",
+ "image-area": "0xf2eb",
+ "image-area-close": "0xf2ec",
+ "image-broken": "0xf2ed",
+ "image-broken-variant": "0xf2ee",
+ "image-filter": "0xf2ef",
+ "image-filter-black-white": "0xf2f0",
+ "image-filter-center-focus": "0xf2f1",
+ "image-filter-center-focus-weak": "0xf2f2",
+ "image-filter-drama": "0xf2f3",
+ "image-filter-frames": "0xf2f4",
+ "image-filter-hdr": "0xf2f5",
+ "image-filter-none": "0xf2f6",
+ "image-filter-tilt-shift": "0xf2f7",
+ "image-filter-vintage": "0xf2f8",
+ "image-frame": "0xfe2c",
+ "image-move": "0xf9f7",
+ "image-multiple": "0xf2f9",
+ "image-off": "0xf82a",
+ "image-outline": "0xf975",
+ "image-plus": "0xf87b",
+ "image-search": "0xf976",
+ "image-search-outline": "0xf977",
+ "image-size-select-actual": "0xfc69",
+ "image-size-select-large": "0xfc6a",
+ "image-size-select-small": "0xfc6b",
+ "import": "0xf2fa",
+ "inbox": "0xf686",
+ "inbox-arrow-down": "0xf2fb",
+ "inbox-arrow-up": "0xf3d1",
+ "inbox-multiple": "0xf8af",
+ "inbox-multiple-outline": "0xfb84",
+ "incognito": "0xf5f9",
+ "infinity": "0xf6e3",
+ "information": "0xf2fc",
+ "information-outline": "0xf2fd",
+ "information-variant": "0xf64e",
+ "instagram": "0xf2fe",
+ "instapaper": "0xf2ff",
+ "internet-explorer": "0xf300",
+ "invert-colors": "0xf301",
+ "invert-colors-off": "0xfe2d",
+ "ip": "0xfa5e",
+ "ip-network": "0xfa5f",
+ "ip-network-outline": "0xfc6c",
+ "ipod": "0xfc6d",
+ "islam": "0xf978",
+ "itunes": "0xf676",
+ "jabber": "0xfdb1",
+ "jeepney": "0xf302",
+ "jira": "0xf303",
+ "jquery": "0xf87c",
+ "jsfiddle": "0xf304",
+ "json": "0xf626",
+ "judaism": "0xf979",
+ "kabaddi": "0xfd63",
+ "karate": "0xf82b",
+ "keg": "0xf305",
+ "kettle": "0xf5fa",
+ "key": "0xf306",
+ "key-change": "0xf307",
+ "key-minus": "0xf308",
+ "key-outline": "0xfdb2",
+ "key-plus": "0xf309",
+ "key-remove": "0xf30a",
+ "key-variant": "0xf30b",
+ "keyboard": "0xf30c",
+ "keyboard-backspace": "0xf30d",
+ "keyboard-caps": "0xf30e",
+ "keyboard-close": "0xf30f",
+ "keyboard-off": "0xf310",
+ "keyboard-off-outline": "0xfe2e",
+ "keyboard-outline": "0xf97a",
+ "keyboard-return": "0xf311",
+ "keyboard-settings": "0xf9f8",
+ "keyboard-settings-outline": "0xf9f9",
+ "keyboard-tab": "0xf312",
+ "keyboard-variant": "0xf313",
+ "kickstarter": "0xf744",
+ "knife": "0xf9fa",
+ "knife-military": "0xf9fb",
+ "kodi": "0xf314",
+ "label": "0xf315",
+ "label-off": "0xfaca",
+ "label-off-outline": "0xfacb",
+ "label-outline": "0xf316",
+ "label-variant": "0xfacc",
+ "label-variant-outline": "0xfacd",
+ "ladybug": "0xf82c",
+ "lambda": "0xf627",
+ "lamp": "0xf6b4",
+ "lan": "0xf317",
+ "lan-connect": "0xf318",
+ "lan-disconnect": "0xf319",
+ "lan-pending": "0xf31a",
+ "language-c": "0xf671",
+ "language-cpp": "0xf672",
+ "language-csharp": "0xf31b",
+ "language-css3": "0xf31c",
+ "language-go": "0xf7d2",
+ "language-haskell": "0xfc6e",
+ "language-html5": "0xf31d",
+ "language-java": "0xfb1c",
+ "language-javascript": "0xf31e",
+ "language-lua": "0xf8b0",
+ "language-php": "0xf31f",
+ "language-python": "0xf320",
+ "language-python-text": "0xf321",
+ "language-r": "0xf7d3",
+ "language-ruby-on-rails": "0xface",
+ "language-swift": "0xf6e4",
+ "language-typescript": "0xf6e5",
+ "laptop": "0xf322",
+ "laptop-chromebook": "0xf323",
+ "laptop-mac": "0xf324",
+ "laptop-off": "0xf6e6",
+ "laptop-windows": "0xf325",
+ "laravel": "0xfacf",
+ "lastfm": "0xf326",
+ "lastpass": "0xf446",
+ "launch": "0xf327",
+ "lava-lamp": "0xf7d4",
+ "layers": "0xf328",
+ "layers-minus": "0xfe2f",
+ "layers-off": "0xf329",
+ "layers-off-outline": "0xf9fc",
+ "layers-outline": "0xf9fd",
+ "layers-plus": "0xfe30",
+ "layers-remove": "0xfe31",
+ "lead-pencil": "0xf64f",
+ "leaf": "0xf32a",
+ "leaf-maple": "0xfc6f",
+ "leak": "0xfdb3",
+ "leak-off": "0xfdb4",
+ "led-off": "0xf32b",
+ "led-on": "0xf32c",
+ "led-outline": "0xf32d",
+ "led-strip": "0xf7d5",
+ "led-variant-off": "0xf32e",
+ "led-variant-on": "0xf32f",
+ "led-variant-outline": "0xf330",
+ "less-than": "0xf97b",
+ "less-than-or-equal": "0xf97c",
+ "library": "0xf331",
+ "library-books": "0xf332",
+ "library-movie": "0xfcf4",
+ "library-music": "0xf333",
+ "library-plus": "0xf334",
+ "library-shelves": "0xfb85",
+ "library-video": "0xfcf5",
+ "lifebuoy": "0xf87d",
+ "light-switch": "0xf97d",
+ "lightbulb": "0xf335",
+ "lightbulb-off": "0xfe32",
+ "lightbulb-off-outline": "0xfe33",
+ "lightbulb-on": "0xf6e7",
+ "lightbulb-on-outline": "0xf6e8",
+ "lightbulb-outline": "0xf336",
+ "lighthouse": "0xf9fe",
+ "lighthouse-on": "0xf9ff",
+ "link": "0xf337",
+ "link-box": "0xfcf6",
+ "link-box-outline": "0xfcf7",
+ "link-box-variant": "0xfcf8",
+ "link-box-variant-outline": "0xfcf9",
+ "link-off": "0xf338",
+ "link-plus": "0xfc70",
+ "link-variant": "0xf339",
+ "link-variant-off": "0xf33a",
+ "linkedin": "0xf33b",
+ "linkedin-box": "0xf33c",
+ "linux": "0xf33d",
+ "linux-mint": "0xf8ec",
+ "litecoin": "0xfa60",
+ "loading": "0xf771",
+ "lock": "0xf33e",
+ "lock-alert": "0xf8ed",
+ "lock-clock": "0xf97e",
+ "lock-open": "0xf33f",
+ "lock-open-outline": "0xf340",
+ "lock-outline": "0xf341",
+ "lock-pattern": "0xf6e9",
+ "lock-plus": "0xf5fb",
+ "lock-question": "0xf8ee",
+ "lock-reset": "0xf772",
+ "lock-smart": "0xf8b1",
+ "locker": "0xf7d6",
+ "locker-multiple": "0xf7d7",
+ "login": "0xf342",
+ "login-variant": "0xf5fc",
+ "logout": "0xf343",
+ "logout-variant": "0xf5fd",
+ "looks": "0xf344",
+ "loop": "0xf6ea",
+ "loupe": "0xf345",
+ "lumx": "0xf346",
+ "lyft": "0xfb1d",
+ "magnet": "0xf347",
+ "magnet-on": "0xf348",
+ "magnify": "0xf349",
+ "magnify-close": "0xf97f",
+ "magnify-minus": "0xf34a",
+ "magnify-minus-cursor": "0xfa61",
+ "magnify-minus-outline": "0xf6eb",
+ "magnify-plus": "0xf34b",
+ "magnify-plus-cursor": "0xfa62",
+ "magnify-plus-outline": "0xf6ec",
+ "mail-ru": "0xf34c",
+ "mailbox": "0xf6ed",
+ "mailbox-open": "0xfd64",
+ "mailbox-open-outline": "0xfd65",
+ "mailbox-open-up": "0xfd66",
+ "mailbox-open-up-outline": "0xfd67",
+ "mailbox-outline": "0xfd68",
+ "mailbox-up": "0xfd69",
+ "mailbox-up-outline": "0xfd6a",
+ "map": "0xf34d",
+ "map-clock": "0xfcfa",
+ "map-clock-outline": "0xfcfb",
+ "map-legend": "0xfa00",
+ "map-marker": "0xf34e",
+ "map-marker-check": "0xfc71",
+ "map-marker-circle": "0xf34f",
+ "map-marker-distance": "0xf8ef",
+ "map-marker-minus": "0xf650",
+ "map-marker-multiple": "0xf350",
+ "map-marker-off": "0xf351",
+ "map-marker-outline": "0xf7d8",
+ "map-marker-path": "0xfcfc",
+ "map-marker-plus": "0xf651",
+ "map-marker-radius": "0xf352",
+ "map-minus": "0xf980",
+ "map-outline": "0xf981",
+ "map-plus": "0xf982",
+ "map-search": "0xf983",
+ "map-search-outline": "0xf984",
+ "mapbox": "0xfb86",
+ "margin": "0xf353",
+ "markdown": "0xf354",
+ "marker": "0xf652",
+ "marker-cancel": "0xfdb5",
+ "marker-check": "0xf355",
+ "mastodon": "0xfad0",
+ "mastodon-variant": "0xfad1",
+ "material-design": "0xf985",
+ "material-ui": "0xf357",
+ "math-compass": "0xf358",
+ "math-cos": "0xfc72",
+ "math-sin": "0xfc73",
+ "math-tan": "0xfc74",
+ "matrix": "0xf628",
+ "maxcdn": "0xf359",
+ "medal": "0xf986",
+ "medical-bag": "0xf6ee",
+ "medium": "0xf35a",
+ "meetup": "0xfad2",
+ "memory": "0xf35b",
+ "menu": "0xf35c",
+ "menu-down": "0xf35d",
+ "menu-down-outline": "0xf6b5",
+ "menu-left": "0xf35e",
+ "menu-left-outline": "0xfa01",
+ "menu-open": "0xfb87",
+ "menu-right": "0xf35f",
+ "menu-right-outline": "0xfa02",
+ "menu-swap": "0xfa63",
+ "menu-swap-outline": "0xfa64",
+ "menu-up": "0xf360",
+ "menu-up-outline": "0xf6b6",
+ "message": "0xf361",
+ "message-alert": "0xf362",
+ "message-alert-outline": "0xfa03",
+ "message-bulleted": "0xf6a1",
+ "message-bulleted-off": "0xf6a2",
+ "message-draw": "0xf363",
+ "message-image": "0xf364",
+ "message-outline": "0xf365",
+ "message-plus": "0xf653",
+ "message-processing": "0xf366",
+ "message-reply": "0xf367",
+ "message-reply-text": "0xf368",
+ "message-settings": "0xf6ef",
+ "message-settings-variant": "0xf6f0",
+ "message-text": "0xf369",
+ "message-text-outline": "0xf36a",
+ "message-video": "0xf36b",
+ "meteor": "0xf629",
+ "metronome": "0xf7d9",
+ "metronome-tick": "0xf7da",
+ "micro-sd": "0xf7db",
+ "microphone": "0xf36c",
+ "microphone-minus": "0xf8b2",
+ "microphone-off": "0xf36d",
+ "microphone-outline": "0xf36e",
+ "microphone-plus": "0xf8b3",
+ "microphone-settings": "0xf36f",
+ "microphone-variant": "0xf370",
+ "microphone-variant-off": "0xf371",
+ "microscope": "0xf654",
+ "microsoft": "0xf372",
+ "microsoft-dynamics": "0xf987",
+ "microwave": "0xfc75",
+ "midi": "0xf8f0",
+ "midi-port": "0xf8f1",
+ "mine": "0xfdb6",
+ "minecraft": "0xf373",
+ "mini-sd": "0xfa04",
+ "minidisc": "0xfa05",
+ "minus": "0xf374",
+ "minus-box": "0xf375",
+ "minus-box-outline": "0xf6f1",
+ "minus-circle": "0xf376",
+ "minus-circle-outline": "0xf377",
+ "minus-network": "0xf378",
+ "minus-network-outline": "0xfc76",
+ "mixcloud": "0xf62a",
+ "mixed-martial-arts": "0xfd6b",
+ "mixed-reality": "0xf87e",
+ "mixer": "0xf7dc",
+ "molecule": "0xfb88",
+ "monitor": "0xf379",
+ "monitor-cellphone": "0xf988",
+ "monitor-cellphone-star": "0xf989",
+ "monitor-dashboard": "0xfa06",
+ "monitor-lock": "0xfdb7",
+ "monitor-multiple": "0xf37a",
+ "monitor-off": "0xfd6c",
+ "monitor-screenshot": "0xfe34",
+ "monitor-star": "0xfdb8",
+ "more": "0xf37b",
+ "mother-nurse": "0xfcfd",
+ "motion-sensor": "0xfd6d",
+ "motorbike": "0xf37c",
+ "mouse": "0xf37d",
+ "mouse-bluetooth": "0xf98a",
+ "mouse-off": "0xf37e",
+ "mouse-variant": "0xf37f",
+ "mouse-variant-off": "0xf380",
+ "move-resize": "0xf655",
+ "move-resize-variant": "0xf656",
+ "movie": "0xf381",
+ "movie-outline": "0xfdb9",
+ "movie-roll": "0xf7dd",
+ "muffin": "0xf98b",
+ "multiplication": "0xf382",
+ "multiplication-box": "0xf383",
+ "mushroom": "0xf7de",
+ "mushroom-outline": "0xf7df",
+ "music": "0xf759",
+ "music-box": "0xf384",
+ "music-box-outline": "0xf385",
+ "music-circle": "0xf386",
+ "music-circle-outline": "0xfad3",
+ "music-note": "0xf387",
+ "music-note-bluetooth": "0xf5fe",
+ "music-note-bluetooth-off": "0xf5ff",
+ "music-note-eighth": "0xf388",
+ "music-note-half": "0xf389",
+ "music-note-off": "0xf38a",
+ "music-note-plus": "0xfdba",
+ "music-note-quarter": "0xf38b",
+ "music-note-sixteenth": "0xf38c",
+ "music-note-whole": "0xf38d",
+ "music-off": "0xf75a",
+ "nail": "0xfdbb",
+ "nas": "0xf8f2",
+ "nativescript": "0xf87f",
+ "nature": "0xf38e",
+ "nature-people": "0xf38f",
+ "navigation": "0xf390",
+ "near-me": "0xf5cd",
+ "needle": "0xf391",
+ "netflix": "0xf745",
+ "network": "0xf6f2",
+ "network-off": "0xfc77",
+ "network-off-outline": "0xfc78",
+ "network-outline": "0xfc79",
+ "network-strength-1": "0xf8f3",
+ "network-strength-1-alert": "0xf8f4",
+ "network-strength-2": "0xf8f5",
+ "network-strength-2-alert": "0xf8f6",
+ "network-strength-3": "0xf8f7",
+ "network-strength-3-alert": "0xf8f8",
+ "network-strength-4": "0xf8f9",
+ "network-strength-4-alert": "0xf8fa",
+ "network-strength-off": "0xf8fb",
+ "network-strength-off-outline": "0xf8fc",
+ "network-strength-outline": "0xf8fd",
+ "new-box": "0xf394",
+ "newspaper": "0xf395",
+ "nfc": "0xf396",
+ "nfc-off": "0xfe35",
+ "nfc-search-variant": "0xfe36",
+ "nfc-tap": "0xf397",
+ "nfc-variant": "0xf398",
+ "nfc-variant-off": "0xfe37",
+ "ninja": "0xf773",
+ "nintendo-switch": "0xf7e0",
+ "nodejs": "0xf399",
+ "not-equal": "0xf98c",
+ "not-equal-variant": "0xf98d",
+ "note": "0xf39a",
+ "note-multiple": "0xf6b7",
+ "note-multiple-outline": "0xf6b8",
+ "note-outline": "0xf39b",
+ "note-plus": "0xf39c",
+ "note-plus-outline": "0xf39d",
+ "note-text": "0xf39e",
+ "notebook": "0xf82d",
+ "notebook-multiple": "0xfe38",
+ "notification-clear-all": "0xf39f",
+ "npm": "0xf6f6",
+ "npm-variant": "0xf98e",
+ "npm-variant-outline": "0xf98f",
+ "nuke": "0xf6a3",
+ "null": "0xf7e1",
+ "numeric": "0xf3a0",
+ "numeric-0": "0x30",
+ "numeric-0-box": "0xf3a1",
+ "numeric-0-box-multiple-outline": "0xf3a2",
+ "numeric-0-box-outline": "0xf3a3",
+ "numeric-0-circle": "0xfc7a",
+ "numeric-0-circle-outline": "0xfc7b",
+ "numeric-1": "0x31",
+ "numeric-1-box": "0xf3a4",
+ "numeric-1-box-multiple-outline": "0xf3a5",
+ "numeric-1-box-outline": "0xf3a6",
+ "numeric-1-circle": "0xfc7c",
+ "numeric-1-circle-outline": "0xfc7d",
+ "numeric-2": "0x32",
+ "numeric-2-box": "0xf3a7",
+ "numeric-2-box-multiple-outline": "0xf3a8",
+ "numeric-2-box-outline": "0xf3a9",
+ "numeric-2-circle": "0xfc7e",
+ "numeric-2-circle-outline": "0xfc7f",
+ "numeric-3": "0x33",
+ "numeric-3-box": "0xf3aa",
+ "numeric-3-box-multiple-outline": "0xf3ab",
+ "numeric-3-box-outline": "0xf3ac",
+ "numeric-3-circle": "0xfc80",
+ "numeric-3-circle-outline": "0xfc81",
+ "numeric-4": "0x34",
+ "numeric-4-box": "0xf3ad",
+ "numeric-4-box-multiple-outline": "0xf3ae",
+ "numeric-4-box-outline": "0xf3af",
+ "numeric-4-circle": "0xfc82",
+ "numeric-4-circle-outline": "0xfc83",
+ "numeric-5": "0x35",
+ "numeric-5-box": "0xf3b0",
+ "numeric-5-box-multiple-outline": "0xf3b1",
+ "numeric-5-box-outline": "0xf3b2",
+ "numeric-5-circle": "0xfc84",
+ "numeric-5-circle-outline": "0xfc85",
+ "numeric-6": "0x36",
+ "numeric-6-box": "0xf3b3",
+ "numeric-6-box-multiple-outline": "0xf3b4",
+ "numeric-6-box-outline": "0xf3b5",
+ "numeric-6-circle": "0xfc86",
+ "numeric-6-circle-outline": "0xfc87",
+ "numeric-7": "0x37",
+ "numeric-7-box": "0xf3b6",
+ "numeric-7-box-multiple-outline": "0xf3b7",
+ "numeric-7-box-outline": "0xf3b8",
+ "numeric-7-circle": "0xfc88",
+ "numeric-7-circle-outline": "0xfc89",
+ "numeric-8": "0x38",
+ "numeric-8-box": "0xf3b9",
+ "numeric-8-box-multiple-outline": "0xf3ba",
+ "numeric-8-box-outline": "0xf3bb",
+ "numeric-8-circle": "0xfc8a",
+ "numeric-8-circle-outline": "0xfc8b",
+ "numeric-9": "0x39",
+ "numeric-9-box": "0xf3bc",
+ "numeric-9-box-multiple-outline": "0xf3bd",
+ "numeric-9-box-outline": "0xf3be",
+ "numeric-9-circle": "0xfc8c",
+ "numeric-9-circle-outline": "0xfc8d",
+ "numeric-9-plus-box": "0xf3bf",
+ "numeric-9-plus-box-multiple-outline": "0xf3c0",
+ "numeric-9-plus-box-outline": "0xf3c1",
+ "numeric-9-plus-circle": "0xfc8e",
+ "numeric-9-plus-circle-outline": "0xfc8f",
+ "nut": "0xf6f7",
+ "nutrition": "0xf3c2",
+ "oar": "0xf67b",
+ "ocarina": "0xfdbc",
+ "octagon": "0xf3c3",
+ "octagon-outline": "0xf3c4",
+ "octagram": "0xf6f8",
+ "octagram-outline": "0xf774",
+ "odnoklassniki": "0xf3c5",
+ "office": "0xf3c6",
+ "office-building": "0xf990",
+ "oil": "0xf3c7",
+ "oil-temperature": "0xf3c8",
+ "omega": "0xf3c9",
+ "one-up": "0xfb89",
+ "onedrive": "0xf3ca",
+ "onenote": "0xf746",
+ "onepassword": "0xf880",
+ "opacity": "0xf5cc",
+ "open-in-app": "0xf3cb",
+ "open-in-new": "0xf3cc",
+ "open-source-initiative": "0xfb8a",
+ "openid": "0xf3cd",
+ "opera": "0xf3ce",
+ "orbit": "0xf018",
+ "origin": "0xfb2b",
+ "ornament": "0xf3cf",
+ "ornament-variant": "0xf3d0",
+ "outlook": "0xfcfe",
+ "owl": "0xf3d2",
+ "pac-man": "0xfb8b",
+ "package": "0xf3d3",
+ "package-down": "0xf3d4",
+ "package-up": "0xf3d5",
+ "package-variant": "0xf3d6",
+ "package-variant-closed": "0xf3d7",
+ "page-first": "0xf600",
+ "page-last": "0xf601",
+ "page-layout-body": "0xf6f9",
+ "page-layout-footer": "0xf6fa",
+ "page-layout-header": "0xf6fb",
+ "page-layout-sidebar-left": "0xf6fc",
+ "page-layout-sidebar-right": "0xf6fd",
+ "page-next": "0xfb8c",
+ "page-next-outline": "0xfb8d",
+ "page-previous": "0xfb8e",
+ "page-previous-outline": "0xfb8f",
+ "palette": "0xf3d8",
+ "palette-advanced": "0xf3d9",
+ "palette-outline": "0xfe6c",
+ "palette-swatch": "0xf8b4",
+ "pan": "0xfb90",
+ "pan-bottom-left": "0xfb91",
+ "pan-bottom-right": "0xfb92",
+ "pan-down": "0xfb93",
+ "pan-horizontal": "0xfb94",
+ "pan-left": "0xfb95",
+ "pan-right": "0xfb96",
+ "pan-top-left": "0xfb97",
+ "pan-top-right": "0xfb98",
+ "pan-up": "0xfb99",
+ "pan-vertical": "0xfb9a",
+ "panda": "0xf3da",
+ "pandora": "0xf3db",
+ "panorama": "0xf3dc",
+ "panorama-fisheye": "0xf3dd",
+ "panorama-horizontal": "0xf3de",
+ "panorama-vertical": "0xf3df",
+ "panorama-wide-angle": "0xf3e0",
+ "paper-cut-vertical": "0xf3e1",
+ "paperclip": "0xf3e2",
+ "parachute": "0xfc90",
+ "parachute-outline": "0xfc91",
+ "parking": "0xf3e3",
+ "passport": "0xf7e2",
+ "passport-biometric": "0xfdbd",
+ "patreon": "0xf881",
+ "pause": "0xf3e4",
+ "pause-circle": "0xf3e5",
+ "pause-circle-outline": "0xf3e6",
+ "pause-octagon": "0xf3e7",
+ "pause-octagon-outline": "0xf3e8",
+ "paw": "0xf3e9",
+ "paw-off": "0xf657",
+ "paypal": "0xf882",
+ "pdf-box": "0xfe39",
+ "peace": "0xf883",
+ "pen": "0xf3ea",
+ "pen-lock": "0xfdbe",
+ "pen-minus": "0xfdbf",
+ "pen-off": "0xfdc0",
+ "pen-plus": "0xfdc1",
+ "pen-remove": "0xfdc2",
+ "pencil": "0xf3eb",
+ "pencil-box": "0xf3ec",
+ "pencil-box-outline": "0xf3ed",
+ "pencil-circle": "0xf6fe",
+ "pencil-circle-outline": "0xf775",
+ "pencil-lock": "0xf3ee",
+ "pencil-lock-outline": "0xfdc3",
+ "pencil-minus": "0xfdc4",
+ "pencil-minus-outline": "0xfdc5",
+ "pencil-off": "0xf3ef",
+ "pencil-off-outline": "0xfdc6",
+ "pencil-outline": "0xfc92",
+ "pencil-plus": "0xfdc7",
+ "pencil-plus-outline": "0xfdc8",
+ "pencil-remove": "0xfdc9",
+ "pencil-remove-outline": "0xfdca",
+ "pentagon": "0xf6ff",
+ "pentagon-outline": "0xf700",
+ "percent": "0xf3f0",
+ "periodic-table": "0xf8b5",
+ "periodic-table-co2": "0xf7e3",
+ "periscope": "0xf747",
+ "perspective-less": "0xfcff",
+ "perspective-more": "0xfd00",
+ "pharmacy": "0xf3f1",
+ "phone": "0xf3f2",
+ "phone-bluetooth": "0xf3f3",
+ "phone-classic": "0xf602",
+ "phone-forward": "0xf3f4",
+ "phone-hangup": "0xf3f5",
+ "phone-in-talk": "0xf3f6",
+ "phone-incoming": "0xf3f7",
+ "phone-lock": "0xf3f8",
+ "phone-log": "0xf3f9",
+ "phone-minus": "0xf658",
+ "phone-missed": "0xf3fa",
+ "phone-off": "0xfdcb",
+ "phone-outgoing": "0xf3fb",
+ "phone-outline": "0xfdcc",
+ "phone-paused": "0xf3fc",
+ "phone-plus": "0xf659",
+ "phone-return": "0xf82e",
+ "phone-rotate-landscape": "0xf884",
+ "phone-rotate-portrait": "0xf885",
+ "phone-settings": "0xf3fd",
+ "phone-voip": "0xf3fe",
+ "pi": "0xf3ff",
+ "pi-box": "0xf400",
+ "pi-hole": "0xfdcd",
+ "piano": "0xf67c",
+ "pickaxe": "0xf8b6",
+ "picture-in-picture-bottom-right": "0xfe3a",
+ "picture-in-picture-bottom-right-outline": "0xfe3b",
+ "picture-in-picture-top-right": "0xfe3c",
+ "picture-in-picture-top-right-outline": "0xfe3d",
+ "pier": "0xf886",
+ "pier-crane": "0xf887",
+ "pig": "0xf401",
+ "pill": "0xf402",
+ "pillar": "0xf701",
+ "pin": "0xf403",
+ "pin-off": "0xf404",
+ "pin-off-outline": "0xf92f",
+ "pin-outline": "0xf930",
+ "pine-tree": "0xf405",
+ "pine-tree-box": "0xf406",
+ "pinterest": "0xf407",
+ "pinterest-box": "0xf408",
+ "pinwheel": "0xfad4",
+ "pinwheel-outline": "0xfad5",
+ "pipe": "0xf7e4",
+ "pipe-disconnected": "0xf7e5",
+ "pipe-leak": "0xf888",
+ "pirate": "0xfa07",
+ "pistol": "0xf702",
+ "piston": "0xf889",
+ "pizza": "0xf409",
+ "play": "0xf40a",
+ "play-box-outline": "0xf40b",
+ "play-circle": "0xf40c",
+ "play-circle-outline": "0xf40d",
+ "play-network": "0xf88a",
+ "play-network-outline": "0xfc93",
+ "play-pause": "0xf40e",
+ "play-protected-content": "0xf40f",
+ "play-speed": "0xf8fe",
+ "playlist-check": "0xf5c7",
+ "playlist-edit": "0xf8ff",
+ "playlist-minus": "0xf410",
+ "playlist-music": "0xfc94",
+ "playlist-music-outline": "0xfc95",
+ "playlist-play": "0xf411",
+ "playlist-plus": "0xf412",
+ "playlist-remove": "0xf413",
+ "playlist-star": "0xfdce",
+ "playstation": "0xf414",
+ "plex": "0xf6b9",
+ "plus": "0xf415",
+ "plus-box": "0xf416",
+ "plus-box-outline": "0xf703",
+ "plus-circle": "0xf417",
+ "plus-circle-multiple-outline": "0xf418",
+ "plus-circle-outline": "0xf419",
+ "plus-minus": "0xf991",
+ "plus-minus-box": "0xf992",
+ "plus-network": "0xf41a",
+ "plus-network-outline": "0xfc96",
+ "plus-one": "0xf41b",
+ "plus-outline": "0xf704",
+ "pocket": "0xf41c",
+ "podcast": "0xf993",
+ "podium": "0xfd01",
+ "podium-bronze": "0xfd02",
+ "podium-gold": "0xfd03",
+ "podium-silver": "0xfd04",
+ "point-of-sale": "0xfd6e",
+ "pokeball": "0xf41d",
+ "pokemon-go": "0xfa08",
+ "poker-chip": "0xf82f",
+ "polaroid": "0xf41e",
+ "poll": "0xf41f",
+ "poll-box": "0xf420",
+ "polymer": "0xf421",
+ "pool": "0xf606",
+ "popcorn": "0xf422",
+ "postage-stamp": "0xfc97",
+ "pot": "0xf65a",
+ "pot-mix": "0xf65b",
+ "pound": "0xf423",
+ "pound-box": "0xf424",
+ "power": "0xf425",
+ "power-cycle": "0xf900",
+ "power-off": "0xf901",
+ "power-on": "0xf902",
+ "power-plug": "0xf6a4",
+ "power-plug-off": "0xf6a5",
+ "power-settings": "0xf426",
+ "power-sleep": "0xf903",
+ "power-socket": "0xf427",
+ "power-socket-au": "0xf904",
+ "power-socket-eu": "0xf7e6",
+ "power-socket-uk": "0xf7e7",
+ "power-socket-us": "0xf7e8",
+ "power-standby": "0xf905",
+ "powershell": "0xfa09",
+ "prescription": "0xf705",
+ "presentation": "0xf428",
+ "presentation-play": "0xf429",
+ "printer": "0xf42a",
+ "printer-3d": "0xf42b",
+ "printer-3d-nozzle": "0xfe3e",
+ "printer-3d-nozzle-outline": "0xfe3f",
+ "printer-alert": "0xf42c",
+ "printer-off": "0xfe40",
+ "printer-settings": "0xf706",
+ "printer-wireless": "0xfa0a",
+ "priority-high": "0xf603",
+ "priority-low": "0xf604",
+ "professional-hexagon": "0xf42d",
+ "progress-alert": "0xfc98",
+ "progress-check": "0xf994",
+ "progress-clock": "0xf995",
+ "progress-download": "0xf996",
+ "progress-upload": "0xf997",
+ "progress-wrench": "0xfc99",
+ "projector": "0xf42e",
+ "projector-screen": "0xf42f",
+ "publish": "0xf6a6",
+ "pulse": "0xf430",
+ "pumpkin": "0xfb9b",
+ "puzzle": "0xf431",
+ "puzzle-outline": "0xfa65",
+ "qi": "0xf998",
+ "qqchat": "0xf605",
+ "qrcode": "0xf432",
+ "qrcode-edit": "0xf8b7",
+ "qrcode-scan": "0xf433",
+ "quadcopter": "0xf434",
+ "quality-high": "0xf435",
+ "quality-low": "0xfa0b",
+ "quality-medium": "0xfa0c",
+ "quicktime": "0xf436",
+ "quora": "0xfd05",
+ "rabbit": "0xf906",
+ "racing-helmet": "0xfd6f",
+ "racquetball": "0xfd70",
+ "radar": "0xf437",
+ "radiator": "0xf438",
+ "radiator-disabled": "0xfad6",
+ "radiator-off": "0xfad7",
+ "radio": "0xf439",
+ "radio-am": "0xfc9a",
+ "radio-fm": "0xfc9b",
+ "radio-handheld": "0xf43a",
+ "radio-tower": "0xf43b",
+ "radioactive": "0xf43c",
+ "radiobox-blank": "0xf43d",
+ "radiobox-marked": "0xf43e",
+ "radius": "0xfc9c",
+ "radius-outline": "0xfc9d",
+ "raspberry-pi": "0xf43f",
+ "ray-end": "0xf440",
+ "ray-end-arrow": "0xf441",
+ "ray-start": "0xf442",
+ "ray-start-arrow": "0xf443",
+ "ray-start-end": "0xf444",
+ "ray-vertex": "0xf445",
+ "react": "0xf707",
+ "read": "0xf447",
+ "receipt": "0xf449",
+ "record": "0xf44a",
+ "record-player": "0xf999",
+ "record-rec": "0xf44b",
+ "rectangle": "0xfe41",
+ "rectangle-outline": "0xfe42",
+ "recycle": "0xf44c",
+ "reddit": "0xf44d",
+ "redo": "0xf44e",
+ "redo-variant": "0xf44f",
+ "reflect-horizontal": "0xfa0d",
+ "reflect-vertical": "0xfa0e",
+ "refresh": "0xf450",
+ "regex": "0xf451",
+ "registered-trademark": "0xfa66",
+ "relative-scale": "0xf452",
+ "reload": "0xf453",
+ "reminder": "0xf88b",
+ "remote": "0xf454",
+ "remote-desktop": "0xf8b8",
+ "rename-box": "0xf455",
+ "reorder-horizontal": "0xf687",
+ "reorder-vertical": "0xf688",
+ "repeat": "0xf456",
+ "repeat-off": "0xf457",
+ "repeat-once": "0xf458",
+ "replay": "0xf459",
+ "reply": "0xf45a",
+ "reply-all": "0xf45b",
+ "reproduction": "0xf45c",
+ "resistor": "0xfb1f",
+ "resistor-nodes": "0xfb20",
+ "resize": "0xfa67",
+ "resize-bottom-right": "0xf45d",
+ "responsive": "0xf45e",
+ "restart": "0xf708",
+ "restart-off": "0xfd71",
+ "restore": "0xf99a",
+ "restore-clock": "0xf6a7",
+ "rewind": "0xf45f",
+ "rewind-10": "0xfd06",
+ "rewind-30": "0xfd72",
+ "rewind-outline": "0xf709",
+ "rhombus": "0xf70a",
+ "rhombus-medium": "0xfa0f",
+ "rhombus-outline": "0xf70b",
+ "rhombus-split": "0xfa10",
+ "ribbon": "0xf460",
+ "rice": "0xf7e9",
+ "ring": "0xf7ea",
+ "rivet": "0xfe43",
+ "road": "0xf461",
+ "road-variant": "0xf462",
+ "robot": "0xf6a8",
+ "robot-industrial": "0xfb21",
+ "robot-vacuum": "0xf70c",
+ "robot-vacuum-variant": "0xf907",
+ "rocket": "0xf463",
+ "roller-skate": "0xfd07",
+ "rollerblade": "0xfd08",
+ "rollupjs": "0xfb9c",
+ "room-service": "0xf88c",
+ "room-service-outline": "0xfd73",
+ "rotate-3d": "0xf464",
+ "rotate-left": "0xf465",
+ "rotate-left-variant": "0xf466",
+ "rotate-orbit": "0xfd74",
+ "rotate-right": "0xf467",
+ "rotate-right-variant": "0xf468",
+ "rounded-corner": "0xf607",
+ "router-wireless": "0xf469",
+ "router-wireless-settings": "0xfa68",
+ "routes": "0xf46a",
+ "rowing": "0xf608",
+ "rss": "0xf46b",
+ "rss-box": "0xf46c",
+ "ruby": "0xfd09",
+ "rugby": "0xfd75",
+ "ruler": "0xf46d",
+ "ruler-square": "0xfc9e",
+ "run": "0xf70d",
+ "run-fast": "0xf46e",
+ "sack": "0xfd0a",
+ "sack-percent": "0xfd0b",
+ "safe": "0xfa69",
+ "safety-goggles": "0xfd0c",
+ "sale": "0xf46f",
+ "salesforce": "0xf88d",
+ "sass": "0xf7eb",
+ "satellite": "0xf470",
+ "satellite-uplink": "0xf908",
+ "satellite-variant": "0xf471",
+ "sausage": "0xf8b9",
+ "saw-blade": "0xfe44",
+ "saxophone": "0xf609",
+ "scale": "0xf472",
+ "scale-balance": "0xf5d1",
+ "scale-bathroom": "0xf473",
+ "scanner": "0xf6aa",
+ "scanner-off": "0xf909",
+ "school": "0xf474",
+ "scissors-cutting": "0xfa6a",
+ "screen-rotation": "0xf475",
+ "screen-rotation-lock": "0xf476",
+ "screw-flat-top": "0xfdcf",
+ "screw-lag": "0xfe54",
+ "screw-machine-flat-top": "0xfe55",
+ "screw-machine-round-top": "0xfe56",
+ "screw-round-top": "0xfe57",
+ "screwdriver": "0xf477",
+ "script": "0xfb9d",
+ "script-outline": "0xf478",
+ "script-text": "0xfb9e",
+ "script-text-outline": "0xfb9f",
+ "sd": "0xf479",
+ "seal": "0xf47a",
+ "search-web": "0xf70e",
+ "seat": "0xfc9f",
+ "seat-flat": "0xf47b",
+ "seat-flat-angled": "0xf47c",
+ "seat-individual-suite": "0xf47d",
+ "seat-legroom-extra": "0xf47e",
+ "seat-legroom-normal": "0xf47f",
+ "seat-legroom-reduced": "0xf480",
+ "seat-outline": "0xfca0",
+ "seat-recline-extra": "0xf481",
+ "seat-recline-normal": "0xf482",
+ "seatbelt": "0xfca1",
+ "security": "0xf483",
+ "security-network": "0xf484",
+ "seed": "0xfe45",
+ "seed-outline": "0xfe46",
+ "select": "0xf485",
+ "select-all": "0xf486",
+ "select-color": "0xfd0d",
+ "select-compare": "0xfad8",
+ "select-drag": "0xfa6b",
+ "select-inverse": "0xf487",
+ "select-off": "0xf488",
+ "selection": "0xf489",
+ "selection-drag": "0xfa6c",
+ "selection-ellipse": "0xfd0e",
+ "selection-off": "0xf776",
+ "send": "0xf48a",
+ "send-circle": "0xfe58",
+ "send-circle-outline": "0xfe59",
+ "send-lock": "0xf7ec",
+ "serial-port": "0xf65c",
+ "server": "0xf48b",
+ "server-minus": "0xf48c",
+ "server-network": "0xf48d",
+ "server-network-off": "0xf48e",
+ "server-off": "0xf48f",
+ "server-plus": "0xf490",
+ "server-remove": "0xf491",
+ "server-security": "0xf492",
+ "set-all": "0xf777",
+ "set-center": "0xf778",
+ "set-center-right": "0xf779",
+ "set-left": "0xf77a",
+ "set-left-center": "0xf77b",
+ "set-left-right": "0xf77c",
+ "set-none": "0xf77d",
+ "set-right": "0xf77e",
+ "set-top-box": "0xf99e",
+ "settings": "0xf493",
+ "settings-box": "0xf494",
+ "settings-helper": "0xfa6d",
+ "settings-outline": "0xf8ba",
+ "shape": "0xf830",
+ "shape-circle-plus": "0xf65d",
+ "shape-outline": "0xf831",
+ "shape-plus": "0xf495",
+ "shape-polygon-plus": "0xf65e",
+ "shape-rectangle-plus": "0xf65f",
+ "shape-square-plus": "0xf660",
+ "share": "0xf496",
+ "share-outline": "0xf931",
+ "share-variant": "0xf497",
+ "sheep": "0xfca2",
+ "shield": "0xf498",
+ "shield-account": "0xf88e",
+ "shield-account-outline": "0xfa11",
+ "shield-airplane": "0xf6ba",
+ "shield-airplane-outline": "0xfca3",
+ "shield-check": "0xf565",
+ "shield-check-outline": "0xfca4",
+ "shield-cross": "0xfca5",
+ "shield-cross-outline": "0xfca6",
+ "shield-half-full": "0xf77f",
+ "shield-home": "0xf689",
+ "shield-home-outline": "0xfca7",
+ "shield-key": "0xfba0",
+ "shield-key-outline": "0xfba1",
+ "shield-link-variant": "0xfd0f",
+ "shield-link-variant-outline": "0xfd10",
+ "shield-lock": "0xf99c",
+ "shield-lock-outline": "0xfca8",
+ "shield-off": "0xf99d",
+ "shield-off-outline": "0xf99b",
+ "shield-outline": "0xf499",
+ "shield-plus": "0xfad9",
+ "shield-plus-outline": "0xfada",
+ "shield-remove": "0xfadb",
+ "shield-remove-outline": "0xfadc",
+ "shield-search": "0xfd76",
+ "ship-wheel": "0xf832",
+ "shoe-formal": "0xfb22",
+ "shoe-heel": "0xfb23",
+ "shoe-print": "0xfe5a",
+ "shopify": "0xfadd",
+ "shopping": "0xf49a",
+ "shopping-music": "0xf49b",
+ "shovel": "0xf70f",
+ "shovel-off": "0xf710",
+ "shower": "0xf99f",
+ "shower-head": "0xf9a0",
+ "shredder": "0xf49c",
+ "shuffle": "0xf49d",
+ "shuffle-disabled": "0xf49e",
+ "shuffle-variant": "0xf49f",
+ "sigma": "0xf4a0",
+ "sigma-lower": "0xf62b",
+ "sign-caution": "0xf4a1",
+ "sign-direction": "0xf780",
+ "sign-text": "0xf781",
+ "signal": "0xf4a2",
+ "signal-2g": "0xf711",
+ "signal-3g": "0xf712",
+ "signal-4g": "0xf713",
+ "signal-5g": "0xfa6e",
+ "signal-cellular-1": "0xf8bb",
+ "signal-cellular-2": "0xf8bc",
+ "signal-cellular-3": "0xf8bd",
+ "signal-cellular-outline": "0xf8be",
+ "signal-distance-variant": "0xfe47",
+ "signal-hspa": "0xf714",
+ "signal-hspa-plus": "0xf715",
+ "signal-off": "0xf782",
+ "signal-variant": "0xf60a",
+ "signature": "0xfe5b",
+ "signature-freehand": "0xfe5c",
+ "signature-image": "0xfe5d",
+ "signature-text": "0xfe5e",
+ "silo": "0xfb24",
+ "silverware": "0xf4a3",
+ "silverware-fork": "0xf4a4",
+ "silverware-fork-knife": "0xfa6f",
+ "silverware-spoon": "0xf4a5",
+ "silverware-variant": "0xf4a6",
+ "sim": "0xf4a7",
+ "sim-alert": "0xf4a8",
+ "sim-off": "0xf4a9",
+ "sina-weibo": "0xfade",
+ "sitemap": "0xf4aa",
+ "skate": "0xfd11",
+ "skew-less": "0xfd12",
+ "skew-more": "0xfd13",
+ "skip-backward": "0xf4ab",
+ "skip-forward": "0xf4ac",
+ "skip-next": "0xf4ad",
+ "skip-next-circle": "0xf661",
+ "skip-next-circle-outline": "0xf662",
+ "skip-previous": "0xf4ae",
+ "skip-previous-circle": "0xf663",
+ "skip-previous-circle-outline": "0xf664",
+ "skull": "0xf68b",
+ "skull-crossbones": "0xfba2",
+ "skull-crossbones-outline": "0xfba3",
+ "skull-outline": "0xfba4",
+ "skype": "0xf4af",
+ "skype-business": "0xf4b0",
+ "slack": "0xf4b1",
+ "slackware": "0xf90a",
+ "sleep": "0xf4b2",
+ "sleep-off": "0xf4b3",
+ "slope-downhill": "0xfe5f",
+ "slope-uphill": "0xfe60",
+ "smog": "0xfa70",
+ "smoke-detector": "0xf392",
+ "smoking": "0xf4b4",
+ "smoking-off": "0xf4b5",
+ "snapchat": "0xf4b6",
+ "snowflake": "0xf716",
+ "snowman": "0xf4b7",
+ "soccer": "0xf4b8",
+ "soccer-field": "0xf833",
+ "sofa": "0xf4b9",
+ "solar-panel": "0xfd77",
+ "solar-panel-large": "0xfd78",
+ "solar-power": "0xfa71",
+ "solid": "0xf68c",
+ "sort": "0xf4ba",
+ "sort-alphabetical": "0xf4bb",
+ "sort-ascending": "0xf4bc",
+ "sort-descending": "0xf4bd",
+ "sort-numeric": "0xf4be",
+ "sort-variant": "0xf4bf",
+ "sort-variant-lock": "0xfca9",
+ "sort-variant-lock-open": "0xfcaa",
+ "soundcloud": "0xf4c0",
+ "source-branch": "0xf62c",
+ "source-commit": "0xf717",
+ "source-commit-end": "0xf718",
+ "source-commit-end-local": "0xf719",
+ "source-commit-local": "0xf71a",
+ "source-commit-next-local": "0xf71b",
+ "source-commit-start": "0xf71c",
+ "source-commit-start-next-local": "0xf71d",
+ "source-fork": "0xf4c1",
+ "source-merge": "0xf62d",
+ "source-pull": "0xf4c2",
+ "source-repository": "0xfcab",
+ "source-repository-multiple": "0xfcac",
+ "soy-sauce": "0xf7ed",
+ "spa": "0xfcad",
+ "spa-outline": "0xfcae",
+ "space-invaders": "0xfba5",
+ "spade": "0xfe48",
+ "speaker": "0xf4c3",
+ "speaker-bluetooth": "0xf9a1",
+ "speaker-multiple": "0xfd14",
+ "speaker-off": "0xf4c4",
+ "speaker-wireless": "0xf71e",
+ "speedometer": "0xf4c5",
+ "spellcheck": "0xf4c6",
+ "spider-web": "0xfba6",
+ "spotify": "0xf4c7",
+ "spotlight": "0xf4c8",
+ "spotlight-beam": "0xf4c9",
+ "spray": "0xf665",
+ "spray-bottle": "0xfadf",
+ "sprout": "0xfe49",
+ "sprout-outline": "0xfe4a",
+ "square": "0xf763",
+ "square-edit-outline": "0xf90b",
+ "square-inc": "0xf4ca",
+ "square-inc-cash": "0xf4cb",
+ "square-medium": "0xfa12",
+ "square-medium-outline": "0xfa13",
+ "square-outline": "0xf762",
+ "square-root": "0xf783",
+ "square-root-box": "0xf9a2",
+ "square-small": "0xfa14",
+ "squeegee": "0xfae0",
+ "ssh": "0xf8bf",
+ "stack-exchange": "0xf60b",
+ "stack-overflow": "0xf4cc",
+ "stadium": "0xf71f",
+ "stairs": "0xf4cd",
+ "stamper": "0xfd15",
+ "standard-definition": "0xf7ee",
+ "star": "0xf4ce",
+ "star-box": "0xfa72",
+ "star-box-outline": "0xfa73",
+ "star-circle": "0xf4cf",
+ "star-circle-outline": "0xf9a3",
+ "star-face": "0xf9a4",
+ "star-four-points": "0xfae1",
+ "star-four-points-outline": "0xfae2",
+ "star-half": "0xf4d0",
+ "star-off": "0xf4d1",
+ "star-outline": "0xf4d2",
+ "star-three-points": "0xfae3",
+ "star-three-points-outline": "0xfae4",
+ "steam": "0xf4d3",
+ "steam-box": "0xf90c",
+ "steering": "0xf4d4",
+ "steering-off": "0xf90d",
+ "step-backward": "0xf4d5",
+ "step-backward-2": "0xf4d6",
+ "step-forward": "0xf4d7",
+ "step-forward-2": "0xf4d8",
+ "stethoscope": "0xf4d9",
+ "sticker": "0xf5d0",
+ "sticker-emoji": "0xf784",
+ "stocking": "0xf4da",
+ "stop": "0xf4db",
+ "stop-circle": "0xf666",
+ "stop-circle-outline": "0xf667",
+ "store": "0xf4dc",
+ "store-24-hour": "0xf4dd",
+ "stove": "0xf4de",
+ "strava": "0xfb25",
+ "subdirectory-arrow-left": "0xf60c",
+ "subdirectory-arrow-right": "0xf60d",
+ "subtitles": "0xfa15",
+ "subtitles-outline": "0xfa16",
+ "subway": "0xf6ab",
+ "subway-alert-variant": "0xfd79",
+ "subway-variant": "0xf4df",
+ "summit": "0xf785",
+ "sunglasses": "0xf4e0",
+ "surround-sound": "0xf5c5",
+ "surround-sound-2-0": "0xf7ef",
+ "surround-sound-3-1": "0xf7f0",
+ "surround-sound-5-1": "0xf7f1",
+ "surround-sound-7-1": "0xf7f2",
+ "svg": "0xf720",
+ "swap-horizontal": "0xf4e1",
+ "swap-horizontal-bold": "0xfba9",
+ "swap-horizontal-variant": "0xf8c0",
+ "swap-vertical": "0xf4e2",
+ "swap-vertical-bold": "0xfbaa",
+ "swap-vertical-variant": "0xf8c1",
+ "swim": "0xf4e3",
+ "switch": "0xf4e4",
+ "sword": "0xf4e5",
+ "sword-cross": "0xf786",
+ "symfony": "0xfae5",
+ "sync": "0xf4e6",
+ "sync-alert": "0xf4e7",
+ "sync-off": "0xf4e8",
+ "tab": "0xf4e9",
+ "tab-minus": "0xfb26",
+ "tab-plus": "0xf75b",
+ "tab-remove": "0xfb27",
+ "tab-unselected": "0xf4ea",
+ "table": "0xf4eb",
+ "table-border": "0xfa17",
+ "table-column": "0xf834",
+ "table-column-plus-after": "0xf4ec",
+ "table-column-plus-before": "0xf4ed",
+ "table-column-remove": "0xf4ee",
+ "table-column-width": "0xf4ef",
+ "table-edit": "0xf4f0",
+ "table-large": "0xf4f1",
+ "table-merge-cells": "0xf9a5",
+ "table-of-contents": "0xf835",
+ "table-plus": "0xfa74",
+ "table-remove": "0xfa75",
+ "table-row": "0xf836",
+ "table-row-height": "0xf4f2",
+ "table-row-plus-after": "0xf4f3",
+ "table-row-plus-before": "0xf4f4",
+ "table-row-remove": "0xf4f5",
+ "table-search": "0xf90e",
+ "table-settings": "0xf837",
+ "table-tennis": "0xfe4b",
+ "tablet": "0xf4f6",
+ "tablet-android": "0xf4f7",
+ "tablet-cellphone": "0xf9a6",
+ "tablet-ipad": "0xf4f8",
+ "taco": "0xf761",
+ "tag": "0xf4f9",
+ "tag-faces": "0xf4fa",
+ "tag-heart": "0xf68a",
+ "tag-heart-outline": "0xfbab",
+ "tag-minus": "0xf90f",
+ "tag-multiple": "0xf4fb",
+ "tag-outline": "0xf4fc",
+ "tag-plus": "0xf721",
+ "tag-remove": "0xf722",
+ "tag-text-outline": "0xf4fd",
+ "tank": "0xfd16",
+ "tape-measure": "0xfb28",
+ "target": "0xf4fe",
+ "target-account": "0xfbac",
+ "target-variant": "0xfa76",
+ "taxi": "0xf4ff",
+ "tea": "0xfd7a",
+ "tea-outline": "0xfd7b",
+ "teach": "0xf88f",
+ "teamviewer": "0xf500",
+ "telegram": "0xf501",
+ "telescope": "0xfb29",
+ "television": "0xf502",
+ "television-box": "0xf838",
+ "television-classic": "0xf7f3",
+ "television-classic-off": "0xf839",
+ "television-guide": "0xf503",
+ "television-off": "0xf83a",
+ "temperature-celsius": "0xf504",
+ "temperature-fahrenheit": "0xf505",
+ "temperature-kelvin": "0xf506",
+ "tennis": "0xfd7c",
+ "tennis-ball": "0xf507",
+ "tent": "0xf508",
+ "terrain": "0xf509",
+ "test-tube": "0xf668",
+ "test-tube-empty": "0xf910",
+ "test-tube-off": "0xf911",
+ "text": "0xf9a7",
+ "text-shadow": "0xf669",
+ "text-short": "0xf9a8",
+ "text-subject": "0xf9a9",
+ "text-to-speech": "0xf50a",
+ "text-to-speech-off": "0xf50b",
+ "textbox": "0xf60e",
+ "textbox-password": "0xf7f4",
+ "texture": "0xf50c",
+ "theater": "0xf50d",
+ "theme-light-dark": "0xf50e",
+ "thermometer": "0xf50f",
+ "thermometer-alert": "0xfe61",
+ "thermometer-chevron-down": "0xfe62",
+ "thermometer-chevron-up": "0xfe63",
+ "thermometer-lines": "0xf510",
+ "thermometer-minus": "0xfe64",
+ "thermometer-plus": "0xfe65",
+ "thermostat": "0xf393",
+ "thermostat-box": "0xf890",
+ "thought-bubble": "0xf7f5",
+ "thought-bubble-outline": "0xf7f6",
+ "thumb-down": "0xf511",
+ "thumb-down-outline": "0xf512",
+ "thumb-up": "0xf513",
+ "thumb-up-outline": "0xf514",
+ "thumbs-up-down": "0xf515",
+ "ticket": "0xf516",
+ "ticket-account": "0xf517",
+ "ticket-confirmation": "0xf518",
+ "ticket-outline": "0xf912",
+ "ticket-percent": "0xf723",
+ "tie": "0xf519",
+ "tilde": "0xf724",
+ "timelapse": "0xf51a",
+ "timeline": "0xfbad",
+ "timeline-outline": "0xfbae",
+ "timeline-text": "0xfbaf",
+ "timeline-text-outline": "0xfbb0",
+ "timer": "0xf51b",
+ "timer-10": "0xf51c",
+ "timer-3": "0xf51d",
+ "timer-off": "0xf51e",
+ "timer-sand": "0xf51f",
+ "timer-sand-empty": "0xf6ac",
+ "timer-sand-full": "0xf78b",
+ "timetable": "0xf520",
+ "toaster-oven": "0xfcaf",
+ "toggle-switch": "0xf521",
+ "toggle-switch-off": "0xf522",
+ "toggle-switch-off-outline": "0xfa18",
+ "toggle-switch-outline": "0xfa19",
+ "toilet": "0xf9aa",
+ "toolbox": "0xf9ab",
+ "toolbox-outline": "0xf9ac",
+ "tooltip": "0xf523",
+ "tooltip-account": "0xf00c",
+ "tooltip-edit": "0xf524",
+ "tooltip-image": "0xf525",
+ "tooltip-image-outline": "0xfbb1",
+ "tooltip-outline": "0xf526",
+ "tooltip-plus": "0xfbb2",
+ "tooltip-plus-outline": "0xf527",
+ "tooltip-text": "0xf528",
+ "tooltip-text-outline": "0xfbb3",
+ "tooth": "0xf8c2",
+ "tooth-outline": "0xf529",
+ "tor": "0xf52a",
+ "tortoise": "0xfd17",
+ "tournament": "0xf9ad",
+ "tower-beach": "0xf680",
+ "tower-fire": "0xf681",
+ "towing": "0xf83b",
+ "track-light": "0xf913",
+ "trackpad": "0xf7f7",
+ "trackpad-lock": "0xf932",
+ "tractor": "0xf891",
+ "trademark": "0xfa77",
+ "traffic-light": "0xf52b",
+ "train": "0xf52c",
+ "train-car": "0xfbb4",
+ "train-variant": "0xf8c3",
+ "tram": "0xf52d",
+ "transcribe": "0xf52e",
+ "transcribe-close": "0xf52f",
+ "transfer-down": "0xfd7d",
+ "transfer-left": "0xfd7e",
+ "transfer-right": "0xf530",
+ "transfer-up": "0xfd7f",
+ "transit-connection": "0xfd18",
+ "transit-connection-variant": "0xfd19",
+ "transit-transfer": "0xf6ad",
+ "transition": "0xf914",
+ "transition-masked": "0xf915",
+ "translate": "0xf5ca",
+ "translate-off": "0xfe66",
+ "transmission-tower": "0xfd1a",
+ "trash-can": "0xfa78",
+ "trash-can-outline": "0xfa79",
+ "treasure-chest": "0xf725",
+ "tree": "0xf531",
+ "tree-outline": "0xfe4c",
+ "trello": "0xf532",
+ "trending-down": "0xf533",
+ "trending-neutral": "0xf534",
+ "trending-up": "0xf535",
+ "triangle": "0xf536",
+ "triangle-outline": "0xf537",
+ "triforce": "0xfbb5",
+ "trophy": "0xf538",
+ "trophy-award": "0xf539",
+ "trophy-broken": "0xfd80",
+ "trophy-outline": "0xf53a",
+ "trophy-variant": "0xf53b",
+ "trophy-variant-outline": "0xf53c",
+ "truck": "0xf53d",
+ "truck-check": "0xfcb0",
+ "truck-delivery": "0xf53e",
+ "truck-fast": "0xf787",
+ "truck-trailer": "0xf726",
+ "tshirt-crew": "0xfa7a",
+ "tshirt-crew-outline": "0xf53f",
+ "tshirt-v": "0xfa7b",
+ "tshirt-v-outline": "0xf540",
+ "tumble-dryer": "0xf916",
+ "tumblr": "0xf541",
+ "tumblr-box": "0xf917",
+ "tumblr-reblog": "0xf542",
+ "tune": "0xf62e",
+ "tune-vertical": "0xf66a",
+ "turnstile": "0xfcb1",
+ "turnstile-outline": "0xfcb2",
+ "turtle": "0xfcb3",
+ "twitch": "0xf543",
+ "twitter": "0xf544",
+ "twitter-box": "0xf545",
+ "twitter-circle": "0xf546",
+ "twitter-retweet": "0xf547",
+ "two-factor-authentication": "0xf9ae",
+ "uber": "0xf748",
+ "ubisoft": "0xfbb6",
+ "ubuntu": "0xf548",
+ "ultra-high-definition": "0xf7f8",
+ "umbraco": "0xf549",
+ "umbrella": "0xf54a",
+ "umbrella-closed": "0xf9af",
+ "umbrella-outline": "0xf54b",
+ "undo": "0xf54c",
+ "undo-variant": "0xf54d",
+ "unfold-less-horizontal": "0xf54e",
+ "unfold-less-vertical": "0xf75f",
+ "unfold-more-horizontal": "0xf54f",
+ "unfold-more-vertical": "0xf760",
+ "ungroup": "0xf550",
+ "unity": "0xf6ae",
+ "unreal": "0xf9b0",
+ "untappd": "0xf551",
+ "update": "0xf6af",
+ "upload": "0xf552",
+ "upload-multiple": "0xf83c",
+ "upload-network": "0xf6f5",
+ "upload-network-outline": "0xfcb4",
+ "upload-outline": "0xfe67",
+ "usb": "0xf553",
+ "van-passenger": "0xf7f9",
+ "van-utility": "0xf7fa",
+ "vanish": "0xf7fb",
+ "variable": "0xfae6",
+ "vector-arrange-above": "0xf554",
+ "vector-arrange-below": "0xf555",
+ "vector-bezier": "0xfae7",
+ "vector-circle": "0xf556",
+ "vector-circle-variant": "0xf557",
+ "vector-combine": "0xf558",
+ "vector-curve": "0xf559",
+ "vector-difference": "0xf55a",
+ "vector-difference-ab": "0xf55b",
+ "vector-difference-ba": "0xf55c",
+ "vector-ellipse": "0xf892",
+ "vector-intersection": "0xf55d",
+ "vector-line": "0xf55e",
+ "vector-point": "0xf55f",
+ "vector-polygon": "0xf560",
+ "vector-polyline": "0xf561",
+ "vector-radius": "0xf749",
+ "vector-rectangle": "0xf5c6",
+ "vector-selection": "0xf562",
+ "vector-square": "0xf001",
+ "vector-triangle": "0xf563",
+ "vector-union": "0xf564",
+ "venmo": "0xf578",
+ "vhs": "0xfa1a",
+ "vibrate": "0xf566",
+ "vibrate-off": "0xfcb5",
+ "video": "0xf567",
+ "video-3d": "0xf7fc",
+ "video-4k-box": "0xf83d",
+ "video-account": "0xf918",
+ "video-image": "0xf919",
+ "video-input-antenna": "0xf83e",
+ "video-input-component": "0xf83f",
+ "video-input-hdmi": "0xf840",
+ "video-input-svideo": "0xf841",
+ "video-minus": "0xf9b1",
+ "video-off": "0xf568",
+ "video-off-outline": "0xfbb7",
+ "video-outline": "0xfbb8",
+ "video-plus": "0xf9b2",
+ "video-stabilization": "0xf91a",
+ "video-switch": "0xf569",
+ "video-vintage": "0xfa1b",
+ "view-agenda": "0xf56a",
+ "view-array": "0xf56b",
+ "view-carousel": "0xf56c",
+ "view-column": "0xf56d",
+ "view-comfy": "0xfe4d",
+ "view-compact": "0xfe4e",
+ "view-compact-outline": "0xfe4f",
+ "view-dashboard": "0xf56e",
+ "view-dashboard-outline": "0xfa1c",
+ "view-dashboard-variant": "0xf842",
+ "view-day": "0xf56f",
+ "view-grid": "0xf570",
+ "view-headline": "0xf571",
+ "view-list": "0xf572",
+ "view-module": "0xf573",
+ "view-parallel": "0xf727",
+ "view-quilt": "0xf574",
+ "view-sequential": "0xf728",
+ "view-split-horizontal": "0xfba7",
+ "view-split-vertical": "0xfba8",
+ "view-stream": "0xf575",
+ "view-week": "0xf576",
+ "vimeo": "0xf577",
+ "violin": "0xf60f",
+ "virtual-reality": "0xf893",
+ "visual-studio": "0xf610",
+ "visual-studio-code": "0xfa1d",
+ "vk": "0xf579",
+ "vk-box": "0xf57a",
+ "vk-circle": "0xf57b",
+ "vlc": "0xf57c",
+ "voice": "0xf5cb",
+ "voicemail": "0xf57d",
+ "volleyball": "0xf9b3",
+ "volume-high": "0xf57e",
+ "volume-low": "0xf57f",
+ "volume-medium": "0xf580",
+ "volume-minus": "0xf75d",
+ "volume-mute": "0xf75e",
+ "volume-off": "0xf581",
+ "volume-plus": "0xf75c",
+ "volume-variant-off": "0xfe68",
+ "vote": "0xfa1e",
+ "vote-outline": "0xfa1f",
+ "vpn": "0xf582",
+ "vuejs": "0xf843",
+ "vuetify": "0xfe50",
+ "walk": "0xf583",
+ "wall": "0xf7fd",
+ "wall-sconce": "0xf91b",
+ "wall-sconce-flat": "0xf91c",
+ "wall-sconce-variant": "0xf91d",
+ "wallet": "0xf584",
+ "wallet-giftcard": "0xf585",
+ "wallet-membership": "0xf586",
+ "wallet-outline": "0xfbb9",
+ "wallet-travel": "0xf587",
+ "wallpaper": "0xfe69",
+ "wan": "0xf588",
+ "washing-machine": "0xf729",
+ "watch": "0xf589",
+ "watch-export": "0xf58a",
+ "watch-export-variant": "0xf894",
+ "watch-import": "0xf58b",
+ "watch-import-variant": "0xf895",
+ "watch-variant": "0xf896",
+ "watch-vibrate": "0xf6b0",
+ "watch-vibrate-off": "0xfcb6",
+ "water": "0xf58c",
+ "water-off": "0xf58d",
+ "water-outline": "0xfe6a",
+ "water-percent": "0xf58e",
+ "water-pump": "0xf58f",
+ "watermark": "0xf612",
+ "waves": "0xf78c",
+ "waze": "0xfbba",
+ "weather-cloudy": "0xf590",
+ "weather-cloudy-arrow-right": "0xfe51",
+ "weather-fog": "0xf591",
+ "weather-hail": "0xf592",
+ "weather-hurricane": "0xf897",
+ "weather-lightning": "0xf593",
+ "weather-lightning-rainy": "0xf67d",
+ "weather-night": "0xf594",
+ "weather-partlycloudy": "0xf595",
+ "weather-pouring": "0xf596",
+ "weather-rainy": "0xf597",
+ "weather-snowy": "0xf598",
+ "weather-snowy-rainy": "0xf67e",
+ "weather-sunny": "0xf599",
+ "weather-sunset": "0xf59a",
+ "weather-sunset-down": "0xf59b",
+ "weather-sunset-up": "0xf59c",
+ "weather-windy": "0xf59d",
+ "weather-windy-variant": "0xf59e",
+ "web": "0xf59f",
+ "webcam": "0xf5a0",
+ "webhook": "0xf62f",
+ "webpack": "0xf72a",
+ "wechat": "0xf611",
+ "weight": "0xf5a1",
+ "weight-gram": "0xfd1b",
+ "weight-kilogram": "0xf5a2",
+ "weight-pound": "0xf9b4",
+ "whatsapp": "0xf5a3",
+ "wheelchair-accessibility": "0xf5a4",
+ "whistle": "0xf9b5",
+ "white-balance-auto": "0xf5a5",
+ "white-balance-incandescent": "0xf5a6",
+ "white-balance-iridescent": "0xf5a7",
+ "white-balance-sunny": "0xf5a8",
+ "widgets": "0xf72b",
+ "wifi": "0xf5a9",
+ "wifi-off": "0xf5aa",
+ "wifi-star": "0xfe6b",
+ "wifi-strength-1": "0xf91e",
+ "wifi-strength-1-alert": "0xf91f",
+ "wifi-strength-1-lock": "0xf920",
+ "wifi-strength-2": "0xf921",
+ "wifi-strength-2-alert": "0xf922",
+ "wifi-strength-2-lock": "0xf923",
+ "wifi-strength-3": "0xf924",
+ "wifi-strength-3-alert": "0xf925",
+ "wifi-strength-3-lock": "0xf926",
+ "wifi-strength-4": "0xf927",
+ "wifi-strength-4-alert": "0xf928",
+ "wifi-strength-4-lock": "0xf929",
+ "wifi-strength-alert-outline": "0xf92a",
+ "wifi-strength-lock-outline": "0xf92b",
+ "wifi-strength-off": "0xf92c",
+ "wifi-strength-off-outline": "0xf92d",
+ "wifi-strength-outline": "0xf92e",
+ "wii": "0xf5ab",
+ "wiiu": "0xf72c",
+ "wikipedia": "0xf5ac",
+ "wind-turbine": "0xfd81",
+ "window-close": "0xf5ad",
+ "window-closed": "0xf5ae",
+ "window-maximize": "0xf5af",
+ "window-minimize": "0xf5b0",
+ "window-open": "0xf5b1",
+ "window-restore": "0xf5b2",
+ "windows": "0xf5b3",
+ "windows-classic": "0xfa20",
+ "wiper": "0xfae8",
+ "wiper-wash": "0xfd82",
+ "wordpress": "0xf5b4",
+ "worker": "0xf5b5",
+ "wrap": "0xf5b6",
+ "wrap-disabled": "0xfbbb",
+ "wrench": "0xf5b7",
+ "wrench-outline": "0xfbbc",
+ "wunderlist": "0xf5b8",
+ "xamarin": "0xf844",
+ "xamarin-outline": "0xf845",
+ "xaml": "0xf673",
+ "xbox": "0xf5b9",
+ "xbox-controller": "0xf5ba",
+ "xbox-controller-battery-alert": "0xf74a",
+ "xbox-controller-battery-charging": "0xfa21",
+ "xbox-controller-battery-empty": "0xf74b",
+ "xbox-controller-battery-full": "0xf74c",
+ "xbox-controller-battery-low": "0xf74d",
+ "xbox-controller-battery-medium": "0xf74e",
+ "xbox-controller-battery-unknown": "0xf74f",
+ "xbox-controller-menu": "0xfe52",
+ "xbox-controller-off": "0xf5bb",
+ "xbox-controller-view": "0xfe53",
+ "xda": "0xf5bc",
+ "xing": "0xf5bd",
+ "xing-box": "0xf5be",
+ "xing-circle": "0xf5bf",
+ "xml": "0xf5c0",
+ "xmpp": "0xf7fe",
+ "yahoo": "0xfb2a",
+ "yammer": "0xf788",
+ "yeast": "0xf5c1",
+ "yelp": "0xf5c2",
+ "yin-yang": "0xf67f",
+ "youtube": "0xf5c3",
+ "youtube-creator-studio": "0xf846",
+ "youtube-gaming": "0xf847",
+ "youtube-subscription": "0xfd1c",
+ "youtube-tv": "0xf448",
+ "z-wave": "0xfae9",
+ "zend": "0xfaea",
+ "zigbee": "0xfd1d",
+ "zip-box": "0xf5c4",
+ "zip-disk": "0xfa22",
+ "zodiac-aquarius": "0xfa7c",
+ "zodiac-aries": "0xfa7d",
+ "zodiac-cancer": "0xfa7e",
+ "zodiac-capricorn": "0xfa7f",
+ "zodiac-gemini": "0xfa80",
+ "zodiac-leo": "0xfa81",
+ "zodiac-libra": "0xfa82",
+ "zodiac-pisces": "0xfa83",
+ "zodiac-sagittarius": "0xfa84",
+ "zodiac-scorpio": "0xfa85",
+ "zodiac-taurus": "0xfa86",
"zodiac-virgo": "0xfa87"
}
\ No newline at end of file
diff --git a/qt/scientific_interfaces/Direct/CMakeLists.txt b/qt/scientific_interfaces/Direct/CMakeLists.txt
index 210b7ab78588fceb2765a3c583034c8fec0a9550..a5c0e30dbdd0b246d72082bb4a3fbb7b309edfe1 100644
--- a/qt/scientific_interfaces/Direct/CMakeLists.txt
+++ b/qt/scientific_interfaces/Direct/CMakeLists.txt
@@ -3,12 +3,12 @@ set(SRC_FILES
ALFCustomInstrumentView.cpp
ALFCustomInstrumentPresenter.cpp
ALFCustomInstrumentModel.cpp)
-
+
set(MOC_FILES
ALFView.h
ALFCustomInstrumentView.h
ALFCustomInstrumentPresenter.h)
-
+
set(INC_FILES
DllConfig.h
ALFCustomInstrumentModel.h
@@ -82,6 +82,6 @@ mtd_add_qt_library(TARGET_NAME MantidScientificInterfacesDirect
@loader_path/../../Contents/MacOS
@loader_path/../../plugins/qt5
LINUX_INSTALL_RPATH
- "\$ORIGIN/../../${LIB_DIR};\$ORIGIN/../../plugins/qt5/")
+ "\$ORIGIN/../../${LIB_DIR};\$ORIGIN/../../plugins/qt5/")
# Testing target
add_subdirectory(test)
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/CMakeLists.txt b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/CMakeLists.txt
index 161b95953d28f72ffc3e37fdb159405ccdc9b064..4185f471887d922d68f99f00eb2b263ce770416c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/CMakeLists.txt
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(COMMON_SRC_FILES
+set(COMMON_SRC_FILES
Plotter.cpp
Encoder.cpp
Decoder.cpp
diff --git a/qt/scientific_interfaces/ISISSANS/SANSRunWindow.ui b/qt/scientific_interfaces/ISISSANS/SANSRunWindow.ui
index 8a8503dff2285b348c20faa768da9c6699d9aa23..095b778f908464ec25b4116dc8979c74009e0422 100644
--- a/qt/scientific_interfaces/ISISSANS/SANSRunWindow.ui
+++ b/qt/scientific_interfaces/ISISSANS/SANSRunWindow.ui
@@ -841,7 +841,7 @@ Zero Error</string>
<item row="3" column="5">
<widget class="QCheckBox" name="saveNXcanSAS_check">
<property name="toolTip">
- <string>Select one or more file formats.
+ <string>Select one or more file formats.
The NXcanSAS format can be used to save 1D and 2D data. </string>
</property>
<property name="text">
diff --git a/qt/scientific_interfaces/Indirect/IndirectInterfaceProperties.xml b/qt/scientific_interfaces/Indirect/IndirectInterfaceProperties.xml
index b4df3f0734a3cf7688b322555b5b61c063de1f02..dd74c780bc7ff22f259002b783d56840ab29445c 100644
--- a/qt/scientific_interfaces/Indirect/IndirectInterfaceProperties.xml
+++ b/qt/scientific_interfaces/Indirect/IndirectInterfaceProperties.xml
@@ -8,13 +8,13 @@ xsi:schemaLocation="http://www.w3schools.com IndirectInterfacePropertiesSchema.x
<FILE-SUFFIXES calibration="_calib.nxs"/>
<WORKSPACE-SUFFIXES calibration="_calib"/>
</INTERFACE>
-
+
<INTERFACE id="ISISDiagnostics">
<EXTENSIONS calibration=".nxs"/>
<FILE-SUFFIXES calibration="_calib.nxs"/>
<WORKSPACE-SUFFIXES calibration="_calib"/>
</INTERFACE>
-
+
<INTERFACE id="Symmetrise">
<EXTENSIONS all=".nxs"/>
<FILE-SUFFIXES sample="_red.nxs"/>
@@ -26,73 +26,73 @@ xsi:schemaLocation="http://www.w3schools.com IndirectInterfacePropertiesSchema.x
<FILE-SUFFIXES sample="_red.nxs"/>
<WORKSPACE-SUFFIXES sample="_red"/>
</INTERFACE>
-
+
<INTERFACE id="Moments">
<EXTENSIONS all=".nxs"/>
<FILE-SUFFIXES sample="_sqw.nxs"/>
<WORKSPACE-SUFFIXES sample="_sqw"/>
</INTERFACE>
-
+
<INTERFACE id="ContainerSubtraction">
<EXTENSIONS all=".nxs"/>
<FILE-SUFFIXES sample="_red.nxs,_sqw.nxs,_elf.nxs" container="_red.nxs,_sqw.nxs,_elf.nxs"/>
<WORKSPACE-SUFFIXES sample="_red,_sqw,_elf" container="_red,_sqw,_elf"/>
</INTERFACE>
-
+
<INTERFACE id="CalculatePaalmanPings">
<EXTENSIONS all=".nxs"/>
<FILE-SUFFIXES sample="_red.nxs" container="_red.nxs"/>
<WORKSPACE-SUFFIXES sample="_red" container="_red"/>
</INTERFACE>
-
+
<INTERFACE id="CalculateMonteCarlo">
<EXTENSIONS all=".nxs"/>
<FILE-SUFFIXES sample="_red.nxs" container="_red.nxs"/>
<WORKSPACE-SUFFIXES sample="_red" container="_red"/>
</INTERFACE>
-
+
<INTERFACE id="ApplyCorrections">
<EXTENSIONS all=".nxs"/>
<FILE-SUFFIXES sample="_red.nxs" container="_red.nxs" corrections="_Corrections.nxs"/>
<WORKSPACE-SUFFIXES sample="_red" container="_red" corrections="_Corrections"/>
</INTERFACE>
-
+
<INTERFACE id="Elwin">
<EXTENSIONS all=".nxs"/>
<FILE-SUFFIXES sample="_red.nxs,_sqw.nxs"/>
<WORKSPACE-SUFFIXES sample="_red,_sqw"/>
</INTERFACE>
-
+
<INTERFACE id="MSDFit">
<EXTENSIONS all=".nxs,.dave,.grp"/>
<FILE-SUFFIXES sample="_eq.nxs"/>
<WORKSPACE-SUFFIXES sample="_eq"/>
</INTERFACE>
-
+
<INTERFACE id="Iqt">
<EXTENSIONS all=".nxs"/>
<FILE-SUFFIXES sample="_red.nxs,_sqw.nxs" resolution="_res.nxs,_red.nxs,_sqw.nxs"/>
<WORKSPACE-SUFFIXES sample="_red,_sqw" resolution="_res,_red,_sqw"/>
</INTERFACE>
-
+
<INTERFACE id="IqtFit">
<EXTENSIONS all=".nxs,.dave,.grp"/>
<FILE-SUFFIXES sample="_iqt.nxs"/>
<WORKSPACE-SUFFIXES sample="_iqt"/>
</INTERFACE>
-
+
<INTERFACE id="ConvFit">
<EXTENSIONS all=".nxs,.dave,.grp"/>
<FILE-SUFFIXES sample="_red.nxs,_sqw.nxs,_sqw.dave" resolution="_res.nxs,_red.nxs,_sqw.nxs,_sqw.dave"/>
<WORKSPACE-SUFFIXES sample="_red,_sqw" resolution="_res,_red,_sqw"/>
</INTERFACE>
-
+
<INTERFACE id="FQFit">
<EXTENSIONS all=".nxs,.dave,.grp"/>
<FILE-SUFFIXES sample="_Result.nxs"/>
<WORKSPACE-SUFFIXES sample="_Result"/>
</INTERFACE>
-
+
<INTERFACE id="ResNorm">
<EXTENSIONS all=".nxs"/>
<FILE-SUFFIXES vanadium="_red.nxs,_sqw.nxs" resolution="_res.nxs"/>
@@ -104,11 +104,11 @@ xsi:schemaLocation="http://www.w3schools.com IndirectInterfacePropertiesSchema.x
<FILE-SUFFIXES sample="_red.nxs,_sqw.nxs" resolution="_res.nxs,_red.nxs,_sqw.nxs"/>
<WORKSPACE-SUFFIXES sample="_red,_sqw" resolution="_res,_red,_sqw"/>
</INTERFACE>
-
+
<INTERFACE id="Stretch">
<EXTENSIONS all=".nxs"/>
<FILE-SUFFIXES sample="_red.nxs,_sqw.nxs" resolution="_res.nxs"/>
<WORKSPACE-SUFFIXES sample="_red,_sqw" resolution="_res"/>
</INTERFACE>
-
+
</INTERFACE-PROPERTIES>
\ No newline at end of file
diff --git a/qt/scientific_interfaces/Muon/CMakeLists.txt b/qt/scientific_interfaces/Muon/CMakeLists.txt
index 462035ff2c620d97c61333f019f0f8cfd2681c4d..0df27489c4c5619b0fe599aed07f1a734029fccb 100644
--- a/qt/scientific_interfaces/Muon/CMakeLists.txt
+++ b/qt/scientific_interfaces/Muon/CMakeLists.txt
@@ -200,6 +200,6 @@ mtd_add_qt_library(TARGET_NAME MantidScientificInterfacesMuon
@loader_path/../../plugins/qt5
LINUX_INSTALL_RPATH
"\$ORIGIN/../../${LIB_DIR};\$ORIGIN/../../plugins/qt5/")
-
+
# Testing target
add_subdirectory(test)
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowser.qrc b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowser.qrc
index 4f91ab782c66ea42e56c61573da06d855a6dc483..1f26f16335c09bbcaaa4774a608dd86e0ce6ad3e 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowser.qrc
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowser.qrc
@@ -20,4 +20,4 @@
<file>images/cursor-whatsthis.png</file>
</qresource>
</RCC>
-
+
diff --git a/qt/widgets/common/src/pixmaps.cpp b/qt/widgets/common/src/pixmaps.cpp
index 28dcd2198d1d005ebaacaa98f14fd64ec588b024..f212a734626656382f264afdce560746b83b7bb8 100644
--- a/qt/widgets/common/src/pixmaps.cpp
+++ b/qt/widgets/common/src/pixmaps.cpp
@@ -12222,7 +12222,7 @@ static const char * magnifier_xpm[] = {
" o+p+q+ "};
-/* "Manage User Directories" Icon */
+/* "Manage User Directories" Icon */
static const char * managefolders_xpm[] = {
"32 32 534 2",
" c None",
diff --git a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/StartLiveDataDialog.ui b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/StartLiveDataDialog.ui
index 434bcde5eb2e3a1b558bfe8390c5527b27a2dee1..b05fd18d33381db043784863213fad7718a8756c 100644
--- a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/StartLiveDataDialog.ui
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/StartLiveDataDialog.ui
@@ -55,7 +55,7 @@
<widget class="QGroupBox" name="grpConnection">
<property name="styleSheet">
<string notr="true">QGroupBox { border: 1px solid gray; border-radius: 4px; font-weight: bold; margin-top: 4px; margin-bottom: 4px; padding-top: 16px; }
-QGroupBox::title { background-color: transparent; subcontrol-position: top center; padding-top:4px; padding-bottom:4px; }
+QGroupBox::title { background-color: transparent; subcontrol-position: top center; padding-top:4px; padding-bottom:4px; }
</string>
</property>
<property name="title">
@@ -100,7 +100,7 @@ QGroupBox::title { background-color: transparent; subcontrol-position: top cent
<widget class="QGroupBox" name="groupBox">
<property name="styleSheet">
<string notr="true">QGroupBox { border: 1px solid gray; border-radius: 4px; font-weight: bold; margin-top: 4px; margin-bottom: 4px; padding-top: 16px; }
-QGroupBox::title { background-color: transparent; subcontrol-position: top center; padding-top:4px; padding-bottom:4px; }
+QGroupBox::title { background-color: transparent; subcontrol-position: top center; padding-top:4px; padding-bottom:4px; }
</string>
</property>
<property name="title">
@@ -216,7 +216,7 @@ QGroupBox::title { background-color: transparent; subcontrol-position: top cent
<widget class="QGroupBox" name="grpProcess">
<property name="styleSheet">
<string notr="true">QGroupBox { border: 1px solid gray; border-radius: 4px; font-weight: bold; margin-top: 4px; margin-bottom: 4px; padding-top: 16px; }
-QGroupBox::title { background-color: transparent; subcontrol-position: top center; padding-top:4px; padding-bottom:4px; }
+QGroupBox::title { background-color: transparent; subcontrol-position: top center; padding-top:4px; padding-bottom:4px; }
</string>
</property>
<property name="title">
@@ -309,7 +309,7 @@ p, li { white-space: pre-wrap; }
<widget class="QGroupBox" name="grpPostProcessing">
<property name="styleSheet">
<string notr="true">QGroupBox { border: 1px solid gray; border-radius: 4px; font-weight: bold; margin-top: 4px; margin-bottom: 4px; padding-top: 16px; }
-QGroupBox::title { background-color: transparent; subcontrol-position: top center; padding-top:4px; padding-bottom:4px; }
+QGroupBox::title { background-color: transparent; subcontrol-position: top center; padding-top:4px; padding-bottom:4px; }
</string>
</property>
<property name="title">
@@ -405,7 +405,7 @@ QGroupBox::title { background-color: transparent; subcontrol-position: top cent
</property>
<property name="styleSheet">
<string notr="true">QGroupBox { border: 1px solid gray; border-radius: 4px; font-weight: bold; margin-top: 4px; margin-bottom: 4px; padding-top: 16px; }
-QGroupBox::title { background-color: transparent; subcontrol-position: top center; padding-top:4px; padding-bottom:4px; }
+QGroupBox::title { background-color: transparent; subcontrol-position: top center; padding-top:4px; padding-bottom:4px; }
</string>
</property>
<property name="title">
diff --git a/scripts/Diffraction/isis_powder/hrpd_routines/Examples/hrpd_cycle_map_example.yaml b/scripts/Diffraction/isis_powder/hrpd_routines/Examples/hrpd_cycle_map_example.yaml
index cb9786e2d52e1550659a21e8225044fa2a9326b7..342392c225c4a1f622c41e8bbd139597a2156b14 100644
--- a/scripts/Diffraction/isis_powder/hrpd_routines/Examples/hrpd_cycle_map_example.yaml
+++ b/scripts/Diffraction/isis_powder/hrpd_routines/Examples/hrpd_cycle_map_example.yaml
@@ -1,6 +1,6 @@
66027-66828 :
"coupled":
- "10-110" :
+ "10-110" :
empty_run_numbers : 66028
vanadium_run_numbers : 66031
"100-200":
@@ -10,7 +10,7 @@
empty_run_numbers : 66029
vanadium_run_numbers : 66032
"decoupled":
- "10-110" :
+ "10-110" :
empty_run_numbers : 6602
vanadium_run_numbers : 6031
"100-200":
@@ -21,7 +21,7 @@
vanadium_run_numbers : 6032
label : "16_5"
offset_file_name : "hrpd_new_072_01_corr.cal"
-
+
66829-68194:
"coupled":
"10-110":
@@ -32,4 +32,3 @@
vanadium_run_numbers : 66834
label: "17_1"
offset_file_name : "hrpd_new_072_01_corr.cal"
-
\ No newline at end of file
diff --git a/scripts/Diffraction/isis_powder/polaris_routines/Examples/Calibration/VanaPeaks.dat b/scripts/Diffraction/isis_powder/polaris_routines/Examples/Calibration/VanaPeaks.dat
index cd8389dcba850d348a7e7e8a3d4f46ba2741cb5a..b072fd130caee0de10c2909a867fd39b25137ac8 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/Examples/Calibration/VanaPeaks.dat
+++ b/scripts/Diffraction/isis_powder/polaris_routines/Examples/Calibration/VanaPeaks.dat
@@ -1,59 +1,59 @@
# bank 1 - only see 1 peak at 2.144Å (plus "edge" at 2.730-2.775)
-2.730 2.775
-2.062 2.253
+2.730 2.775
+2.062 2.253
# bank 2 - see 6 peaks plus "edge" at 2.696-2.725
-2.696 2.725
-2.072 2.238
-1.494 1.548
-1.206 1.275
-1.055 1.094
-0.938 0.983
-0.791 0.833
+2.696 2.725
+2.072 2.238
+1.494 1.548
+1.206 1.275
+1.055 1.094
+0.938 0.983
+0.791 0.833
# bank 3 - see V peaks plus "edge" at 2.693-2.758 (well fitted by spline 150)
-2.693 2.758
-2.102 2.184
-1.494 1.531
-1.214 1.264
-1.058 1.089
-0.946 0.971
-0.868 0.883
-0.795 0.821
-0.706 0.723
-0.672 0.683
-0.639 0.653
-0.588 0.601
-0.546 0.560
-0.489 0.499
+2.693 2.758
+2.102 2.184
+1.494 1.531
+1.214 1.264
+1.058 1.089
+0.946 0.971
+0.868 0.883
+0.795 0.821
+0.706 0.723
+0.672 0.683
+0.639 0.653
+0.588 0.601
+0.546 0.560
+0.489 0.499
# bank 4 - "edge" (2.686-2.770) appears more spread out and is easily fitted by spline 150
-2.112 2.167
-1.501 1.533
-1.223 1.254
-1.063 1.083
-0.947 0.969
-0.868 0.882
-0.800 0.822
-0.708 0.723
-0.672 0.685
-0.640 0.652
-0.614 0.625
-0.589 0.599
-0.548 0.558
-0.514 0.523
-0.487 0.495
+2.112 2.167
+1.501 1.533
+1.223 1.254
+1.063 1.083
+0.947 0.969
+0.868 0.882
+0.800 0.822
+0.708 0.723
+0.672 0.685
+0.640 0.652
+0.614 0.625
+0.589 0.599
+0.548 0.558
+0.514 0.523
+0.487 0.495
# bank 5 - is edge (2.696-2.769) the tail cutter closing? (well fitted by spline 150)
-2.127 2.165
-1.504 1.529
-1.229 1.249
-1.063 1.080
-0.951 0.967
-0.868 0.881
+2.127 2.165
+1.504 1.529
+1.229 1.249
+1.063 1.080
+0.951 0.967
+0.868 0.881
0.803 0.817
-0.753 0.762
-0.708 0.723
-0.673 0.683
+0.753 0.762
+0.708 0.723
+0.673 0.683
0.641 0.650
-0.615 0.622
-0.589 0.602
-0.549 0.559
-0.516 0.525
-0.489 0.498
+0.615 0.622
+0.589 0.602
+0.549 0.559
+0.516 0.525
+0.489 0.498
diff --git a/scripts/Diffraction/isis_powder/polaris_routines/Examples/polaris_cycle_map.yaml b/scripts/Diffraction/isis_powder/polaris_routines/Examples/polaris_cycle_map.yaml
index ef83a087cc2df7b200cf83a7bb4f99738a4886ea..4fb2bb6c0eb5343c558f5c998995bc1508320f39 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/Examples/polaris_cycle_map.yaml
+++ b/scripts/Diffraction/isis_powder/polaris_routines/Examples/polaris_cycle_map.yaml
@@ -1,5 +1,5 @@
-# NOTE: the data in the 8 lines below are TEST data -
+# NOTE: the data in the 8 lines below are TEST data -
# it is not representative of any actual cycles/data values used
# Used in ISIS Powder tutorial
@@ -133,7 +133,7 @@
69963-73060:
# Note: run 73060 (last run in Journal Folder 14_1 is
# VANADIUM ROD run from start of Cycle 2014/2
- offset_file_name : "Cycle_14_1_silicon_all_spectra.cal"
+ offset_file_name : "Cycle_14_1_silicon_all_spectra.cal"
label : "14_1"
Rietveld:
vanadium_run_numbers : "69963"
@@ -143,7 +143,7 @@
# empty_run_numbers : ""
63761-64299:
- offset_file_name : "Cycle_12_2_group_masked_collimator.cal"
+ offset_file_name : "Cycle_12_2_group_masked_collimator.cal"
label : "13_2"
Rietveld:
vanadium_run_numbers : "63763"
@@ -151,7 +151,6 @@
# PDF:
# vanadium_run_numbers : ""
# empty_run_numbers : ""
-
-
-
-
\ No newline at end of file
+
+
+
diff --git a/scripts/Diffraction/isis_powder/polaris_routines/Examples/polaris_cycle_map_example.yaml b/scripts/Diffraction/isis_powder/polaris_routines/Examples/polaris_cycle_map_example.yaml
index 66773019ab2ea484b4946d5622e316b36bf1ccf8..3aa15e6e9ae630141370a00a8c14dfabd3415ce0 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/Examples/polaris_cycle_map_example.yaml
+++ b/scripts/Diffraction/isis_powder/polaris_routines/Examples/polaris_cycle_map_example.yaml
@@ -1,5 +1,5 @@
-# NOTE: All of the data below is TEST data -
+# NOTE: All of the data below is TEST data -
# it is not representative of any actual cycles/data values used
78334-82415:
diff --git a/scripts/Engineering/ENGINX/phase_info/AG.cif b/scripts/Engineering/ENGINX/phase_info/AG.cif
index d0bc71e3d5fbb1ad5746eb082ff0a1d5806d01db..10b4487b8ab718f17866d5b9e33db9c1a285bdda 100644
--- a/scripts/Engineering/ENGINX/phase_info/AG.cif
+++ b/scripts/Engineering/ENGINX/phase_info/AG.cif
@@ -219,198 +219,198 @@ _cell_volume 68.2304
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x,+y+1/2,-z+1/2
- 105 -z,+x+1/2,+y+1/2
- 106 +y,-z+1/2,+x+1/2
- 107 -z,+x+1/2,-y+1/2
- 108 -y,-z+1/2,+x+1/2
- 109 +y,-z+1/2,-x+1/2
- 110 -x,+y+1/2,-z+1/2
- 111 -z,-x+1/2,+y+1/2
- 112 +x,-y+1/2,-z+1/2
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y,+x+1/2,-z+1/2
- 117 -z,+y+1/2,+x+1/2
- 118 +x,-z+1/2,+y+1/2
- 119 -z,+y+1/2,-x+1/2
- 120 -x,-z+1/2,+y+1/2
- 121 +x,-z+1/2,-y+1/2
- 122 -y,+x+1/2,-z+1/2
- 123 -z,-y+1/2,+x+1/2
- 124 +y,-x+1/2,-z+1/2
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x,-y+1/2,+z+1/2
- -105 +z,-x+1/2,-y+1/2
- -106 -y,+z+1/2,-x+1/2
- -107 +z,-x+1/2,+y+1/2
- -108 +y,+z+1/2,-x+1/2
- -109 -y,+z+1/2,+x+1/2
- -110 +x,-y+1/2,+z+1/2
- -111 +z,+x+1/2,-y+1/2
- -112 -x,+y+1/2,+z+1/2
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y,-x+1/2,+z+1/2
- -117 +z,-y+1/2,-x+1/2
- -118 -x,+z+1/2,-y+1/2
- -119 +z,-y+1/2,+x+1/2
- -120 +x,+z+1/2,-y+1/2
- -121 -x,+z+1/2,+y+1/2
- -122 +y,-x+1/2,+z+1/2
- -123 +z,+y+1/2,-x+1/2
- -124 -y,+x+1/2,+z+1/2
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+1/2,+y,-z+1/2
- 205 -z+1/2,+x,+y+1/2
- 206 +y+1/2,-z,+x+1/2
- 207 -z+1/2,+x,-y+1/2
- 208 -y+1/2,-z,+x+1/2
- 209 +y+1/2,-z,-x+1/2
- 210 -x+1/2,+y,-z+1/2
- 211 -z+1/2,-x,+y+1/2
- 212 +x+1/2,-y,-z+1/2
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+1/2,+x,-z+1/2
- 217 -z+1/2,+y,+x+1/2
- 218 +x+1/2,-z,+y+1/2
- 219 -z+1/2,+y,-x+1/2
- 220 -x+1/2,-z,+y+1/2
- 221 +x+1/2,-z,-y+1/2
- 222 -y+1/2,+x,-z+1/2
- 223 -z+1/2,-y,+x+1/2
- 224 +y+1/2,-x,-z+1/2
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/2,-y,+z+1/2
- -205 +z+1/2,-x,-y+1/2
- -206 -y+1/2,+z,-x+1/2
- -207 +z+1/2,-x,+y+1/2
- -208 +y+1/2,+z,-x+1/2
- -209 -y+1/2,+z,+x+1/2
- -210 +x+1/2,-y,+z+1/2
- -211 +z+1/2,+x,-y+1/2
- -212 -x+1/2,+y,+z+1/2
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/2,-x,+z+1/2
- -217 +z+1/2,-y,-x+1/2
- -218 -x+1/2,+z,-y+1/2
- -219 +z+1/2,-y,+x+1/2
- -220 +x+1/2,+z,-y+1/2
- -221 -x+1/2,+z,+y+1/2
- -222 +y+1/2,-x,+z+1/2
- -223 +z+1/2,+y,-x+1/2
- -224 -y+1/2,+x,+z+1/2
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+1/2,+y+1/2,-z
- 305 -z+1/2,+x+1/2,+y
- 306 +y+1/2,-z+1/2,+x
- 307 -z+1/2,+x+1/2,-y
- 308 -y+1/2,-z+1/2,+x
- 309 +y+1/2,-z+1/2,-x
- 310 -x+1/2,+y+1/2,-z
- 311 -z+1/2,-x+1/2,+y
- 312 +x+1/2,-y+1/2,-z
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+1/2,+x+1/2,-z
- 317 -z+1/2,+y+1/2,+x
- 318 +x+1/2,-z+1/2,+y
- 319 -z+1/2,+y+1/2,-x
- 320 -x+1/2,-z+1/2,+y
- 321 +x+1/2,-z+1/2,-y
- 322 -y+1/2,+x+1/2,-z
- 323 -z+1/2,-y+1/2,+x
- 324 +y+1/2,-x+1/2,-z
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/2,-y+1/2,+z
- -305 +z+1/2,-x+1/2,-y
- -306 -y+1/2,+z+1/2,-x
- -307 +z+1/2,-x+1/2,+y
- -308 +y+1/2,+z+1/2,-x
- -309 -y+1/2,+z+1/2,+x
- -310 +x+1/2,-y+1/2,+z
- -311 +z+1/2,+x+1/2,-y
- -312 -x+1/2,+y+1/2,+z
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/2,-x+1/2,+z
- -317 +z+1/2,-y+1/2,-x
- -318 -x+1/2,+z+1/2,-y
- -319 +z+1/2,-y+1/2,+x
- -320 +x+1/2,+z+1/2,-y
- -321 -x+1/2,+z+1/2,+y
- -322 +y+1/2,-x+1/2,+z
- -323 +z+1/2,+y+1/2,-x
- -324 -y+1/2,+x+1/2,+z
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x,+y+1/2,-z+1/2
+ 105 -z,+x+1/2,+y+1/2
+ 106 +y,-z+1/2,+x+1/2
+ 107 -z,+x+1/2,-y+1/2
+ 108 -y,-z+1/2,+x+1/2
+ 109 +y,-z+1/2,-x+1/2
+ 110 -x,+y+1/2,-z+1/2
+ 111 -z,-x+1/2,+y+1/2
+ 112 +x,-y+1/2,-z+1/2
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y,+x+1/2,-z+1/2
+ 117 -z,+y+1/2,+x+1/2
+ 118 +x,-z+1/2,+y+1/2
+ 119 -z,+y+1/2,-x+1/2
+ 120 -x,-z+1/2,+y+1/2
+ 121 +x,-z+1/2,-y+1/2
+ 122 -y,+x+1/2,-z+1/2
+ 123 -z,-y+1/2,+x+1/2
+ 124 +y,-x+1/2,-z+1/2
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x,-y+1/2,+z+1/2
+ -105 +z,-x+1/2,-y+1/2
+ -106 -y,+z+1/2,-x+1/2
+ -107 +z,-x+1/2,+y+1/2
+ -108 +y,+z+1/2,-x+1/2
+ -109 -y,+z+1/2,+x+1/2
+ -110 +x,-y+1/2,+z+1/2
+ -111 +z,+x+1/2,-y+1/2
+ -112 -x,+y+1/2,+z+1/2
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y,-x+1/2,+z+1/2
+ -117 +z,-y+1/2,-x+1/2
+ -118 -x,+z+1/2,-y+1/2
+ -119 +z,-y+1/2,+x+1/2
+ -120 +x,+z+1/2,-y+1/2
+ -121 -x,+z+1/2,+y+1/2
+ -122 +y,-x+1/2,+z+1/2
+ -123 +z,+y+1/2,-x+1/2
+ -124 -y,+x+1/2,+z+1/2
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+1/2,+y,-z+1/2
+ 205 -z+1/2,+x,+y+1/2
+ 206 +y+1/2,-z,+x+1/2
+ 207 -z+1/2,+x,-y+1/2
+ 208 -y+1/2,-z,+x+1/2
+ 209 +y+1/2,-z,-x+1/2
+ 210 -x+1/2,+y,-z+1/2
+ 211 -z+1/2,-x,+y+1/2
+ 212 +x+1/2,-y,-z+1/2
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+1/2,+x,-z+1/2
+ 217 -z+1/2,+y,+x+1/2
+ 218 +x+1/2,-z,+y+1/2
+ 219 -z+1/2,+y,-x+1/2
+ 220 -x+1/2,-z,+y+1/2
+ 221 +x+1/2,-z,-y+1/2
+ 222 -y+1/2,+x,-z+1/2
+ 223 -z+1/2,-y,+x+1/2
+ 224 +y+1/2,-x,-z+1/2
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/2,-y,+z+1/2
+ -205 +z+1/2,-x,-y+1/2
+ -206 -y+1/2,+z,-x+1/2
+ -207 +z+1/2,-x,+y+1/2
+ -208 +y+1/2,+z,-x+1/2
+ -209 -y+1/2,+z,+x+1/2
+ -210 +x+1/2,-y,+z+1/2
+ -211 +z+1/2,+x,-y+1/2
+ -212 -x+1/2,+y,+z+1/2
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/2,-x,+z+1/2
+ -217 +z+1/2,-y,-x+1/2
+ -218 -x+1/2,+z,-y+1/2
+ -219 +z+1/2,-y,+x+1/2
+ -220 +x+1/2,+z,-y+1/2
+ -221 -x+1/2,+z,+y+1/2
+ -222 +y+1/2,-x,+z+1/2
+ -223 +z+1/2,+y,-x+1/2
+ -224 -y+1/2,+x,+z+1/2
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+1/2,+y+1/2,-z
+ 305 -z+1/2,+x+1/2,+y
+ 306 +y+1/2,-z+1/2,+x
+ 307 -z+1/2,+x+1/2,-y
+ 308 -y+1/2,-z+1/2,+x
+ 309 +y+1/2,-z+1/2,-x
+ 310 -x+1/2,+y+1/2,-z
+ 311 -z+1/2,-x+1/2,+y
+ 312 +x+1/2,-y+1/2,-z
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+1/2,+x+1/2,-z
+ 317 -z+1/2,+y+1/2,+x
+ 318 +x+1/2,-z+1/2,+y
+ 319 -z+1/2,+y+1/2,-x
+ 320 -x+1/2,-z+1/2,+y
+ 321 +x+1/2,-z+1/2,-y
+ 322 -y+1/2,+x+1/2,-z
+ 323 -z+1/2,-y+1/2,+x
+ 324 +y+1/2,-x+1/2,-z
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/2,-y+1/2,+z
+ -305 +z+1/2,-x+1/2,-y
+ -306 -y+1/2,+z+1/2,-x
+ -307 +z+1/2,-x+1/2,+y
+ -308 +y+1/2,+z+1/2,-x
+ -309 -y+1/2,+z+1/2,+x
+ -310 +x+1/2,-y+1/2,+z
+ -311 +z+1/2,+x+1/2,-y
+ -312 -x+1/2,+y+1/2,+z
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/2,-x+1/2,+z
+ -317 +z+1/2,-y+1/2,-x
+ -318 -x+1/2,+z+1/2,-y
+ -319 +z+1/2,-y+1/2,+x
+ -320 +x+1/2,+z+1/2,-y
+ -321 -x+1/2,+z+1/2,+y
+ -322 +y+1/2,-x+1/2,+z
+ -323 +z+1/2,+y+1/2,-x
+ -324 -y+1/2,+x+1/2,+z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -427,7 +427,7 @@ loop_
_atom_site_symmetry_multiplicity
Ag
AG1 0.0 0.0 0.0 1.0 Uiso 0.025 4
-
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Ag
_chemical_formula_weight 107.87
@@ -562,7 +562,7 @@ _refine_ls_R_Fsqd_factor ""
_pd_proc_ls_background_function
; GSAS Background function number 4 with 4 terms.
Power series in Q**2n/n!
- 1: 1.00000 2: 0.00000 3: 0.00000 4: 0.00000
+ 1: 1.00000 2: 0.00000 3: 0.00000 4: 0.00000
;
_exptl_absorpt_process_details
diff --git a/scripts/Engineering/ENGINX/phase_info/AL.cif b/scripts/Engineering/ENGINX/phase_info/AL.cif
index ef6a02b093c43d4282c1c3cf684cf04da2c19c27..c4162d1a414a62330c623787dd94e25c606102a2 100644
--- a/scripts/Engineering/ENGINX/phase_info/AL.cif
+++ b/scripts/Engineering/ENGINX/phase_info/AL.cif
@@ -219,198 +219,198 @@ _cell_volume 66.5483
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x,+y+1/2,-z+1/2
- 105 -z,+x+1/2,+y+1/2
- 106 +y,-z+1/2,+x+1/2
- 107 -z,+x+1/2,-y+1/2
- 108 -y,-z+1/2,+x+1/2
- 109 +y,-z+1/2,-x+1/2
- 110 -x,+y+1/2,-z+1/2
- 111 -z,-x+1/2,+y+1/2
- 112 +x,-y+1/2,-z+1/2
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y,+x+1/2,-z+1/2
- 117 -z,+y+1/2,+x+1/2
- 118 +x,-z+1/2,+y+1/2
- 119 -z,+y+1/2,-x+1/2
- 120 -x,-z+1/2,+y+1/2
- 121 +x,-z+1/2,-y+1/2
- 122 -y,+x+1/2,-z+1/2
- 123 -z,-y+1/2,+x+1/2
- 124 +y,-x+1/2,-z+1/2
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x,-y+1/2,+z+1/2
- -105 +z,-x+1/2,-y+1/2
- -106 -y,+z+1/2,-x+1/2
- -107 +z,-x+1/2,+y+1/2
- -108 +y,+z+1/2,-x+1/2
- -109 -y,+z+1/2,+x+1/2
- -110 +x,-y+1/2,+z+1/2
- -111 +z,+x+1/2,-y+1/2
- -112 -x,+y+1/2,+z+1/2
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y,-x+1/2,+z+1/2
- -117 +z,-y+1/2,-x+1/2
- -118 -x,+z+1/2,-y+1/2
- -119 +z,-y+1/2,+x+1/2
- -120 +x,+z+1/2,-y+1/2
- -121 -x,+z+1/2,+y+1/2
- -122 +y,-x+1/2,+z+1/2
- -123 +z,+y+1/2,-x+1/2
- -124 -y,+x+1/2,+z+1/2
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+1/2,+y,-z+1/2
- 205 -z+1/2,+x,+y+1/2
- 206 +y+1/2,-z,+x+1/2
- 207 -z+1/2,+x,-y+1/2
- 208 -y+1/2,-z,+x+1/2
- 209 +y+1/2,-z,-x+1/2
- 210 -x+1/2,+y,-z+1/2
- 211 -z+1/2,-x,+y+1/2
- 212 +x+1/2,-y,-z+1/2
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+1/2,+x,-z+1/2
- 217 -z+1/2,+y,+x+1/2
- 218 +x+1/2,-z,+y+1/2
- 219 -z+1/2,+y,-x+1/2
- 220 -x+1/2,-z,+y+1/2
- 221 +x+1/2,-z,-y+1/2
- 222 -y+1/2,+x,-z+1/2
- 223 -z+1/2,-y,+x+1/2
- 224 +y+1/2,-x,-z+1/2
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/2,-y,+z+1/2
- -205 +z+1/2,-x,-y+1/2
- -206 -y+1/2,+z,-x+1/2
- -207 +z+1/2,-x,+y+1/2
- -208 +y+1/2,+z,-x+1/2
- -209 -y+1/2,+z,+x+1/2
- -210 +x+1/2,-y,+z+1/2
- -211 +z+1/2,+x,-y+1/2
- -212 -x+1/2,+y,+z+1/2
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/2,-x,+z+1/2
- -217 +z+1/2,-y,-x+1/2
- -218 -x+1/2,+z,-y+1/2
- -219 +z+1/2,-y,+x+1/2
- -220 +x+1/2,+z,-y+1/2
- -221 -x+1/2,+z,+y+1/2
- -222 +y+1/2,-x,+z+1/2
- -223 +z+1/2,+y,-x+1/2
- -224 -y+1/2,+x,+z+1/2
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+1/2,+y+1/2,-z
- 305 -z+1/2,+x+1/2,+y
- 306 +y+1/2,-z+1/2,+x
- 307 -z+1/2,+x+1/2,-y
- 308 -y+1/2,-z+1/2,+x
- 309 +y+1/2,-z+1/2,-x
- 310 -x+1/2,+y+1/2,-z
- 311 -z+1/2,-x+1/2,+y
- 312 +x+1/2,-y+1/2,-z
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+1/2,+x+1/2,-z
- 317 -z+1/2,+y+1/2,+x
- 318 +x+1/2,-z+1/2,+y
- 319 -z+1/2,+y+1/2,-x
- 320 -x+1/2,-z+1/2,+y
- 321 +x+1/2,-z+1/2,-y
- 322 -y+1/2,+x+1/2,-z
- 323 -z+1/2,-y+1/2,+x
- 324 +y+1/2,-x+1/2,-z
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/2,-y+1/2,+z
- -305 +z+1/2,-x+1/2,-y
- -306 -y+1/2,+z+1/2,-x
- -307 +z+1/2,-x+1/2,+y
- -308 +y+1/2,+z+1/2,-x
- -309 -y+1/2,+z+1/2,+x
- -310 +x+1/2,-y+1/2,+z
- -311 +z+1/2,+x+1/2,-y
- -312 -x+1/2,+y+1/2,+z
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/2,-x+1/2,+z
- -317 +z+1/2,-y+1/2,-x
- -318 -x+1/2,+z+1/2,-y
- -319 +z+1/2,-y+1/2,+x
- -320 +x+1/2,+z+1/2,-y
- -321 -x+1/2,+z+1/2,+y
- -322 +y+1/2,-x+1/2,+z
- -323 +z+1/2,+y+1/2,-x
- -324 -y+1/2,+x+1/2,+z
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x,+y+1/2,-z+1/2
+ 105 -z,+x+1/2,+y+1/2
+ 106 +y,-z+1/2,+x+1/2
+ 107 -z,+x+1/2,-y+1/2
+ 108 -y,-z+1/2,+x+1/2
+ 109 +y,-z+1/2,-x+1/2
+ 110 -x,+y+1/2,-z+1/2
+ 111 -z,-x+1/2,+y+1/2
+ 112 +x,-y+1/2,-z+1/2
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y,+x+1/2,-z+1/2
+ 117 -z,+y+1/2,+x+1/2
+ 118 +x,-z+1/2,+y+1/2
+ 119 -z,+y+1/2,-x+1/2
+ 120 -x,-z+1/2,+y+1/2
+ 121 +x,-z+1/2,-y+1/2
+ 122 -y,+x+1/2,-z+1/2
+ 123 -z,-y+1/2,+x+1/2
+ 124 +y,-x+1/2,-z+1/2
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x,-y+1/2,+z+1/2
+ -105 +z,-x+1/2,-y+1/2
+ -106 -y,+z+1/2,-x+1/2
+ -107 +z,-x+1/2,+y+1/2
+ -108 +y,+z+1/2,-x+1/2
+ -109 -y,+z+1/2,+x+1/2
+ -110 +x,-y+1/2,+z+1/2
+ -111 +z,+x+1/2,-y+1/2
+ -112 -x,+y+1/2,+z+1/2
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y,-x+1/2,+z+1/2
+ -117 +z,-y+1/2,-x+1/2
+ -118 -x,+z+1/2,-y+1/2
+ -119 +z,-y+1/2,+x+1/2
+ -120 +x,+z+1/2,-y+1/2
+ -121 -x,+z+1/2,+y+1/2
+ -122 +y,-x+1/2,+z+1/2
+ -123 +z,+y+1/2,-x+1/2
+ -124 -y,+x+1/2,+z+1/2
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+1/2,+y,-z+1/2
+ 205 -z+1/2,+x,+y+1/2
+ 206 +y+1/2,-z,+x+1/2
+ 207 -z+1/2,+x,-y+1/2
+ 208 -y+1/2,-z,+x+1/2
+ 209 +y+1/2,-z,-x+1/2
+ 210 -x+1/2,+y,-z+1/2
+ 211 -z+1/2,-x,+y+1/2
+ 212 +x+1/2,-y,-z+1/2
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+1/2,+x,-z+1/2
+ 217 -z+1/2,+y,+x+1/2
+ 218 +x+1/2,-z,+y+1/2
+ 219 -z+1/2,+y,-x+1/2
+ 220 -x+1/2,-z,+y+1/2
+ 221 +x+1/2,-z,-y+1/2
+ 222 -y+1/2,+x,-z+1/2
+ 223 -z+1/2,-y,+x+1/2
+ 224 +y+1/2,-x,-z+1/2
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/2,-y,+z+1/2
+ -205 +z+1/2,-x,-y+1/2
+ -206 -y+1/2,+z,-x+1/2
+ -207 +z+1/2,-x,+y+1/2
+ -208 +y+1/2,+z,-x+1/2
+ -209 -y+1/2,+z,+x+1/2
+ -210 +x+1/2,-y,+z+1/2
+ -211 +z+1/2,+x,-y+1/2
+ -212 -x+1/2,+y,+z+1/2
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/2,-x,+z+1/2
+ -217 +z+1/2,-y,-x+1/2
+ -218 -x+1/2,+z,-y+1/2
+ -219 +z+1/2,-y,+x+1/2
+ -220 +x+1/2,+z,-y+1/2
+ -221 -x+1/2,+z,+y+1/2
+ -222 +y+1/2,-x,+z+1/2
+ -223 +z+1/2,+y,-x+1/2
+ -224 -y+1/2,+x,+z+1/2
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+1/2,+y+1/2,-z
+ 305 -z+1/2,+x+1/2,+y
+ 306 +y+1/2,-z+1/2,+x
+ 307 -z+1/2,+x+1/2,-y
+ 308 -y+1/2,-z+1/2,+x
+ 309 +y+1/2,-z+1/2,-x
+ 310 -x+1/2,+y+1/2,-z
+ 311 -z+1/2,-x+1/2,+y
+ 312 +x+1/2,-y+1/2,-z
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+1/2,+x+1/2,-z
+ 317 -z+1/2,+y+1/2,+x
+ 318 +x+1/2,-z+1/2,+y
+ 319 -z+1/2,+y+1/2,-x
+ 320 -x+1/2,-z+1/2,+y
+ 321 +x+1/2,-z+1/2,-y
+ 322 -y+1/2,+x+1/2,-z
+ 323 -z+1/2,-y+1/2,+x
+ 324 +y+1/2,-x+1/2,-z
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/2,-y+1/2,+z
+ -305 +z+1/2,-x+1/2,-y
+ -306 -y+1/2,+z+1/2,-x
+ -307 +z+1/2,-x+1/2,+y
+ -308 +y+1/2,+z+1/2,-x
+ -309 -y+1/2,+z+1/2,+x
+ -310 +x+1/2,-y+1/2,+z
+ -311 +z+1/2,+x+1/2,-y
+ -312 -x+1/2,+y+1/2,+z
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/2,-x+1/2,+z
+ -317 +z+1/2,-y+1/2,-x
+ -318 -x+1/2,+z+1/2,-y
+ -319 +z+1/2,-y+1/2,+x
+ -320 +x+1/2,+z+1/2,-y
+ -321 -x+1/2,+z+1/2,+y
+ -322 +y+1/2,-x+1/2,+z
+ -323 +z+1/2,+y+1/2,-x
+ -324 -y+1/2,+x+1/2,+z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -427,7 +427,7 @@ loop_
_atom_site_symmetry_multiplicity
Al
AL1 0.0 0.0 0.0 1.0 Uiso 0.025 4
-
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Al
_chemical_formula_weight 26.98
@@ -562,7 +562,7 @@ _refine_ls_R_Fsqd_factor ""
_pd_proc_ls_background_function
; GSAS Background function number 4 with 4 terms.
Power series in Q**2n/n!
- 1: 1.00000 2: 0.00000 3: 0.00000 4: 0.00000
+ 1: 1.00000 2: 0.00000 3: 0.00000 4: 0.00000
;
_exptl_absorpt_process_details
diff --git a/scripts/Engineering/ENGINX/phase_info/AL2024.cif b/scripts/Engineering/ENGINX/phase_info/AL2024.cif
index c55000485df2b6fcd48f63b5d1dac75dce14a732..6f7a08ad0e25b530f64d40166446b43cee9609ce 100644
--- a/scripts/Engineering/ENGINX/phase_info/AL2024.cif
+++ b/scripts/Engineering/ENGINX/phase_info/AL2024.cif
@@ -235,198 +235,198 @@ _cell_volume 64.67193
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x,+y+1/2,-z+1/2
- 105 -z,+x+1/2,+y+1/2
- 106 +y,-z+1/2,+x+1/2
- 107 -z,+x+1/2,-y+1/2
- 108 -y,-z+1/2,+x+1/2
- 109 +y,-z+1/2,-x+1/2
- 110 -x,+y+1/2,-z+1/2
- 111 -z,-x+1/2,+y+1/2
- 112 +x,-y+1/2,-z+1/2
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y,+x+1/2,-z+1/2
- 117 -z,+y+1/2,+x+1/2
- 118 +x,-z+1/2,+y+1/2
- 119 -z,+y+1/2,-x+1/2
- 120 -x,-z+1/2,+y+1/2
- 121 +x,-z+1/2,-y+1/2
- 122 -y,+x+1/2,-z+1/2
- 123 -z,-y+1/2,+x+1/2
- 124 +y,-x+1/2,-z+1/2
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x,-y+1/2,+z+1/2
- -105 +z,-x+1/2,-y+1/2
- -106 -y,+z+1/2,-x+1/2
- -107 +z,-x+1/2,+y+1/2
- -108 +y,+z+1/2,-x+1/2
- -109 -y,+z+1/2,+x+1/2
- -110 +x,-y+1/2,+z+1/2
- -111 +z,+x+1/2,-y+1/2
- -112 -x,+y+1/2,+z+1/2
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y,-x+1/2,+z+1/2
- -117 +z,-y+1/2,-x+1/2
- -118 -x,+z+1/2,-y+1/2
- -119 +z,-y+1/2,+x+1/2
- -120 +x,+z+1/2,-y+1/2
- -121 -x,+z+1/2,+y+1/2
- -122 +y,-x+1/2,+z+1/2
- -123 +z,+y+1/2,-x+1/2
- -124 -y,+x+1/2,+z+1/2
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+1/2,+y,-z+1/2
- 205 -z+1/2,+x,+y+1/2
- 206 +y+1/2,-z,+x+1/2
- 207 -z+1/2,+x,-y+1/2
- 208 -y+1/2,-z,+x+1/2
- 209 +y+1/2,-z,-x+1/2
- 210 -x+1/2,+y,-z+1/2
- 211 -z+1/2,-x,+y+1/2
- 212 +x+1/2,-y,-z+1/2
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+1/2,+x,-z+1/2
- 217 -z+1/2,+y,+x+1/2
- 218 +x+1/2,-z,+y+1/2
- 219 -z+1/2,+y,-x+1/2
- 220 -x+1/2,-z,+y+1/2
- 221 +x+1/2,-z,-y+1/2
- 222 -y+1/2,+x,-z+1/2
- 223 -z+1/2,-y,+x+1/2
- 224 +y+1/2,-x,-z+1/2
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/2,-y,+z+1/2
- -205 +z+1/2,-x,-y+1/2
- -206 -y+1/2,+z,-x+1/2
- -207 +z+1/2,-x,+y+1/2
- -208 +y+1/2,+z,-x+1/2
- -209 -y+1/2,+z,+x+1/2
- -210 +x+1/2,-y,+z+1/2
- -211 +z+1/2,+x,-y+1/2
- -212 -x+1/2,+y,+z+1/2
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/2,-x,+z+1/2
- -217 +z+1/2,-y,-x+1/2
- -218 -x+1/2,+z,-y+1/2
- -219 +z+1/2,-y,+x+1/2
- -220 +x+1/2,+z,-y+1/2
- -221 -x+1/2,+z,+y+1/2
- -222 +y+1/2,-x,+z+1/2
- -223 +z+1/2,+y,-x+1/2
- -224 -y+1/2,+x,+z+1/2
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+1/2,+y+1/2,-z
- 305 -z+1/2,+x+1/2,+y
- 306 +y+1/2,-z+1/2,+x
- 307 -z+1/2,+x+1/2,-y
- 308 -y+1/2,-z+1/2,+x
- 309 +y+1/2,-z+1/2,-x
- 310 -x+1/2,+y+1/2,-z
- 311 -z+1/2,-x+1/2,+y
- 312 +x+1/2,-y+1/2,-z
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+1/2,+x+1/2,-z
- 317 -z+1/2,+y+1/2,+x
- 318 +x+1/2,-z+1/2,+y
- 319 -z+1/2,+y+1/2,-x
- 320 -x+1/2,-z+1/2,+y
- 321 +x+1/2,-z+1/2,-y
- 322 -y+1/2,+x+1/2,-z
- 323 -z+1/2,-y+1/2,+x
- 324 +y+1/2,-x+1/2,-z
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/2,-y+1/2,+z
- -305 +z+1/2,-x+1/2,-y
- -306 -y+1/2,+z+1/2,-x
- -307 +z+1/2,-x+1/2,+y
- -308 +y+1/2,+z+1/2,-x
- -309 -y+1/2,+z+1/2,+x
- -310 +x+1/2,-y+1/2,+z
- -311 +z+1/2,+x+1/2,-y
- -312 -x+1/2,+y+1/2,+z
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/2,-x+1/2,+z
- -317 +z+1/2,-y+1/2,-x
- -318 -x+1/2,+z+1/2,-y
- -319 +z+1/2,-y+1/2,+x
- -320 +x+1/2,+z+1/2,-y
- -321 -x+1/2,+z+1/2,+y
- -322 +y+1/2,-x+1/2,+z
- -323 +z+1/2,+y+1/2,-x
- -324 -y+1/2,+x+1/2,+z
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x,+y+1/2,-z+1/2
+ 105 -z,+x+1/2,+y+1/2
+ 106 +y,-z+1/2,+x+1/2
+ 107 -z,+x+1/2,-y+1/2
+ 108 -y,-z+1/2,+x+1/2
+ 109 +y,-z+1/2,-x+1/2
+ 110 -x,+y+1/2,-z+1/2
+ 111 -z,-x+1/2,+y+1/2
+ 112 +x,-y+1/2,-z+1/2
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y,+x+1/2,-z+1/2
+ 117 -z,+y+1/2,+x+1/2
+ 118 +x,-z+1/2,+y+1/2
+ 119 -z,+y+1/2,-x+1/2
+ 120 -x,-z+1/2,+y+1/2
+ 121 +x,-z+1/2,-y+1/2
+ 122 -y,+x+1/2,-z+1/2
+ 123 -z,-y+1/2,+x+1/2
+ 124 +y,-x+1/2,-z+1/2
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x,-y+1/2,+z+1/2
+ -105 +z,-x+1/2,-y+1/2
+ -106 -y,+z+1/2,-x+1/2
+ -107 +z,-x+1/2,+y+1/2
+ -108 +y,+z+1/2,-x+1/2
+ -109 -y,+z+1/2,+x+1/2
+ -110 +x,-y+1/2,+z+1/2
+ -111 +z,+x+1/2,-y+1/2
+ -112 -x,+y+1/2,+z+1/2
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y,-x+1/2,+z+1/2
+ -117 +z,-y+1/2,-x+1/2
+ -118 -x,+z+1/2,-y+1/2
+ -119 +z,-y+1/2,+x+1/2
+ -120 +x,+z+1/2,-y+1/2
+ -121 -x,+z+1/2,+y+1/2
+ -122 +y,-x+1/2,+z+1/2
+ -123 +z,+y+1/2,-x+1/2
+ -124 -y,+x+1/2,+z+1/2
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+1/2,+y,-z+1/2
+ 205 -z+1/2,+x,+y+1/2
+ 206 +y+1/2,-z,+x+1/2
+ 207 -z+1/2,+x,-y+1/2
+ 208 -y+1/2,-z,+x+1/2
+ 209 +y+1/2,-z,-x+1/2
+ 210 -x+1/2,+y,-z+1/2
+ 211 -z+1/2,-x,+y+1/2
+ 212 +x+1/2,-y,-z+1/2
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+1/2,+x,-z+1/2
+ 217 -z+1/2,+y,+x+1/2
+ 218 +x+1/2,-z,+y+1/2
+ 219 -z+1/2,+y,-x+1/2
+ 220 -x+1/2,-z,+y+1/2
+ 221 +x+1/2,-z,-y+1/2
+ 222 -y+1/2,+x,-z+1/2
+ 223 -z+1/2,-y,+x+1/2
+ 224 +y+1/2,-x,-z+1/2
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/2,-y,+z+1/2
+ -205 +z+1/2,-x,-y+1/2
+ -206 -y+1/2,+z,-x+1/2
+ -207 +z+1/2,-x,+y+1/2
+ -208 +y+1/2,+z,-x+1/2
+ -209 -y+1/2,+z,+x+1/2
+ -210 +x+1/2,-y,+z+1/2
+ -211 +z+1/2,+x,-y+1/2
+ -212 -x+1/2,+y,+z+1/2
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/2,-x,+z+1/2
+ -217 +z+1/2,-y,-x+1/2
+ -218 -x+1/2,+z,-y+1/2
+ -219 +z+1/2,-y,+x+1/2
+ -220 +x+1/2,+z,-y+1/2
+ -221 -x+1/2,+z,+y+1/2
+ -222 +y+1/2,-x,+z+1/2
+ -223 +z+1/2,+y,-x+1/2
+ -224 -y+1/2,+x,+z+1/2
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+1/2,+y+1/2,-z
+ 305 -z+1/2,+x+1/2,+y
+ 306 +y+1/2,-z+1/2,+x
+ 307 -z+1/2,+x+1/2,-y
+ 308 -y+1/2,-z+1/2,+x
+ 309 +y+1/2,-z+1/2,-x
+ 310 -x+1/2,+y+1/2,-z
+ 311 -z+1/2,-x+1/2,+y
+ 312 +x+1/2,-y+1/2,-z
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+1/2,+x+1/2,-z
+ 317 -z+1/2,+y+1/2,+x
+ 318 +x+1/2,-z+1/2,+y
+ 319 -z+1/2,+y+1/2,-x
+ 320 -x+1/2,-z+1/2,+y
+ 321 +x+1/2,-z+1/2,-y
+ 322 -y+1/2,+x+1/2,-z
+ 323 -z+1/2,-y+1/2,+x
+ 324 +y+1/2,-x+1/2,-z
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/2,-y+1/2,+z
+ -305 +z+1/2,-x+1/2,-y
+ -306 -y+1/2,+z+1/2,-x
+ -307 +z+1/2,-x+1/2,+y
+ -308 +y+1/2,+z+1/2,-x
+ -309 -y+1/2,+z+1/2,+x
+ -310 +x+1/2,-y+1/2,+z
+ -311 +z+1/2,+x+1/2,-y
+ -312 -x+1/2,+y+1/2,+z
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/2,-x+1/2,+z
+ -317 +z+1/2,-y+1/2,-x
+ -318 -x+1/2,+z+1/2,-y
+ -319 +z+1/2,-y+1/2,+x
+ -320 +x+1/2,+z+1/2,-y
+ -321 -x+1/2,+z+1/2,+y
+ -322 +y+1/2,-x+1/2,+z
+ -323 +z+1/2,+y+1/2,-x
+ -324 -y+1/2,+x+1/2,+z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -446,8 +446,8 @@ AL1 0.0 0.0 0.0 1.0 Uiso 0.025 4
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Al 4.0
-
+ Al 4.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Al
_chemical_formula_weight 26.98
diff --git a/scripts/Engineering/ENGINX/phase_info/AL2O3_ALPHA.cif b/scripts/Engineering/ENGINX/phase_info/AL2O3_ALPHA.cif
index b91c60cf16ce7971c845c3f9c86b9cbc3d674230..80ee132d6463bf8da039d88e751a03ea169c688b 100644
--- a/scripts/Engineering/ENGINX/phase_info/AL2O3_ALPHA.cif
+++ b/scripts/Engineering/ENGINX/phase_info/AL2O3_ALPHA.cif
@@ -219,42 +219,42 @@ _cell_volume 255.38771
_symmetry_cell_setting trigonal
_symmetry_space_group_name_H-M "R -3 c"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 -y,x-y,+z
- 3 y-x,-x,+z
- 4 y-x,+y,+z+1/2
- 5 -y,-x,+z+1/2
- 6 +x,x-y,+z+1/2
- -1 -x,-y,-z
- -2 +y,y-x,-z
- -3 x-y,+x,-z
- -4 x-y,-y,-z+1/2
- -5 +y,+x,-z+1/2
- -6 -x,y-x,-z+1/2
- 101 +x+1/3,+y+2/3,+z+2/3
- 102 -y+1/3,x-y+2/3,+z+2/3
- 103 y-x+1/3,-x+2/3,+z+2/3
- 104 y-x+1/3,+y+2/3,+z+1/6
- 105 -y+1/3,-x+2/3,+z+1/6
- 106 +x+1/3,x-y+2/3,+z+1/6
- -101 -x+2/3,-y+1/3,-z+1/3
- -102 +y+2/3,y-x+1/3,-z+1/3
- -103 x-y+2/3,+x+1/3,-z+1/3
- -104 x-y+2/3,-y+1/3,-z+5/6
- -105 +y+2/3,+x+1/3,-z+5/6
- -106 -x+2/3,y-x+1/3,-z+5/6
- 201 +x+2/3,+y+1/3,+z+1/3
- 202 -y+2/3,x-y+1/3,+z+1/3
- 203 y-x+2/3,-x+1/3,+z+1/3
- 204 y-x+2/3,+y+1/3,+z+5/6
- 205 -y+2/3,-x+1/3,+z+5/6
- 206 +x+2/3,x-y+1/3,+z+5/6
- -201 -x+1/3,-y+2/3,-z+2/3
- -202 +y+1/3,y-x+2/3,-z+2/3
- -203 x-y+1/3,+x+2/3,-z+2/3
- -204 x-y+1/3,-y+2/3,-z+1/6
- -205 +y+1/3,+x+2/3,-z+1/6
- -206 -x+1/3,y-x+2/3,-z+1/6
+ 1 +x,+y,+z
+ 2 -y,x-y,+z
+ 3 y-x,-x,+z
+ 4 y-x,+y,+z+1/2
+ 5 -y,-x,+z+1/2
+ 6 +x,x-y,+z+1/2
+ -1 -x,-y,-z
+ -2 +y,y-x,-z
+ -3 x-y,+x,-z
+ -4 x-y,-y,-z+1/2
+ -5 +y,+x,-z+1/2
+ -6 -x,y-x,-z+1/2
+ 101 +x+1/3,+y+2/3,+z+2/3
+ 102 -y+1/3,x-y+2/3,+z+2/3
+ 103 y-x+1/3,-x+2/3,+z+2/3
+ 104 y-x+1/3,+y+2/3,+z+1/6
+ 105 -y+1/3,-x+2/3,+z+1/6
+ 106 +x+1/3,x-y+2/3,+z+1/6
+ -101 -x+2/3,-y+1/3,-z+1/3
+ -102 +y+2/3,y-x+1/3,-z+1/3
+ -103 x-y+2/3,+x+1/3,-z+1/3
+ -104 x-y+2/3,-y+1/3,-z+5/6
+ -105 +y+2/3,+x+1/3,-z+5/6
+ -106 -x+2/3,y-x+1/3,-z+5/6
+ 201 +x+2/3,+y+1/3,+z+1/3
+ 202 -y+2/3,x-y+1/3,+z+1/3
+ 203 y-x+2/3,-x+1/3,+z+1/3
+ 204 y-x+2/3,+y+1/3,+z+5/6
+ 205 -y+2/3,-x+1/3,+z+5/6
+ 206 +x+2/3,x-y+1/3,+z+5/6
+ -201 -x+1/3,-y+2/3,-z+2/3
+ -202 +y+1/3,y-x+2/3,-z+2/3
+ -203 x-y+1/3,+x+2/3,-z+2/3
+ -204 x-y+1/3,-y+2/3,-z+1/6
+ -205 +y+1/3,+x+2/3,-z+1/6
+ -206 -x+1/3,y-x+2/3,-z+1/6
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -271,9 +271,9 @@ loop_
_atom_site_symmetry_multiplicity
Al
0.0 0.0 0.3523 1.0 Uiso 0.025 12
-O
+O
O2 0.3064 0.0 0.25 1.0 Uiso 0.025 18
-
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum "Al2 O3"
_chemical_formula_weight 101.96
@@ -410,7 +410,7 @@ _refine_ls_R_Fsqd_factor ""
_pd_proc_ls_background_function
; GSAS Background function number 4 with 4 terms.
Power series in Q**2n/n!
- 1: 1.00000 2: 0.00000 3: 0.00000 4: 0.00000
+ 1: 1.00000 2: 0.00000 3: 0.00000 4: 0.00000
;
_exptl_absorpt_process_details
diff --git a/scripts/Engineering/ENGINX/phase_info/AL_MIKE.cif b/scripts/Engineering/ENGINX/phase_info/AL_MIKE.cif
index 5abbc4c7c32654315b0130358f7caaa2aa1ea9f4..959daff3bb2d1db2903bdd2595534acf193ca8c2 100644
--- a/scripts/Engineering/ENGINX/phase_info/AL_MIKE.cif
+++ b/scripts/Engineering/ENGINX/phase_info/AL_MIKE.cif
@@ -235,198 +235,198 @@ _cell_volume 66.43014
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x,+y+1/2,-z+1/2
- 105 -z,+x+1/2,+y+1/2
- 106 +y,-z+1/2,+x+1/2
- 107 -z,+x+1/2,-y+1/2
- 108 -y,-z+1/2,+x+1/2
- 109 +y,-z+1/2,-x+1/2
- 110 -x,+y+1/2,-z+1/2
- 111 -z,-x+1/2,+y+1/2
- 112 +x,-y+1/2,-z+1/2
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y,+x+1/2,-z+1/2
- 117 -z,+y+1/2,+x+1/2
- 118 +x,-z+1/2,+y+1/2
- 119 -z,+y+1/2,-x+1/2
- 120 -x,-z+1/2,+y+1/2
- 121 +x,-z+1/2,-y+1/2
- 122 -y,+x+1/2,-z+1/2
- 123 -z,-y+1/2,+x+1/2
- 124 +y,-x+1/2,-z+1/2
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x,-y+1/2,+z+1/2
- -105 +z,-x+1/2,-y+1/2
- -106 -y,+z+1/2,-x+1/2
- -107 +z,-x+1/2,+y+1/2
- -108 +y,+z+1/2,-x+1/2
- -109 -y,+z+1/2,+x+1/2
- -110 +x,-y+1/2,+z+1/2
- -111 +z,+x+1/2,-y+1/2
- -112 -x,+y+1/2,+z+1/2
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y,-x+1/2,+z+1/2
- -117 +z,-y+1/2,-x+1/2
- -118 -x,+z+1/2,-y+1/2
- -119 +z,-y+1/2,+x+1/2
- -120 +x,+z+1/2,-y+1/2
- -121 -x,+z+1/2,+y+1/2
- -122 +y,-x+1/2,+z+1/2
- -123 +z,+y+1/2,-x+1/2
- -124 -y,+x+1/2,+z+1/2
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+1/2,+y,-z+1/2
- 205 -z+1/2,+x,+y+1/2
- 206 +y+1/2,-z,+x+1/2
- 207 -z+1/2,+x,-y+1/2
- 208 -y+1/2,-z,+x+1/2
- 209 +y+1/2,-z,-x+1/2
- 210 -x+1/2,+y,-z+1/2
- 211 -z+1/2,-x,+y+1/2
- 212 +x+1/2,-y,-z+1/2
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+1/2,+x,-z+1/2
- 217 -z+1/2,+y,+x+1/2
- 218 +x+1/2,-z,+y+1/2
- 219 -z+1/2,+y,-x+1/2
- 220 -x+1/2,-z,+y+1/2
- 221 +x+1/2,-z,-y+1/2
- 222 -y+1/2,+x,-z+1/2
- 223 -z+1/2,-y,+x+1/2
- 224 +y+1/2,-x,-z+1/2
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/2,-y,+z+1/2
- -205 +z+1/2,-x,-y+1/2
- -206 -y+1/2,+z,-x+1/2
- -207 +z+1/2,-x,+y+1/2
- -208 +y+1/2,+z,-x+1/2
- -209 -y+1/2,+z,+x+1/2
- -210 +x+1/2,-y,+z+1/2
- -211 +z+1/2,+x,-y+1/2
- -212 -x+1/2,+y,+z+1/2
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/2,-x,+z+1/2
- -217 +z+1/2,-y,-x+1/2
- -218 -x+1/2,+z,-y+1/2
- -219 +z+1/2,-y,+x+1/2
- -220 +x+1/2,+z,-y+1/2
- -221 -x+1/2,+z,+y+1/2
- -222 +y+1/2,-x,+z+1/2
- -223 +z+1/2,+y,-x+1/2
- -224 -y+1/2,+x,+z+1/2
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+1/2,+y+1/2,-z
- 305 -z+1/2,+x+1/2,+y
- 306 +y+1/2,-z+1/2,+x
- 307 -z+1/2,+x+1/2,-y
- 308 -y+1/2,-z+1/2,+x
- 309 +y+1/2,-z+1/2,-x
- 310 -x+1/2,+y+1/2,-z
- 311 -z+1/2,-x+1/2,+y
- 312 +x+1/2,-y+1/2,-z
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+1/2,+x+1/2,-z
- 317 -z+1/2,+y+1/2,+x
- 318 +x+1/2,-z+1/2,+y
- 319 -z+1/2,+y+1/2,-x
- 320 -x+1/2,-z+1/2,+y
- 321 +x+1/2,-z+1/2,-y
- 322 -y+1/2,+x+1/2,-z
- 323 -z+1/2,-y+1/2,+x
- 324 +y+1/2,-x+1/2,-z
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/2,-y+1/2,+z
- -305 +z+1/2,-x+1/2,-y
- -306 -y+1/2,+z+1/2,-x
- -307 +z+1/2,-x+1/2,+y
- -308 +y+1/2,+z+1/2,-x
- -309 -y+1/2,+z+1/2,+x
- -310 +x+1/2,-y+1/2,+z
- -311 +z+1/2,+x+1/2,-y
- -312 -x+1/2,+y+1/2,+z
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/2,-x+1/2,+z
- -317 +z+1/2,-y+1/2,-x
- -318 -x+1/2,+z+1/2,-y
- -319 +z+1/2,-y+1/2,+x
- -320 +x+1/2,+z+1/2,-y
- -321 -x+1/2,+z+1/2,+y
- -322 +y+1/2,-x+1/2,+z
- -323 +z+1/2,+y+1/2,-x
- -324 -y+1/2,+x+1/2,+z
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x,+y+1/2,-z+1/2
+ 105 -z,+x+1/2,+y+1/2
+ 106 +y,-z+1/2,+x+1/2
+ 107 -z,+x+1/2,-y+1/2
+ 108 -y,-z+1/2,+x+1/2
+ 109 +y,-z+1/2,-x+1/2
+ 110 -x,+y+1/2,-z+1/2
+ 111 -z,-x+1/2,+y+1/2
+ 112 +x,-y+1/2,-z+1/2
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y,+x+1/2,-z+1/2
+ 117 -z,+y+1/2,+x+1/2
+ 118 +x,-z+1/2,+y+1/2
+ 119 -z,+y+1/2,-x+1/2
+ 120 -x,-z+1/2,+y+1/2
+ 121 +x,-z+1/2,-y+1/2
+ 122 -y,+x+1/2,-z+1/2
+ 123 -z,-y+1/2,+x+1/2
+ 124 +y,-x+1/2,-z+1/2
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x,-y+1/2,+z+1/2
+ -105 +z,-x+1/2,-y+1/2
+ -106 -y,+z+1/2,-x+1/2
+ -107 +z,-x+1/2,+y+1/2
+ -108 +y,+z+1/2,-x+1/2
+ -109 -y,+z+1/2,+x+1/2
+ -110 +x,-y+1/2,+z+1/2
+ -111 +z,+x+1/2,-y+1/2
+ -112 -x,+y+1/2,+z+1/2
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y,-x+1/2,+z+1/2
+ -117 +z,-y+1/2,-x+1/2
+ -118 -x,+z+1/2,-y+1/2
+ -119 +z,-y+1/2,+x+1/2
+ -120 +x,+z+1/2,-y+1/2
+ -121 -x,+z+1/2,+y+1/2
+ -122 +y,-x+1/2,+z+1/2
+ -123 +z,+y+1/2,-x+1/2
+ -124 -y,+x+1/2,+z+1/2
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+1/2,+y,-z+1/2
+ 205 -z+1/2,+x,+y+1/2
+ 206 +y+1/2,-z,+x+1/2
+ 207 -z+1/2,+x,-y+1/2
+ 208 -y+1/2,-z,+x+1/2
+ 209 +y+1/2,-z,-x+1/2
+ 210 -x+1/2,+y,-z+1/2
+ 211 -z+1/2,-x,+y+1/2
+ 212 +x+1/2,-y,-z+1/2
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+1/2,+x,-z+1/2
+ 217 -z+1/2,+y,+x+1/2
+ 218 +x+1/2,-z,+y+1/2
+ 219 -z+1/2,+y,-x+1/2
+ 220 -x+1/2,-z,+y+1/2
+ 221 +x+1/2,-z,-y+1/2
+ 222 -y+1/2,+x,-z+1/2
+ 223 -z+1/2,-y,+x+1/2
+ 224 +y+1/2,-x,-z+1/2
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/2,-y,+z+1/2
+ -205 +z+1/2,-x,-y+1/2
+ -206 -y+1/2,+z,-x+1/2
+ -207 +z+1/2,-x,+y+1/2
+ -208 +y+1/2,+z,-x+1/2
+ -209 -y+1/2,+z,+x+1/2
+ -210 +x+1/2,-y,+z+1/2
+ -211 +z+1/2,+x,-y+1/2
+ -212 -x+1/2,+y,+z+1/2
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/2,-x,+z+1/2
+ -217 +z+1/2,-y,-x+1/2
+ -218 -x+1/2,+z,-y+1/2
+ -219 +z+1/2,-y,+x+1/2
+ -220 +x+1/2,+z,-y+1/2
+ -221 -x+1/2,+z,+y+1/2
+ -222 +y+1/2,-x,+z+1/2
+ -223 +z+1/2,+y,-x+1/2
+ -224 -y+1/2,+x,+z+1/2
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+1/2,+y+1/2,-z
+ 305 -z+1/2,+x+1/2,+y
+ 306 +y+1/2,-z+1/2,+x
+ 307 -z+1/2,+x+1/2,-y
+ 308 -y+1/2,-z+1/2,+x
+ 309 +y+1/2,-z+1/2,-x
+ 310 -x+1/2,+y+1/2,-z
+ 311 -z+1/2,-x+1/2,+y
+ 312 +x+1/2,-y+1/2,-z
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+1/2,+x+1/2,-z
+ 317 -z+1/2,+y+1/2,+x
+ 318 +x+1/2,-z+1/2,+y
+ 319 -z+1/2,+y+1/2,-x
+ 320 -x+1/2,-z+1/2,+y
+ 321 +x+1/2,-z+1/2,-y
+ 322 -y+1/2,+x+1/2,-z
+ 323 -z+1/2,-y+1/2,+x
+ 324 +y+1/2,-x+1/2,-z
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/2,-y+1/2,+z
+ -305 +z+1/2,-x+1/2,-y
+ -306 -y+1/2,+z+1/2,-x
+ -307 +z+1/2,-x+1/2,+y
+ -308 +y+1/2,+z+1/2,-x
+ -309 -y+1/2,+z+1/2,+x
+ -310 +x+1/2,-y+1/2,+z
+ -311 +z+1/2,+x+1/2,-y
+ -312 -x+1/2,+y+1/2,+z
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/2,-x+1/2,+z
+ -317 +z+1/2,-y+1/2,-x
+ -318 -x+1/2,+z+1/2,-y
+ -319 +z+1/2,-y+1/2,+x
+ -320 +x+1/2,+z+1/2,-y
+ -321 -x+1/2,+z+1/2,+y
+ -322 +y+1/2,-x+1/2,+z
+ -323 +z+1/2,+y+1/2,-x
+ -324 -y+1/2,+x+1/2,+z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -446,8 +446,8 @@ AL1 0.0 0.0 0.0 1.0 Uiso 0.025 4
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Al 4.0
-
+ Al 4.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Al
_chemical_formula_weight 26.98
diff --git a/scripts/Engineering/ENGINX/phase_info/AU.cif b/scripts/Engineering/ENGINX/phase_info/AU.cif
index 559acb8ffece8a6625e4f673c6f0c35893a882f6..22fe2c5026de1351cb8ff14d9ca10ecc0fb9fe6c 100644
--- a/scripts/Engineering/ENGINX/phase_info/AU.cif
+++ b/scripts/Engineering/ENGINX/phase_info/AU.cif
@@ -235,198 +235,198 @@ _cell_volume 67.834
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x,+y+1/2,-z+1/2
- 105 -z,+x+1/2,+y+1/2
- 106 +y,-z+1/2,+x+1/2
- 107 -z,+x+1/2,-y+1/2
- 108 -y,-z+1/2,+x+1/2
- 109 +y,-z+1/2,-x+1/2
- 110 -x,+y+1/2,-z+1/2
- 111 -z,-x+1/2,+y+1/2
- 112 +x,-y+1/2,-z+1/2
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y,+x+1/2,-z+1/2
- 117 -z,+y+1/2,+x+1/2
- 118 +x,-z+1/2,+y+1/2
- 119 -z,+y+1/2,-x+1/2
- 120 -x,-z+1/2,+y+1/2
- 121 +x,-z+1/2,-y+1/2
- 122 -y,+x+1/2,-z+1/2
- 123 -z,-y+1/2,+x+1/2
- 124 +y,-x+1/2,-z+1/2
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x,-y+1/2,+z+1/2
- -105 +z,-x+1/2,-y+1/2
- -106 -y,+z+1/2,-x+1/2
- -107 +z,-x+1/2,+y+1/2
- -108 +y,+z+1/2,-x+1/2
- -109 -y,+z+1/2,+x+1/2
- -110 +x,-y+1/2,+z+1/2
- -111 +z,+x+1/2,-y+1/2
- -112 -x,+y+1/2,+z+1/2
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y,-x+1/2,+z+1/2
- -117 +z,-y+1/2,-x+1/2
- -118 -x,+z+1/2,-y+1/2
- -119 +z,-y+1/2,+x+1/2
- -120 +x,+z+1/2,-y+1/2
- -121 -x,+z+1/2,+y+1/2
- -122 +y,-x+1/2,+z+1/2
- -123 +z,+y+1/2,-x+1/2
- -124 -y,+x+1/2,+z+1/2
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+1/2,+y,-z+1/2
- 205 -z+1/2,+x,+y+1/2
- 206 +y+1/2,-z,+x+1/2
- 207 -z+1/2,+x,-y+1/2
- 208 -y+1/2,-z,+x+1/2
- 209 +y+1/2,-z,-x+1/2
- 210 -x+1/2,+y,-z+1/2
- 211 -z+1/2,-x,+y+1/2
- 212 +x+1/2,-y,-z+1/2
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+1/2,+x,-z+1/2
- 217 -z+1/2,+y,+x+1/2
- 218 +x+1/2,-z,+y+1/2
- 219 -z+1/2,+y,-x+1/2
- 220 -x+1/2,-z,+y+1/2
- 221 +x+1/2,-z,-y+1/2
- 222 -y+1/2,+x,-z+1/2
- 223 -z+1/2,-y,+x+1/2
- 224 +y+1/2,-x,-z+1/2
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/2,-y,+z+1/2
- -205 +z+1/2,-x,-y+1/2
- -206 -y+1/2,+z,-x+1/2
- -207 +z+1/2,-x,+y+1/2
- -208 +y+1/2,+z,-x+1/2
- -209 -y+1/2,+z,+x+1/2
- -210 +x+1/2,-y,+z+1/2
- -211 +z+1/2,+x,-y+1/2
- -212 -x+1/2,+y,+z+1/2
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/2,-x,+z+1/2
- -217 +z+1/2,-y,-x+1/2
- -218 -x+1/2,+z,-y+1/2
- -219 +z+1/2,-y,+x+1/2
- -220 +x+1/2,+z,-y+1/2
- -221 -x+1/2,+z,+y+1/2
- -222 +y+1/2,-x,+z+1/2
- -223 +z+1/2,+y,-x+1/2
- -224 -y+1/2,+x,+z+1/2
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+1/2,+y+1/2,-z
- 305 -z+1/2,+x+1/2,+y
- 306 +y+1/2,-z+1/2,+x
- 307 -z+1/2,+x+1/2,-y
- 308 -y+1/2,-z+1/2,+x
- 309 +y+1/2,-z+1/2,-x
- 310 -x+1/2,+y+1/2,-z
- 311 -z+1/2,-x+1/2,+y
- 312 +x+1/2,-y+1/2,-z
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+1/2,+x+1/2,-z
- 317 -z+1/2,+y+1/2,+x
- 318 +x+1/2,-z+1/2,+y
- 319 -z+1/2,+y+1/2,-x
- 320 -x+1/2,-z+1/2,+y
- 321 +x+1/2,-z+1/2,-y
- 322 -y+1/2,+x+1/2,-z
- 323 -z+1/2,-y+1/2,+x
- 324 +y+1/2,-x+1/2,-z
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/2,-y+1/2,+z
- -305 +z+1/2,-x+1/2,-y
- -306 -y+1/2,+z+1/2,-x
- -307 +z+1/2,-x+1/2,+y
- -308 +y+1/2,+z+1/2,-x
- -309 -y+1/2,+z+1/2,+x
- -310 +x+1/2,-y+1/2,+z
- -311 +z+1/2,+x+1/2,-y
- -312 -x+1/2,+y+1/2,+z
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/2,-x+1/2,+z
- -317 +z+1/2,-y+1/2,-x
- -318 -x+1/2,+z+1/2,-y
- -319 +z+1/2,-y+1/2,+x
- -320 +x+1/2,+z+1/2,-y
- -321 -x+1/2,+z+1/2,+y
- -322 +y+1/2,-x+1/2,+z
- -323 +z+1/2,+y+1/2,-x
- -324 -y+1/2,+x+1/2,+z
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x,+y+1/2,-z+1/2
+ 105 -z,+x+1/2,+y+1/2
+ 106 +y,-z+1/2,+x+1/2
+ 107 -z,+x+1/2,-y+1/2
+ 108 -y,-z+1/2,+x+1/2
+ 109 +y,-z+1/2,-x+1/2
+ 110 -x,+y+1/2,-z+1/2
+ 111 -z,-x+1/2,+y+1/2
+ 112 +x,-y+1/2,-z+1/2
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y,+x+1/2,-z+1/2
+ 117 -z,+y+1/2,+x+1/2
+ 118 +x,-z+1/2,+y+1/2
+ 119 -z,+y+1/2,-x+1/2
+ 120 -x,-z+1/2,+y+1/2
+ 121 +x,-z+1/2,-y+1/2
+ 122 -y,+x+1/2,-z+1/2
+ 123 -z,-y+1/2,+x+1/2
+ 124 +y,-x+1/2,-z+1/2
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x,-y+1/2,+z+1/2
+ -105 +z,-x+1/2,-y+1/2
+ -106 -y,+z+1/2,-x+1/2
+ -107 +z,-x+1/2,+y+1/2
+ -108 +y,+z+1/2,-x+1/2
+ -109 -y,+z+1/2,+x+1/2
+ -110 +x,-y+1/2,+z+1/2
+ -111 +z,+x+1/2,-y+1/2
+ -112 -x,+y+1/2,+z+1/2
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y,-x+1/2,+z+1/2
+ -117 +z,-y+1/2,-x+1/2
+ -118 -x,+z+1/2,-y+1/2
+ -119 +z,-y+1/2,+x+1/2
+ -120 +x,+z+1/2,-y+1/2
+ -121 -x,+z+1/2,+y+1/2
+ -122 +y,-x+1/2,+z+1/2
+ -123 +z,+y+1/2,-x+1/2
+ -124 -y,+x+1/2,+z+1/2
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+1/2,+y,-z+1/2
+ 205 -z+1/2,+x,+y+1/2
+ 206 +y+1/2,-z,+x+1/2
+ 207 -z+1/2,+x,-y+1/2
+ 208 -y+1/2,-z,+x+1/2
+ 209 +y+1/2,-z,-x+1/2
+ 210 -x+1/2,+y,-z+1/2
+ 211 -z+1/2,-x,+y+1/2
+ 212 +x+1/2,-y,-z+1/2
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+1/2,+x,-z+1/2
+ 217 -z+1/2,+y,+x+1/2
+ 218 +x+1/2,-z,+y+1/2
+ 219 -z+1/2,+y,-x+1/2
+ 220 -x+1/2,-z,+y+1/2
+ 221 +x+1/2,-z,-y+1/2
+ 222 -y+1/2,+x,-z+1/2
+ 223 -z+1/2,-y,+x+1/2
+ 224 +y+1/2,-x,-z+1/2
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/2,-y,+z+1/2
+ -205 +z+1/2,-x,-y+1/2
+ -206 -y+1/2,+z,-x+1/2
+ -207 +z+1/2,-x,+y+1/2
+ -208 +y+1/2,+z,-x+1/2
+ -209 -y+1/2,+z,+x+1/2
+ -210 +x+1/2,-y,+z+1/2
+ -211 +z+1/2,+x,-y+1/2
+ -212 -x+1/2,+y,+z+1/2
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/2,-x,+z+1/2
+ -217 +z+1/2,-y,-x+1/2
+ -218 -x+1/2,+z,-y+1/2
+ -219 +z+1/2,-y,+x+1/2
+ -220 +x+1/2,+z,-y+1/2
+ -221 -x+1/2,+z,+y+1/2
+ -222 +y+1/2,-x,+z+1/2
+ -223 +z+1/2,+y,-x+1/2
+ -224 -y+1/2,+x,+z+1/2
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+1/2,+y+1/2,-z
+ 305 -z+1/2,+x+1/2,+y
+ 306 +y+1/2,-z+1/2,+x
+ 307 -z+1/2,+x+1/2,-y
+ 308 -y+1/2,-z+1/2,+x
+ 309 +y+1/2,-z+1/2,-x
+ 310 -x+1/2,+y+1/2,-z
+ 311 -z+1/2,-x+1/2,+y
+ 312 +x+1/2,-y+1/2,-z
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+1/2,+x+1/2,-z
+ 317 -z+1/2,+y+1/2,+x
+ 318 +x+1/2,-z+1/2,+y
+ 319 -z+1/2,+y+1/2,-x
+ 320 -x+1/2,-z+1/2,+y
+ 321 +x+1/2,-z+1/2,-y
+ 322 -y+1/2,+x+1/2,-z
+ 323 -z+1/2,-y+1/2,+x
+ 324 +y+1/2,-x+1/2,-z
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/2,-y+1/2,+z
+ -305 +z+1/2,-x+1/2,-y
+ -306 -y+1/2,+z+1/2,-x
+ -307 +z+1/2,-x+1/2,+y
+ -308 +y+1/2,+z+1/2,-x
+ -309 -y+1/2,+z+1/2,+x
+ -310 +x+1/2,-y+1/2,+z
+ -311 +z+1/2,+x+1/2,-y
+ -312 -x+1/2,+y+1/2,+z
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/2,-x+1/2,+z
+ -317 +z+1/2,-y+1/2,-x
+ -318 -x+1/2,+z+1/2,-y
+ -319 +z+1/2,-y+1/2,+x
+ -320 +x+1/2,+z+1/2,-y
+ -321 -x+1/2,+z+1/2,+y
+ -322 +y+1/2,-x+1/2,+z
+ -323 +z+1/2,+y+1/2,-x
+ -324 -y+1/2,+x+1/2,+z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -446,8 +446,8 @@ AU1 0.0 0.0 0.0 1.0 Uiso 0.025 4
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Au 4.0
-
+ Au 4.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Au
_chemical_formula_weight 196.97
diff --git a/scripts/Engineering/ENGINX/phase_info/BE.cif b/scripts/Engineering/ENGINX/phase_info/BE.cif
index 5fb8e81dc222a3e0ba559fee9059f13c3d84f27e..7069a34682534fde675b98fb3a7ede885a0eaafe 100644
--- a/scripts/Engineering/ENGINX/phase_info/BE.cif
+++ b/scripts/Engineering/ENGINX/phase_info/BE.cif
@@ -235,30 +235,30 @@ _cell_volume 16.18626
_symmetry_cell_setting hexagonal
_symmetry_space_group_name_H-M P63/mmc
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 x-y,+x,+z+1/2
- 3 -y,x-y,+z
- 4 -x,-y,+z+1/2
- 5 y-x,-x,+z
- 6 +y,y-x,+z+1/2
- 7 y-x,+y,+z
- 8 -x,y-x,+z+1/2
- 9 -y,-x,+z
- 10 x-y,-y,+z+1/2
- 11 +x,x-y,+z
- 12 +y,+x,+z+1/2
- -1 -x,-y,-z
- -2 y-x,-x,-z+1/2
- -3 +y,y-x,-z
- -4 +x,+y,-z+1/2
- -5 x-y,+x,-z
- -6 -y,x-y,-z+1/2
- -7 x-y,-y,-z
- -8 +x,x-y,-z+1/2
- -9 +y,+x,-z
- -10 y-x,+y,-z+1/2
- -11 -x,y-x,-z
- -12 -y,-x,-z+1/2
+ 1 +x,+y,+z
+ 2 x-y,+x,+z+1/2
+ 3 -y,x-y,+z
+ 4 -x,-y,+z+1/2
+ 5 y-x,-x,+z
+ 6 +y,y-x,+z+1/2
+ 7 y-x,+y,+z
+ 8 -x,y-x,+z+1/2
+ 9 -y,-x,+z
+ 10 x-y,-y,+z+1/2
+ 11 +x,x-y,+z
+ 12 +y,+x,+z+1/2
+ -1 -x,-y,-z
+ -2 y-x,-x,-z+1/2
+ -3 +y,y-x,-z
+ -4 +x,+y,-z+1/2
+ -5 x-y,+x,-z
+ -6 -y,x-y,-z+1/2
+ -7 x-y,-y,-z
+ -8 +x,x-y,-z+1/2
+ -9 +y,+x,-z
+ -10 y-x,+y,-z+1/2
+ -11 -x,y-x,-z
+ -12 -y,-x,-z+1/2
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -278,8 +278,8 @@ BE1 0.33333 0.66667 0.25 1.0 Uiso 0.025 2
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Be 2.0
-
+ Be 2.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Be
_chemical_formula_weight 9.01
diff --git a/scripts/Engineering/ENGINX/phase_info/BE_PIPE.cif b/scripts/Engineering/ENGINX/phase_info/BE_PIPE.cif
index 19a7d6135b211c9986b43d06ccc7e5c75fa25cc8..2c0ae78f0066e7c2fc1c772a846a162b1d6f37f5 100644
--- a/scripts/Engineering/ENGINX/phase_info/BE_PIPE.cif
+++ b/scripts/Engineering/ENGINX/phase_info/BE_PIPE.cif
@@ -235,198 +235,198 @@ _cell_volume 46.364(7)
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x,+y+1/2,-z+1/2
- 105 -z,+x+1/2,+y+1/2
- 106 +y,-z+1/2,+x+1/2
- 107 -z,+x+1/2,-y+1/2
- 108 -y,-z+1/2,+x+1/2
- 109 +y,-z+1/2,-x+1/2
- 110 -x,+y+1/2,-z+1/2
- 111 -z,-x+1/2,+y+1/2
- 112 +x,-y+1/2,-z+1/2
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y,+x+1/2,-z+1/2
- 117 -z,+y+1/2,+x+1/2
- 118 +x,-z+1/2,+y+1/2
- 119 -z,+y+1/2,-x+1/2
- 120 -x,-z+1/2,+y+1/2
- 121 +x,-z+1/2,-y+1/2
- 122 -y,+x+1/2,-z+1/2
- 123 -z,-y+1/2,+x+1/2
- 124 +y,-x+1/2,-z+1/2
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x,-y+1/2,+z+1/2
- -105 +z,-x+1/2,-y+1/2
- -106 -y,+z+1/2,-x+1/2
- -107 +z,-x+1/2,+y+1/2
- -108 +y,+z+1/2,-x+1/2
- -109 -y,+z+1/2,+x+1/2
- -110 +x,-y+1/2,+z+1/2
- -111 +z,+x+1/2,-y+1/2
- -112 -x,+y+1/2,+z+1/2
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y,-x+1/2,+z+1/2
- -117 +z,-y+1/2,-x+1/2
- -118 -x,+z+1/2,-y+1/2
- -119 +z,-y+1/2,+x+1/2
- -120 +x,+z+1/2,-y+1/2
- -121 -x,+z+1/2,+y+1/2
- -122 +y,-x+1/2,+z+1/2
- -123 +z,+y+1/2,-x+1/2
- -124 -y,+x+1/2,+z+1/2
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+1/2,+y,-z+1/2
- 205 -z+1/2,+x,+y+1/2
- 206 +y+1/2,-z,+x+1/2
- 207 -z+1/2,+x,-y+1/2
- 208 -y+1/2,-z,+x+1/2
- 209 +y+1/2,-z,-x+1/2
- 210 -x+1/2,+y,-z+1/2
- 211 -z+1/2,-x,+y+1/2
- 212 +x+1/2,-y,-z+1/2
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+1/2,+x,-z+1/2
- 217 -z+1/2,+y,+x+1/2
- 218 +x+1/2,-z,+y+1/2
- 219 -z+1/2,+y,-x+1/2
- 220 -x+1/2,-z,+y+1/2
- 221 +x+1/2,-z,-y+1/2
- 222 -y+1/2,+x,-z+1/2
- 223 -z+1/2,-y,+x+1/2
- 224 +y+1/2,-x,-z+1/2
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/2,-y,+z+1/2
- -205 +z+1/2,-x,-y+1/2
- -206 -y+1/2,+z,-x+1/2
- -207 +z+1/2,-x,+y+1/2
- -208 +y+1/2,+z,-x+1/2
- -209 -y+1/2,+z,+x+1/2
- -210 +x+1/2,-y,+z+1/2
- -211 +z+1/2,+x,-y+1/2
- -212 -x+1/2,+y,+z+1/2
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/2,-x,+z+1/2
- -217 +z+1/2,-y,-x+1/2
- -218 -x+1/2,+z,-y+1/2
- -219 +z+1/2,-y,+x+1/2
- -220 +x+1/2,+z,-y+1/2
- -221 -x+1/2,+z,+y+1/2
- -222 +y+1/2,-x,+z+1/2
- -223 +z+1/2,+y,-x+1/2
- -224 -y+1/2,+x,+z+1/2
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+1/2,+y+1/2,-z
- 305 -z+1/2,+x+1/2,+y
- 306 +y+1/2,-z+1/2,+x
- 307 -z+1/2,+x+1/2,-y
- 308 -y+1/2,-z+1/2,+x
- 309 +y+1/2,-z+1/2,-x
- 310 -x+1/2,+y+1/2,-z
- 311 -z+1/2,-x+1/2,+y
- 312 +x+1/2,-y+1/2,-z
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+1/2,+x+1/2,-z
- 317 -z+1/2,+y+1/2,+x
- 318 +x+1/2,-z+1/2,+y
- 319 -z+1/2,+y+1/2,-x
- 320 -x+1/2,-z+1/2,+y
- 321 +x+1/2,-z+1/2,-y
- 322 -y+1/2,+x+1/2,-z
- 323 -z+1/2,-y+1/2,+x
- 324 +y+1/2,-x+1/2,-z
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/2,-y+1/2,+z
- -305 +z+1/2,-x+1/2,-y
- -306 -y+1/2,+z+1/2,-x
- -307 +z+1/2,-x+1/2,+y
- -308 +y+1/2,+z+1/2,-x
- -309 -y+1/2,+z+1/2,+x
- -310 +x+1/2,-y+1/2,+z
- -311 +z+1/2,+x+1/2,-y
- -312 -x+1/2,+y+1/2,+z
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/2,-x+1/2,+z
- -317 +z+1/2,-y+1/2,-x
- -318 -x+1/2,+z+1/2,-y
- -319 +z+1/2,-y+1/2,+x
- -320 +x+1/2,+z+1/2,-y
- -321 -x+1/2,+z+1/2,+y
- -322 +y+1/2,-x+1/2,+z
- -323 +z+1/2,+y+1/2,-x
- -324 -y+1/2,+x+1/2,+z
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x,+y+1/2,-z+1/2
+ 105 -z,+x+1/2,+y+1/2
+ 106 +y,-z+1/2,+x+1/2
+ 107 -z,+x+1/2,-y+1/2
+ 108 -y,-z+1/2,+x+1/2
+ 109 +y,-z+1/2,-x+1/2
+ 110 -x,+y+1/2,-z+1/2
+ 111 -z,-x+1/2,+y+1/2
+ 112 +x,-y+1/2,-z+1/2
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y,+x+1/2,-z+1/2
+ 117 -z,+y+1/2,+x+1/2
+ 118 +x,-z+1/2,+y+1/2
+ 119 -z,+y+1/2,-x+1/2
+ 120 -x,-z+1/2,+y+1/2
+ 121 +x,-z+1/2,-y+1/2
+ 122 -y,+x+1/2,-z+1/2
+ 123 -z,-y+1/2,+x+1/2
+ 124 +y,-x+1/2,-z+1/2
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x,-y+1/2,+z+1/2
+ -105 +z,-x+1/2,-y+1/2
+ -106 -y,+z+1/2,-x+1/2
+ -107 +z,-x+1/2,+y+1/2
+ -108 +y,+z+1/2,-x+1/2
+ -109 -y,+z+1/2,+x+1/2
+ -110 +x,-y+1/2,+z+1/2
+ -111 +z,+x+1/2,-y+1/2
+ -112 -x,+y+1/2,+z+1/2
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y,-x+1/2,+z+1/2
+ -117 +z,-y+1/2,-x+1/2
+ -118 -x,+z+1/2,-y+1/2
+ -119 +z,-y+1/2,+x+1/2
+ -120 +x,+z+1/2,-y+1/2
+ -121 -x,+z+1/2,+y+1/2
+ -122 +y,-x+1/2,+z+1/2
+ -123 +z,+y+1/2,-x+1/2
+ -124 -y,+x+1/2,+z+1/2
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+1/2,+y,-z+1/2
+ 205 -z+1/2,+x,+y+1/2
+ 206 +y+1/2,-z,+x+1/2
+ 207 -z+1/2,+x,-y+1/2
+ 208 -y+1/2,-z,+x+1/2
+ 209 +y+1/2,-z,-x+1/2
+ 210 -x+1/2,+y,-z+1/2
+ 211 -z+1/2,-x,+y+1/2
+ 212 +x+1/2,-y,-z+1/2
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+1/2,+x,-z+1/2
+ 217 -z+1/2,+y,+x+1/2
+ 218 +x+1/2,-z,+y+1/2
+ 219 -z+1/2,+y,-x+1/2
+ 220 -x+1/2,-z,+y+1/2
+ 221 +x+1/2,-z,-y+1/2
+ 222 -y+1/2,+x,-z+1/2
+ 223 -z+1/2,-y,+x+1/2
+ 224 +y+1/2,-x,-z+1/2
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/2,-y,+z+1/2
+ -205 +z+1/2,-x,-y+1/2
+ -206 -y+1/2,+z,-x+1/2
+ -207 +z+1/2,-x,+y+1/2
+ -208 +y+1/2,+z,-x+1/2
+ -209 -y+1/2,+z,+x+1/2
+ -210 +x+1/2,-y,+z+1/2
+ -211 +z+1/2,+x,-y+1/2
+ -212 -x+1/2,+y,+z+1/2
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/2,-x,+z+1/2
+ -217 +z+1/2,-y,-x+1/2
+ -218 -x+1/2,+z,-y+1/2
+ -219 +z+1/2,-y,+x+1/2
+ -220 +x+1/2,+z,-y+1/2
+ -221 -x+1/2,+z,+y+1/2
+ -222 +y+1/2,-x,+z+1/2
+ -223 +z+1/2,+y,-x+1/2
+ -224 -y+1/2,+x,+z+1/2
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+1/2,+y+1/2,-z
+ 305 -z+1/2,+x+1/2,+y
+ 306 +y+1/2,-z+1/2,+x
+ 307 -z+1/2,+x+1/2,-y
+ 308 -y+1/2,-z+1/2,+x
+ 309 +y+1/2,-z+1/2,-x
+ 310 -x+1/2,+y+1/2,-z
+ 311 -z+1/2,-x+1/2,+y
+ 312 +x+1/2,-y+1/2,-z
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+1/2,+x+1/2,-z
+ 317 -z+1/2,+y+1/2,+x
+ 318 +x+1/2,-z+1/2,+y
+ 319 -z+1/2,+y+1/2,-x
+ 320 -x+1/2,-z+1/2,+y
+ 321 +x+1/2,-z+1/2,-y
+ 322 -y+1/2,+x+1/2,-z
+ 323 -z+1/2,-y+1/2,+x
+ 324 +y+1/2,-x+1/2,-z
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/2,-y+1/2,+z
+ -305 +z+1/2,-x+1/2,-y
+ -306 -y+1/2,+z+1/2,-x
+ -307 +z+1/2,-x+1/2,+y
+ -308 +y+1/2,+z+1/2,-x
+ -309 -y+1/2,+z+1/2,+x
+ -310 +x+1/2,-y+1/2,+z
+ -311 +z+1/2,+x+1/2,-y
+ -312 -x+1/2,+y+1/2,+z
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/2,-x+1/2,+z
+ -317 +z+1/2,-y+1/2,-x
+ -318 -x+1/2,+z+1/2,-y
+ -319 +z+1/2,-y+1/2,+x
+ -320 +x+1/2,+z+1/2,-y
+ -321 -x+1/2,+z+1/2,+y
+ -322 +y+1/2,-x+1/2,+z
+ -323 +z+1/2,+y+1/2,-x
+ -324 -y+1/2,+x+1/2,+z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -446,8 +446,8 @@ FE1 0.0 0.0 0.0 1.0 Uiso 0.00714 4
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Fe 4.0
-
+ Fe 4.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Fe
_chemical_formula_weight 55.85
diff --git a/scripts/Engineering/ENGINX/phase_info/CAF2.cif b/scripts/Engineering/ENGINX/phase_info/CAF2.cif
index d5c57c68c407229db28750af7b41fe554b028a22..f34538452541189b8166bb78347a31632b8f5d6d 100644
--- a/scripts/Engineering/ENGINX/phase_info/CAF2.cif
+++ b/scripts/Engineering/ENGINX/phase_info/CAF2.cif
@@ -235,198 +235,198 @@ _cell_volume 163.11688
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x,+y+1/2,-z+1/2
- 105 -z,+x+1/2,+y+1/2
- 106 +y,-z+1/2,+x+1/2
- 107 -z,+x+1/2,-y+1/2
- 108 -y,-z+1/2,+x+1/2
- 109 +y,-z+1/2,-x+1/2
- 110 -x,+y+1/2,-z+1/2
- 111 -z,-x+1/2,+y+1/2
- 112 +x,-y+1/2,-z+1/2
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y,+x+1/2,-z+1/2
- 117 -z,+y+1/2,+x+1/2
- 118 +x,-z+1/2,+y+1/2
- 119 -z,+y+1/2,-x+1/2
- 120 -x,-z+1/2,+y+1/2
- 121 +x,-z+1/2,-y+1/2
- 122 -y,+x+1/2,-z+1/2
- 123 -z,-y+1/2,+x+1/2
- 124 +y,-x+1/2,-z+1/2
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x,-y+1/2,+z+1/2
- -105 +z,-x+1/2,-y+1/2
- -106 -y,+z+1/2,-x+1/2
- -107 +z,-x+1/2,+y+1/2
- -108 +y,+z+1/2,-x+1/2
- -109 -y,+z+1/2,+x+1/2
- -110 +x,-y+1/2,+z+1/2
- -111 +z,+x+1/2,-y+1/2
- -112 -x,+y+1/2,+z+1/2
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y,-x+1/2,+z+1/2
- -117 +z,-y+1/2,-x+1/2
- -118 -x,+z+1/2,-y+1/2
- -119 +z,-y+1/2,+x+1/2
- -120 +x,+z+1/2,-y+1/2
- -121 -x,+z+1/2,+y+1/2
- -122 +y,-x+1/2,+z+1/2
- -123 +z,+y+1/2,-x+1/2
- -124 -y,+x+1/2,+z+1/2
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+1/2,+y,-z+1/2
- 205 -z+1/2,+x,+y+1/2
- 206 +y+1/2,-z,+x+1/2
- 207 -z+1/2,+x,-y+1/2
- 208 -y+1/2,-z,+x+1/2
- 209 +y+1/2,-z,-x+1/2
- 210 -x+1/2,+y,-z+1/2
- 211 -z+1/2,-x,+y+1/2
- 212 +x+1/2,-y,-z+1/2
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+1/2,+x,-z+1/2
- 217 -z+1/2,+y,+x+1/2
- 218 +x+1/2,-z,+y+1/2
- 219 -z+1/2,+y,-x+1/2
- 220 -x+1/2,-z,+y+1/2
- 221 +x+1/2,-z,-y+1/2
- 222 -y+1/2,+x,-z+1/2
- 223 -z+1/2,-y,+x+1/2
- 224 +y+1/2,-x,-z+1/2
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/2,-y,+z+1/2
- -205 +z+1/2,-x,-y+1/2
- -206 -y+1/2,+z,-x+1/2
- -207 +z+1/2,-x,+y+1/2
- -208 +y+1/2,+z,-x+1/2
- -209 -y+1/2,+z,+x+1/2
- -210 +x+1/2,-y,+z+1/2
- -211 +z+1/2,+x,-y+1/2
- -212 -x+1/2,+y,+z+1/2
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/2,-x,+z+1/2
- -217 +z+1/2,-y,-x+1/2
- -218 -x+1/2,+z,-y+1/2
- -219 +z+1/2,-y,+x+1/2
- -220 +x+1/2,+z,-y+1/2
- -221 -x+1/2,+z,+y+1/2
- -222 +y+1/2,-x,+z+1/2
- -223 +z+1/2,+y,-x+1/2
- -224 -y+1/2,+x,+z+1/2
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+1/2,+y+1/2,-z
- 305 -z+1/2,+x+1/2,+y
- 306 +y+1/2,-z+1/2,+x
- 307 -z+1/2,+x+1/2,-y
- 308 -y+1/2,-z+1/2,+x
- 309 +y+1/2,-z+1/2,-x
- 310 -x+1/2,+y+1/2,-z
- 311 -z+1/2,-x+1/2,+y
- 312 +x+1/2,-y+1/2,-z
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+1/2,+x+1/2,-z
- 317 -z+1/2,+y+1/2,+x
- 318 +x+1/2,-z+1/2,+y
- 319 -z+1/2,+y+1/2,-x
- 320 -x+1/2,-z+1/2,+y
- 321 +x+1/2,-z+1/2,-y
- 322 -y+1/2,+x+1/2,-z
- 323 -z+1/2,-y+1/2,+x
- 324 +y+1/2,-x+1/2,-z
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/2,-y+1/2,+z
- -305 +z+1/2,-x+1/2,-y
- -306 -y+1/2,+z+1/2,-x
- -307 +z+1/2,-x+1/2,+y
- -308 +y+1/2,+z+1/2,-x
- -309 -y+1/2,+z+1/2,+x
- -310 +x+1/2,-y+1/2,+z
- -311 +z+1/2,+x+1/2,-y
- -312 -x+1/2,+y+1/2,+z
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/2,-x+1/2,+z
- -317 +z+1/2,-y+1/2,-x
- -318 -x+1/2,+z+1/2,-y
- -319 +z+1/2,-y+1/2,+x
- -320 +x+1/2,+z+1/2,-y
- -321 -x+1/2,+z+1/2,+y
- -322 +y+1/2,-x+1/2,+z
- -323 +z+1/2,+y+1/2,-x
- -324 -y+1/2,+x+1/2,+z
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x,+y+1/2,-z+1/2
+ 105 -z,+x+1/2,+y+1/2
+ 106 +y,-z+1/2,+x+1/2
+ 107 -z,+x+1/2,-y+1/2
+ 108 -y,-z+1/2,+x+1/2
+ 109 +y,-z+1/2,-x+1/2
+ 110 -x,+y+1/2,-z+1/2
+ 111 -z,-x+1/2,+y+1/2
+ 112 +x,-y+1/2,-z+1/2
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y,+x+1/2,-z+1/2
+ 117 -z,+y+1/2,+x+1/2
+ 118 +x,-z+1/2,+y+1/2
+ 119 -z,+y+1/2,-x+1/2
+ 120 -x,-z+1/2,+y+1/2
+ 121 +x,-z+1/2,-y+1/2
+ 122 -y,+x+1/2,-z+1/2
+ 123 -z,-y+1/2,+x+1/2
+ 124 +y,-x+1/2,-z+1/2
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x,-y+1/2,+z+1/2
+ -105 +z,-x+1/2,-y+1/2
+ -106 -y,+z+1/2,-x+1/2
+ -107 +z,-x+1/2,+y+1/2
+ -108 +y,+z+1/2,-x+1/2
+ -109 -y,+z+1/2,+x+1/2
+ -110 +x,-y+1/2,+z+1/2
+ -111 +z,+x+1/2,-y+1/2
+ -112 -x,+y+1/2,+z+1/2
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y,-x+1/2,+z+1/2
+ -117 +z,-y+1/2,-x+1/2
+ -118 -x,+z+1/2,-y+1/2
+ -119 +z,-y+1/2,+x+1/2
+ -120 +x,+z+1/2,-y+1/2
+ -121 -x,+z+1/2,+y+1/2
+ -122 +y,-x+1/2,+z+1/2
+ -123 +z,+y+1/2,-x+1/2
+ -124 -y,+x+1/2,+z+1/2
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+1/2,+y,-z+1/2
+ 205 -z+1/2,+x,+y+1/2
+ 206 +y+1/2,-z,+x+1/2
+ 207 -z+1/2,+x,-y+1/2
+ 208 -y+1/2,-z,+x+1/2
+ 209 +y+1/2,-z,-x+1/2
+ 210 -x+1/2,+y,-z+1/2
+ 211 -z+1/2,-x,+y+1/2
+ 212 +x+1/2,-y,-z+1/2
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+1/2,+x,-z+1/2
+ 217 -z+1/2,+y,+x+1/2
+ 218 +x+1/2,-z,+y+1/2
+ 219 -z+1/2,+y,-x+1/2
+ 220 -x+1/2,-z,+y+1/2
+ 221 +x+1/2,-z,-y+1/2
+ 222 -y+1/2,+x,-z+1/2
+ 223 -z+1/2,-y,+x+1/2
+ 224 +y+1/2,-x,-z+1/2
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/2,-y,+z+1/2
+ -205 +z+1/2,-x,-y+1/2
+ -206 -y+1/2,+z,-x+1/2
+ -207 +z+1/2,-x,+y+1/2
+ -208 +y+1/2,+z,-x+1/2
+ -209 -y+1/2,+z,+x+1/2
+ -210 +x+1/2,-y,+z+1/2
+ -211 +z+1/2,+x,-y+1/2
+ -212 -x+1/2,+y,+z+1/2
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/2,-x,+z+1/2
+ -217 +z+1/2,-y,-x+1/2
+ -218 -x+1/2,+z,-y+1/2
+ -219 +z+1/2,-y,+x+1/2
+ -220 +x+1/2,+z,-y+1/2
+ -221 -x+1/2,+z,+y+1/2
+ -222 +y+1/2,-x,+z+1/2
+ -223 +z+1/2,+y,-x+1/2
+ -224 -y+1/2,+x,+z+1/2
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+1/2,+y+1/2,-z
+ 305 -z+1/2,+x+1/2,+y
+ 306 +y+1/2,-z+1/2,+x
+ 307 -z+1/2,+x+1/2,-y
+ 308 -y+1/2,-z+1/2,+x
+ 309 +y+1/2,-z+1/2,-x
+ 310 -x+1/2,+y+1/2,-z
+ 311 -z+1/2,-x+1/2,+y
+ 312 +x+1/2,-y+1/2,-z
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+1/2,+x+1/2,-z
+ 317 -z+1/2,+y+1/2,+x
+ 318 +x+1/2,-z+1/2,+y
+ 319 -z+1/2,+y+1/2,-x
+ 320 -x+1/2,-z+1/2,+y
+ 321 +x+1/2,-z+1/2,-y
+ 322 -y+1/2,+x+1/2,-z
+ 323 -z+1/2,-y+1/2,+x
+ 324 +y+1/2,-x+1/2,-z
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/2,-y+1/2,+z
+ -305 +z+1/2,-x+1/2,-y
+ -306 -y+1/2,+z+1/2,-x
+ -307 +z+1/2,-x+1/2,+y
+ -308 +y+1/2,+z+1/2,-x
+ -309 -y+1/2,+z+1/2,+x
+ -310 +x+1/2,-y+1/2,+z
+ -311 +z+1/2,+x+1/2,-y
+ -312 -x+1/2,+y+1/2,+z
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/2,-x+1/2,+z
+ -317 +z+1/2,-y+1/2,-x
+ -318 -x+1/2,+z+1/2,-y
+ -319 +z+1/2,-y+1/2,+x
+ -320 +x+1/2,+z+1/2,-y
+ -321 -x+1/2,+z+1/2,+y
+ -322 +y+1/2,-x+1/2,+z
+ -323 +z+1/2,+y+1/2,-x
+ -324 -y+1/2,+x+1/2,+z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -443,14 +443,14 @@ loop_
_atom_site_symmetry_multiplicity
Ca
0.0 0.0 0.0 1.0 Uiso 0.025 4
-F
+F
F2 0.25 0.25 0.25 1.0 Uiso 0.025 8
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Ca 4.0
- F 8.0
-
+ Ca 4.0
+ F 8.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum "Ca F2"
_chemical_formula_weight 78.08
diff --git a/scripts/Engineering/ENGINX/phase_info/CEO2.cif b/scripts/Engineering/ENGINX/phase_info/CEO2.cif
index b053b33aaf1969a88d79c3e6b978bf585cf71664..9abc6f4009ca6272740cd24fa561cb0ae6191b7a 100644
--- a/scripts/Engineering/ENGINX/phase_info/CEO2.cif
+++ b/scripts/Engineering/ENGINX/phase_info/CEO2.cif
@@ -235,198 +235,198 @@ _cell_volume 158.46391
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x,+y+1/2,-z+1/2
- 105 -z,+x+1/2,+y+1/2
- 106 +y,-z+1/2,+x+1/2
- 107 -z,+x+1/2,-y+1/2
- 108 -y,-z+1/2,+x+1/2
- 109 +y,-z+1/2,-x+1/2
- 110 -x,+y+1/2,-z+1/2
- 111 -z,-x+1/2,+y+1/2
- 112 +x,-y+1/2,-z+1/2
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y,+x+1/2,-z+1/2
- 117 -z,+y+1/2,+x+1/2
- 118 +x,-z+1/2,+y+1/2
- 119 -z,+y+1/2,-x+1/2
- 120 -x,-z+1/2,+y+1/2
- 121 +x,-z+1/2,-y+1/2
- 122 -y,+x+1/2,-z+1/2
- 123 -z,-y+1/2,+x+1/2
- 124 +y,-x+1/2,-z+1/2
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x,-y+1/2,+z+1/2
- -105 +z,-x+1/2,-y+1/2
- -106 -y,+z+1/2,-x+1/2
- -107 +z,-x+1/2,+y+1/2
- -108 +y,+z+1/2,-x+1/2
- -109 -y,+z+1/2,+x+1/2
- -110 +x,-y+1/2,+z+1/2
- -111 +z,+x+1/2,-y+1/2
- -112 -x,+y+1/2,+z+1/2
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y,-x+1/2,+z+1/2
- -117 +z,-y+1/2,-x+1/2
- -118 -x,+z+1/2,-y+1/2
- -119 +z,-y+1/2,+x+1/2
- -120 +x,+z+1/2,-y+1/2
- -121 -x,+z+1/2,+y+1/2
- -122 +y,-x+1/2,+z+1/2
- -123 +z,+y+1/2,-x+1/2
- -124 -y,+x+1/2,+z+1/2
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+1/2,+y,-z+1/2
- 205 -z+1/2,+x,+y+1/2
- 206 +y+1/2,-z,+x+1/2
- 207 -z+1/2,+x,-y+1/2
- 208 -y+1/2,-z,+x+1/2
- 209 +y+1/2,-z,-x+1/2
- 210 -x+1/2,+y,-z+1/2
- 211 -z+1/2,-x,+y+1/2
- 212 +x+1/2,-y,-z+1/2
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+1/2,+x,-z+1/2
- 217 -z+1/2,+y,+x+1/2
- 218 +x+1/2,-z,+y+1/2
- 219 -z+1/2,+y,-x+1/2
- 220 -x+1/2,-z,+y+1/2
- 221 +x+1/2,-z,-y+1/2
- 222 -y+1/2,+x,-z+1/2
- 223 -z+1/2,-y,+x+1/2
- 224 +y+1/2,-x,-z+1/2
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/2,-y,+z+1/2
- -205 +z+1/2,-x,-y+1/2
- -206 -y+1/2,+z,-x+1/2
- -207 +z+1/2,-x,+y+1/2
- -208 +y+1/2,+z,-x+1/2
- -209 -y+1/2,+z,+x+1/2
- -210 +x+1/2,-y,+z+1/2
- -211 +z+1/2,+x,-y+1/2
- -212 -x+1/2,+y,+z+1/2
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/2,-x,+z+1/2
- -217 +z+1/2,-y,-x+1/2
- -218 -x+1/2,+z,-y+1/2
- -219 +z+1/2,-y,+x+1/2
- -220 +x+1/2,+z,-y+1/2
- -221 -x+1/2,+z,+y+1/2
- -222 +y+1/2,-x,+z+1/2
- -223 +z+1/2,+y,-x+1/2
- -224 -y+1/2,+x,+z+1/2
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+1/2,+y+1/2,-z
- 305 -z+1/2,+x+1/2,+y
- 306 +y+1/2,-z+1/2,+x
- 307 -z+1/2,+x+1/2,-y
- 308 -y+1/2,-z+1/2,+x
- 309 +y+1/2,-z+1/2,-x
- 310 -x+1/2,+y+1/2,-z
- 311 -z+1/2,-x+1/2,+y
- 312 +x+1/2,-y+1/2,-z
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+1/2,+x+1/2,-z
- 317 -z+1/2,+y+1/2,+x
- 318 +x+1/2,-z+1/2,+y
- 319 -z+1/2,+y+1/2,-x
- 320 -x+1/2,-z+1/2,+y
- 321 +x+1/2,-z+1/2,-y
- 322 -y+1/2,+x+1/2,-z
- 323 -z+1/2,-y+1/2,+x
- 324 +y+1/2,-x+1/2,-z
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/2,-y+1/2,+z
- -305 +z+1/2,-x+1/2,-y
- -306 -y+1/2,+z+1/2,-x
- -307 +z+1/2,-x+1/2,+y
- -308 +y+1/2,+z+1/2,-x
- -309 -y+1/2,+z+1/2,+x
- -310 +x+1/2,-y+1/2,+z
- -311 +z+1/2,+x+1/2,-y
- -312 -x+1/2,+y+1/2,+z
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/2,-x+1/2,+z
- -317 +z+1/2,-y+1/2,-x
- -318 -x+1/2,+z+1/2,-y
- -319 +z+1/2,-y+1/2,+x
- -320 +x+1/2,+z+1/2,-y
- -321 -x+1/2,+z+1/2,+y
- -322 +y+1/2,-x+1/2,+z
- -323 +z+1/2,+y+1/2,-x
- -324 -y+1/2,+x+1/2,+z
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x,+y+1/2,-z+1/2
+ 105 -z,+x+1/2,+y+1/2
+ 106 +y,-z+1/2,+x+1/2
+ 107 -z,+x+1/2,-y+1/2
+ 108 -y,-z+1/2,+x+1/2
+ 109 +y,-z+1/2,-x+1/2
+ 110 -x,+y+1/2,-z+1/2
+ 111 -z,-x+1/2,+y+1/2
+ 112 +x,-y+1/2,-z+1/2
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y,+x+1/2,-z+1/2
+ 117 -z,+y+1/2,+x+1/2
+ 118 +x,-z+1/2,+y+1/2
+ 119 -z,+y+1/2,-x+1/2
+ 120 -x,-z+1/2,+y+1/2
+ 121 +x,-z+1/2,-y+1/2
+ 122 -y,+x+1/2,-z+1/2
+ 123 -z,-y+1/2,+x+1/2
+ 124 +y,-x+1/2,-z+1/2
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x,-y+1/2,+z+1/2
+ -105 +z,-x+1/2,-y+1/2
+ -106 -y,+z+1/2,-x+1/2
+ -107 +z,-x+1/2,+y+1/2
+ -108 +y,+z+1/2,-x+1/2
+ -109 -y,+z+1/2,+x+1/2
+ -110 +x,-y+1/2,+z+1/2
+ -111 +z,+x+1/2,-y+1/2
+ -112 -x,+y+1/2,+z+1/2
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y,-x+1/2,+z+1/2
+ -117 +z,-y+1/2,-x+1/2
+ -118 -x,+z+1/2,-y+1/2
+ -119 +z,-y+1/2,+x+1/2
+ -120 +x,+z+1/2,-y+1/2
+ -121 -x,+z+1/2,+y+1/2
+ -122 +y,-x+1/2,+z+1/2
+ -123 +z,+y+1/2,-x+1/2
+ -124 -y,+x+1/2,+z+1/2
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+1/2,+y,-z+1/2
+ 205 -z+1/2,+x,+y+1/2
+ 206 +y+1/2,-z,+x+1/2
+ 207 -z+1/2,+x,-y+1/2
+ 208 -y+1/2,-z,+x+1/2
+ 209 +y+1/2,-z,-x+1/2
+ 210 -x+1/2,+y,-z+1/2
+ 211 -z+1/2,-x,+y+1/2
+ 212 +x+1/2,-y,-z+1/2
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+1/2,+x,-z+1/2
+ 217 -z+1/2,+y,+x+1/2
+ 218 +x+1/2,-z,+y+1/2
+ 219 -z+1/2,+y,-x+1/2
+ 220 -x+1/2,-z,+y+1/2
+ 221 +x+1/2,-z,-y+1/2
+ 222 -y+1/2,+x,-z+1/2
+ 223 -z+1/2,-y,+x+1/2
+ 224 +y+1/2,-x,-z+1/2
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/2,-y,+z+1/2
+ -205 +z+1/2,-x,-y+1/2
+ -206 -y+1/2,+z,-x+1/2
+ -207 +z+1/2,-x,+y+1/2
+ -208 +y+1/2,+z,-x+1/2
+ -209 -y+1/2,+z,+x+1/2
+ -210 +x+1/2,-y,+z+1/2
+ -211 +z+1/2,+x,-y+1/2
+ -212 -x+1/2,+y,+z+1/2
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/2,-x,+z+1/2
+ -217 +z+1/2,-y,-x+1/2
+ -218 -x+1/2,+z,-y+1/2
+ -219 +z+1/2,-y,+x+1/2
+ -220 +x+1/2,+z,-y+1/2
+ -221 -x+1/2,+z,+y+1/2
+ -222 +y+1/2,-x,+z+1/2
+ -223 +z+1/2,+y,-x+1/2
+ -224 -y+1/2,+x,+z+1/2
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+1/2,+y+1/2,-z
+ 305 -z+1/2,+x+1/2,+y
+ 306 +y+1/2,-z+1/2,+x
+ 307 -z+1/2,+x+1/2,-y
+ 308 -y+1/2,-z+1/2,+x
+ 309 +y+1/2,-z+1/2,-x
+ 310 -x+1/2,+y+1/2,-z
+ 311 -z+1/2,-x+1/2,+y
+ 312 +x+1/2,-y+1/2,-z
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+1/2,+x+1/2,-z
+ 317 -z+1/2,+y+1/2,+x
+ 318 +x+1/2,-z+1/2,+y
+ 319 -z+1/2,+y+1/2,-x
+ 320 -x+1/2,-z+1/2,+y
+ 321 +x+1/2,-z+1/2,-y
+ 322 -y+1/2,+x+1/2,-z
+ 323 -z+1/2,-y+1/2,+x
+ 324 +y+1/2,-x+1/2,-z
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/2,-y+1/2,+z
+ -305 +z+1/2,-x+1/2,-y
+ -306 -y+1/2,+z+1/2,-x
+ -307 +z+1/2,-x+1/2,+y
+ -308 +y+1/2,+z+1/2,-x
+ -309 -y+1/2,+z+1/2,+x
+ -310 +x+1/2,-y+1/2,+z
+ -311 +z+1/2,+x+1/2,-y
+ -312 -x+1/2,+y+1/2,+z
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/2,-x+1/2,+z
+ -317 +z+1/2,-y+1/2,-x
+ -318 -x+1/2,+z+1/2,-y
+ -319 +z+1/2,-y+1/2,+x
+ -320 +x+1/2,+z+1/2,-y
+ -321 -x+1/2,+z+1/2,+y
+ -322 +y+1/2,-x+1/2,+z
+ -323 +z+1/2,+y+1/2,-x
+ -324 -y+1/2,+x+1/2,+z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -443,14 +443,14 @@ loop_
_atom_site_symmetry_multiplicity
Ce
0.0 0.0 0.0 1.0 Uiso 0.025 4
-O
+O
O2 0.25 0.25 0.25 1.0 Uiso 0.025 8
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Ce 4.0
- O 8.0
-
+ Ce 4.0
+ O 8.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum "Ce O2"
_chemical_formula_weight 172.12
diff --git a/scripts/Engineering/ENGINX/phase_info/CO2W6C2.cif b/scripts/Engineering/ENGINX/phase_info/CO2W6C2.cif
index b2dd7ac922bc9df827bf1d20df397c386b00d691..9ab80f67dd16e1d76406d8ffeb369db3a887b4fc 100644
--- a/scripts/Engineering/ENGINX/phase_info/CO2W6C2.cif
+++ b/scripts/Engineering/ENGINX/phase_info/CO2W6C2.cif
@@ -235,198 +235,198 @@ _cell_volume 1424.58789
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x,+y+1/2,-z+1/2
- 105 -z,+x+1/2,+y+1/2
- 106 +y,-z+1/2,+x+1/2
- 107 -z,+x+1/2,-y+1/2
- 108 -y,-z+1/2,+x+1/2
- 109 +y,-z+1/2,-x+1/2
- 110 -x,+y+1/2,-z+1/2
- 111 -z,-x+1/2,+y+1/2
- 112 +x,-y+1/2,-z+1/2
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y,+x+1/2,-z+1/2
- 117 -z,+y+1/2,+x+1/2
- 118 +x,-z+1/2,+y+1/2
- 119 -z,+y+1/2,-x+1/2
- 120 -x,-z+1/2,+y+1/2
- 121 +x,-z+1/2,-y+1/2
- 122 -y,+x+1/2,-z+1/2
- 123 -z,-y+1/2,+x+1/2
- 124 +y,-x+1/2,-z+1/2
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x,-y+1/2,+z+1/2
- -105 +z,-x+1/2,-y+1/2
- -106 -y,+z+1/2,-x+1/2
- -107 +z,-x+1/2,+y+1/2
- -108 +y,+z+1/2,-x+1/2
- -109 -y,+z+1/2,+x+1/2
- -110 +x,-y+1/2,+z+1/2
- -111 +z,+x+1/2,-y+1/2
- -112 -x,+y+1/2,+z+1/2
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y,-x+1/2,+z+1/2
- -117 +z,-y+1/2,-x+1/2
- -118 -x,+z+1/2,-y+1/2
- -119 +z,-y+1/2,+x+1/2
- -120 +x,+z+1/2,-y+1/2
- -121 -x,+z+1/2,+y+1/2
- -122 +y,-x+1/2,+z+1/2
- -123 +z,+y+1/2,-x+1/2
- -124 -y,+x+1/2,+z+1/2
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+1/2,+y,-z+1/2
- 205 -z+1/2,+x,+y+1/2
- 206 +y+1/2,-z,+x+1/2
- 207 -z+1/2,+x,-y+1/2
- 208 -y+1/2,-z,+x+1/2
- 209 +y+1/2,-z,-x+1/2
- 210 -x+1/2,+y,-z+1/2
- 211 -z+1/2,-x,+y+1/2
- 212 +x+1/2,-y,-z+1/2
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+1/2,+x,-z+1/2
- 217 -z+1/2,+y,+x+1/2
- 218 +x+1/2,-z,+y+1/2
- 219 -z+1/2,+y,-x+1/2
- 220 -x+1/2,-z,+y+1/2
- 221 +x+1/2,-z,-y+1/2
- 222 -y+1/2,+x,-z+1/2
- 223 -z+1/2,-y,+x+1/2
- 224 +y+1/2,-x,-z+1/2
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/2,-y,+z+1/2
- -205 +z+1/2,-x,-y+1/2
- -206 -y+1/2,+z,-x+1/2
- -207 +z+1/2,-x,+y+1/2
- -208 +y+1/2,+z,-x+1/2
- -209 -y+1/2,+z,+x+1/2
- -210 +x+1/2,-y,+z+1/2
- -211 +z+1/2,+x,-y+1/2
- -212 -x+1/2,+y,+z+1/2
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/2,-x,+z+1/2
- -217 +z+1/2,-y,-x+1/2
- -218 -x+1/2,+z,-y+1/2
- -219 +z+1/2,-y,+x+1/2
- -220 +x+1/2,+z,-y+1/2
- -221 -x+1/2,+z,+y+1/2
- -222 +y+1/2,-x,+z+1/2
- -223 +z+1/2,+y,-x+1/2
- -224 -y+1/2,+x,+z+1/2
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+1/2,+y+1/2,-z
- 305 -z+1/2,+x+1/2,+y
- 306 +y+1/2,-z+1/2,+x
- 307 -z+1/2,+x+1/2,-y
- 308 -y+1/2,-z+1/2,+x
- 309 +y+1/2,-z+1/2,-x
- 310 -x+1/2,+y+1/2,-z
- 311 -z+1/2,-x+1/2,+y
- 312 +x+1/2,-y+1/2,-z
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+1/2,+x+1/2,-z
- 317 -z+1/2,+y+1/2,+x
- 318 +x+1/2,-z+1/2,+y
- 319 -z+1/2,+y+1/2,-x
- 320 -x+1/2,-z+1/2,+y
- 321 +x+1/2,-z+1/2,-y
- 322 -y+1/2,+x+1/2,-z
- 323 -z+1/2,-y+1/2,+x
- 324 +y+1/2,-x+1/2,-z
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/2,-y+1/2,+z
- -305 +z+1/2,-x+1/2,-y
- -306 -y+1/2,+z+1/2,-x
- -307 +z+1/2,-x+1/2,+y
- -308 +y+1/2,+z+1/2,-x
- -309 -y+1/2,+z+1/2,+x
- -310 +x+1/2,-y+1/2,+z
- -311 +z+1/2,+x+1/2,-y
- -312 -x+1/2,+y+1/2,+z
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/2,-x+1/2,+z
- -317 +z+1/2,-y+1/2,-x
- -318 -x+1/2,+z+1/2,-y
- -319 +z+1/2,-y+1/2,+x
- -320 +x+1/2,+z+1/2,-y
- -321 -x+1/2,+z+1/2,+y
- -322 +y+1/2,-x+1/2,+z
- -323 +z+1/2,+y+1/2,-x
- -324 -y+1/2,+x+1/2,+z
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x,+y+1/2,-z+1/2
+ 105 -z,+x+1/2,+y+1/2
+ 106 +y,-z+1/2,+x+1/2
+ 107 -z,+x+1/2,-y+1/2
+ 108 -y,-z+1/2,+x+1/2
+ 109 +y,-z+1/2,-x+1/2
+ 110 -x,+y+1/2,-z+1/2
+ 111 -z,-x+1/2,+y+1/2
+ 112 +x,-y+1/2,-z+1/2
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y,+x+1/2,-z+1/2
+ 117 -z,+y+1/2,+x+1/2
+ 118 +x,-z+1/2,+y+1/2
+ 119 -z,+y+1/2,-x+1/2
+ 120 -x,-z+1/2,+y+1/2
+ 121 +x,-z+1/2,-y+1/2
+ 122 -y,+x+1/2,-z+1/2
+ 123 -z,-y+1/2,+x+1/2
+ 124 +y,-x+1/2,-z+1/2
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x,-y+1/2,+z+1/2
+ -105 +z,-x+1/2,-y+1/2
+ -106 -y,+z+1/2,-x+1/2
+ -107 +z,-x+1/2,+y+1/2
+ -108 +y,+z+1/2,-x+1/2
+ -109 -y,+z+1/2,+x+1/2
+ -110 +x,-y+1/2,+z+1/2
+ -111 +z,+x+1/2,-y+1/2
+ -112 -x,+y+1/2,+z+1/2
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y,-x+1/2,+z+1/2
+ -117 +z,-y+1/2,-x+1/2
+ -118 -x,+z+1/2,-y+1/2
+ -119 +z,-y+1/2,+x+1/2
+ -120 +x,+z+1/2,-y+1/2
+ -121 -x,+z+1/2,+y+1/2
+ -122 +y,-x+1/2,+z+1/2
+ -123 +z,+y+1/2,-x+1/2
+ -124 -y,+x+1/2,+z+1/2
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+1/2,+y,-z+1/2
+ 205 -z+1/2,+x,+y+1/2
+ 206 +y+1/2,-z,+x+1/2
+ 207 -z+1/2,+x,-y+1/2
+ 208 -y+1/2,-z,+x+1/2
+ 209 +y+1/2,-z,-x+1/2
+ 210 -x+1/2,+y,-z+1/2
+ 211 -z+1/2,-x,+y+1/2
+ 212 +x+1/2,-y,-z+1/2
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+1/2,+x,-z+1/2
+ 217 -z+1/2,+y,+x+1/2
+ 218 +x+1/2,-z,+y+1/2
+ 219 -z+1/2,+y,-x+1/2
+ 220 -x+1/2,-z,+y+1/2
+ 221 +x+1/2,-z,-y+1/2
+ 222 -y+1/2,+x,-z+1/2
+ 223 -z+1/2,-y,+x+1/2
+ 224 +y+1/2,-x,-z+1/2
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/2,-y,+z+1/2
+ -205 +z+1/2,-x,-y+1/2
+ -206 -y+1/2,+z,-x+1/2
+ -207 +z+1/2,-x,+y+1/2
+ -208 +y+1/2,+z,-x+1/2
+ -209 -y+1/2,+z,+x+1/2
+ -210 +x+1/2,-y,+z+1/2
+ -211 +z+1/2,+x,-y+1/2
+ -212 -x+1/2,+y,+z+1/2
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/2,-x,+z+1/2
+ -217 +z+1/2,-y,-x+1/2
+ -218 -x+1/2,+z,-y+1/2
+ -219 +z+1/2,-y,+x+1/2
+ -220 +x+1/2,+z,-y+1/2
+ -221 -x+1/2,+z,+y+1/2
+ -222 +y+1/2,-x,+z+1/2
+ -223 +z+1/2,+y,-x+1/2
+ -224 -y+1/2,+x,+z+1/2
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+1/2,+y+1/2,-z
+ 305 -z+1/2,+x+1/2,+y
+ 306 +y+1/2,-z+1/2,+x
+ 307 -z+1/2,+x+1/2,-y
+ 308 -y+1/2,-z+1/2,+x
+ 309 +y+1/2,-z+1/2,-x
+ 310 -x+1/2,+y+1/2,-z
+ 311 -z+1/2,-x+1/2,+y
+ 312 +x+1/2,-y+1/2,-z
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+1/2,+x+1/2,-z
+ 317 -z+1/2,+y+1/2,+x
+ 318 +x+1/2,-z+1/2,+y
+ 319 -z+1/2,+y+1/2,-x
+ 320 -x+1/2,-z+1/2,+y
+ 321 +x+1/2,-z+1/2,-y
+ 322 -y+1/2,+x+1/2,-z
+ 323 -z+1/2,-y+1/2,+x
+ 324 +y+1/2,-x+1/2,-z
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/2,-y+1/2,+z
+ -305 +z+1/2,-x+1/2,-y
+ -306 -y+1/2,+z+1/2,-x
+ -307 +z+1/2,-x+1/2,+y
+ -308 +y+1/2,+z+1/2,-x
+ -309 -y+1/2,+z+1/2,+x
+ -310 +x+1/2,-y+1/2,+z
+ -311 +z+1/2,+x+1/2,-y
+ -312 -x+1/2,+y+1/2,+z
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/2,-x+1/2,+z
+ -317 +z+1/2,-y+1/2,-x
+ -318 -x+1/2,+z+1/2,-y
+ -319 +z+1/2,-y+1/2,+x
+ -320 +x+1/2,+z+1/2,-y
+ -321 -x+1/2,+z+1/2,+y
+ -322 +y+1/2,-x+1/2,+z
+ -323 +z+1/2,+y+1/2,-x
+ -324 -y+1/2,+x+1/2,+z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -441,13 +441,13 @@ loop_
_atom_site_thermal_displace_type
_atom_site_U_iso_or_equiv
_atom_site_symmetry_multiplicity
-W
+W
W1 0.0 0.0 0.0 1.0 Uiso 0.025 4
loop_ _atom_type_symbol
_atom_type_number_in_cell
- W 4.0
-
+ W 4.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum W
_chemical_formula_weight 183.85
diff --git a/scripts/Engineering/ENGINX/phase_info/CO3W9C4.cif b/scripts/Engineering/ENGINX/phase_info/CO3W9C4.cif
index 12383619f3669270f1c26548d316dcc84428035a..49998e4082dfe0047518c87855547e9b2a2d53f0 100644
--- a/scripts/Engineering/ENGINX/phase_info/CO3W9C4.cif
+++ b/scripts/Engineering/ENGINX/phase_info/CO3W9C4.cif
@@ -235,18 +235,18 @@ _cell_volume 415.09775
_symmetry_cell_setting hexagonal
_symmetry_space_group_name_H-M "P 63 / m m c"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 x-y,+x,+z+1/2
- 3 -y,x-y,+z
- 4 -x,-y,+z+1/2
- 5 y-x,-x,+z
- 6 +y,y-x,+z+1/2
- 7 +y,+x,+z
- 8 y-x,+y,+z+1/2
- 9 -x,y-x,+z
- 10 -y,-x,+z+1/2
- 11 x-y,-y,+z
- 12 +x,x-y,+z+1/2
+ 1 +x,+y,+z
+ 2 x-y,+x,+z+1/2
+ 3 -y,x-y,+z
+ 4 -x,-y,+z+1/2
+ 5 y-x,-x,+z
+ 6 +y,y-x,+z+1/2
+ 7 +y,+x,+z
+ 8 y-x,+y,+z+1/2
+ 9 -x,y-x,+z
+ 10 -y,-x,+z+1/2
+ 11 x-y,-y,+z
+ 12 +x,x-y,+z+1/2
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -261,13 +261,13 @@ loop_
_atom_site_thermal_displace_type
_atom_site_U_iso_or_equiv
_atom_site_symmetry_multiplicity
-W
+W
W1 0.33333 0.66667 0.25 1.0 Uiso 0.025 4
loop_ _atom_type_symbol
_atom_type_number_in_cell
- W 4.0
-
+ W 4.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum W
_chemical_formula_weight 183.85
diff --git a/scripts/Engineering/ENGINX/phase_info/CO6W6C.cif b/scripts/Engineering/ENGINX/phase_info/CO6W6C.cif
index a5a03a8f9fb622c71d4a8bcfa78f40ac2f2d9518..3e7c42ce90b56765d25fbd69bfa09c8a08d5bbc3 100644
--- a/scripts/Engineering/ENGINX/phase_info/CO6W6C.cif
+++ b/scripts/Engineering/ENGINX/phase_info/CO6W6C.cif
@@ -235,198 +235,198 @@ _cell_volume 1294.31653
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F d 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x+1/4,+y+1/4,-z
- 5 -z,+x+1/4,+y+1/4
- 6 +y+1/4,-z,+x+1/4
- 7 -z+1/4,+x+1/2,-y+3/4
- 8 -y+3/4,-z+1/4,+x+1/2
- 9 +y+1/2,-z+1/4,-x+3/4
- 10 -x+3/4,+y+1/2,-z+1/4
- 11 -z+1/4,-x+3/4,+y+1/2
- 12 +x+1/2,-y+3/4,-z+1/4
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y+1/4,+x+1/4,-z
- 17 -z,+y+1/4,+x+1/4
- 18 +x+1/4,-z,+y+1/4
- 19 -z+1/4,+y+1/2,-x+3/4
- 20 -x+3/4,-z+1/4,+y+1/2
- 21 +x+1/2,-z+1/4,-y+3/4
- 22 -y+3/4,+x+1/2,-z+1/4
- 23 -z+1/4,-y+3/4,+x+1/2
- 24 +y+1/2,-x+3/4,-z+1/4
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x+3/4,-y+3/4,+z
- -5 +z,-x+3/4,-y+3/4
- -6 -y+3/4,+z,-x+3/4
- -7 +z+3/4,-x+1/2,+y+1/4
- -8 +y+1/4,+z+3/4,-x+1/2
- -9 -y+1/2,+z+3/4,+x+1/4
- -10 +x+1/4,-y+1/2,+z+3/4
- -11 +z+3/4,+x+1/4,-y+1/2
- -12 -x+1/2,+y+1/4,+z+3/4
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y+3/4,-x+3/4,+z
- -17 +z,-y+3/4,-x+3/4
- -18 -x+3/4,+z,-y+3/4
- -19 +z+3/4,-y+1/2,+x+1/4
- -20 +x+1/4,+z+3/4,-y+1/2
- -21 -x+1/2,+z+3/4,+y+1/4
- -22 +y+1/4,-x+1/2,+z+3/4
- -23 +z+3/4,+y+1/4,-x+1/2
- -24 -y+1/2,+x+1/4,+z+3/4
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x+1/4,+y+3/4,-z+1/2
- 105 -z,+x+3/4,+y+3/4
- 106 +y+1/4,-z+1/2,+x+3/4
- 107 -z+1/4,+x,-y+1/4
- 108 -y+3/4,-z+3/4,+x
- 109 +y+1/2,-z+3/4,-x+1/4
- 110 -x+3/4,+y,-z+3/4
- 111 -z+1/4,-x+1/4,+y
- 112 +x+1/2,-y+1/4,-z+3/4
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y+1/4,+x+3/4,-z+1/2
- 117 -z,+y+3/4,+x+3/4
- 118 +x+1/4,-z+1/2,+y+3/4
- 119 -z+1/4,+y,-x+1/4
- 120 -x+3/4,-z+3/4,+y
- 121 +x+1/2,-z+3/4,-y+1/4
- 122 -y+3/4,+x,-z+3/4
- 123 -z+1/4,-y+1/4,+x
- 124 +y+1/2,-x+1/4,-z+3/4
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x+3/4,-y+1/4,+z+1/2
- -105 +z,-x+1/4,-y+1/4
- -106 -y+3/4,+z+1/2,-x+1/4
- -107 +z+3/4,-x,+y+3/4
- -108 +y+1/4,+z+1/4,-x
- -109 -y+1/2,+z+1/4,+x+3/4
- -110 +x+1/4,-y,+z+1/4
- -111 +z+3/4,+x+3/4,-y
- -112 -x+1/2,+y+3/4,+z+1/4
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y+3/4,-x+1/4,+z+1/2
- -117 +z,-y+1/4,-x+1/4
- -118 -x+3/4,+z+1/2,-y+1/4
- -119 +z+3/4,-y,+x+3/4
- -120 +x+1/4,+z+1/4,-y
- -121 -x+1/2,+z+1/4,+y+3/4
- -122 +y+1/4,-x,+z+1/4
- -123 +z+3/4,+y+3/4,-x
- -124 -y+1/2,+x+3/4,+z+1/4
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+3/4,+y+1/4,-z+1/2
- 205 -z+1/2,+x+1/4,+y+3/4
- 206 +y+3/4,-z,+x+3/4
- 207 -z+3/4,+x+1/2,-y+1/4
- 208 -y+1/4,-z+1/4,+x
- 209 +y,-z+1/4,-x+1/4
- 210 -x+1/4,+y+1/2,-z+3/4
- 211 -z+3/4,-x+3/4,+y
- 212 +x,-y+3/4,-z+3/4
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+3/4,+x+1/4,-z+1/2
- 217 -z+1/2,+y+1/4,+x+3/4
- 218 +x+3/4,-z,+y+3/4
- 219 -z+3/4,+y+1/2,-x+1/4
- 220 -x+1/4,-z+1/4,+y
- 221 +x,-z+1/4,-y+1/4
- 222 -y+1/4,+x+1/2,-z+3/4
- 223 -z+3/4,-y+3/4,+x
- 224 +y,-x+3/4,-z+3/4
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/4,-y+3/4,+z+1/2
- -205 +z+1/2,-x+3/4,-y+1/4
- -206 -y+1/4,+z,-x+1/4
- -207 +z+1/4,-x+1/2,+y+3/4
- -208 +y+3/4,+z+3/4,-x
- -209 -y,+z+3/4,+x+3/4
- -210 +x+3/4,-y+1/2,+z+1/4
- -211 +z+1/4,+x+1/4,-y
- -212 -x,+y+1/4,+z+1/4
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/4,-x+3/4,+z+1/2
- -217 +z+1/2,-y+3/4,-x+1/4
- -218 -x+1/4,+z,-y+1/4
- -219 +z+1/4,-y+1/2,+x+3/4
- -220 +x+3/4,+z+3/4,-y
- -221 -x,+z+3/4,+y+3/4
- -222 +y+3/4,-x+1/2,+z+1/4
- -223 +z+1/4,+y+1/4,-x
- -224 -y,+x+1/4,+z+1/4
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+3/4,+y+3/4,-z
- 305 -z+1/2,+x+3/4,+y+1/4
- 306 +y+3/4,-z+1/2,+x+1/4
- 307 -z+3/4,+x,-y+3/4
- 308 -y+1/4,-z+3/4,+x+1/2
- 309 +y,-z+3/4,-x+3/4
- 310 -x+1/4,+y,-z+1/4
- 311 -z+3/4,-x+1/4,+y+1/2
- 312 +x,-y+1/4,-z+1/4
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+3/4,+x+3/4,-z
- 317 -z+1/2,+y+3/4,+x+1/4
- 318 +x+3/4,-z+1/2,+y+1/4
- 319 -z+3/4,+y,-x+3/4
- 320 -x+1/4,-z+3/4,+y+1/2
- 321 +x,-z+3/4,-y+3/4
- 322 -y+1/4,+x,-z+1/4
- 323 -z+3/4,-y+1/4,+x+1/2
- 324 +y,-x+1/4,-z+1/4
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/4,-y+1/4,+z
- -305 +z+1/2,-x+1/4,-y+3/4
- -306 -y+1/4,+z+1/2,-x+3/4
- -307 +z+1/4,-x,+y+1/4
- -308 +y+3/4,+z+1/4,-x+1/2
- -309 -y,+z+1/4,+x+1/4
- -310 +x+3/4,-y,+z+3/4
- -311 +z+1/4,+x+3/4,-y+1/2
- -312 -x,+y+3/4,+z+3/4
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/4,-x+1/4,+z
- -317 +z+1/2,-y+1/4,-x+3/4
- -318 -x+1/4,+z+1/2,-y+3/4
- -319 +z+1/4,-y,+x+1/4
- -320 +x+3/4,+z+1/4,-y+1/2
- -321 -x,+z+1/4,+y+1/4
- -322 +y+3/4,-x,+z+3/4
- -323 +z+1/4,+y+3/4,-x+1/2
- -324 -y,+x+3/4,+z+3/4
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x+1/4,+y+1/4,-z
+ 5 -z,+x+1/4,+y+1/4
+ 6 +y+1/4,-z,+x+1/4
+ 7 -z+1/4,+x+1/2,-y+3/4
+ 8 -y+3/4,-z+1/4,+x+1/2
+ 9 +y+1/2,-z+1/4,-x+3/4
+ 10 -x+3/4,+y+1/2,-z+1/4
+ 11 -z+1/4,-x+3/4,+y+1/2
+ 12 +x+1/2,-y+3/4,-z+1/4
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y+1/4,+x+1/4,-z
+ 17 -z,+y+1/4,+x+1/4
+ 18 +x+1/4,-z,+y+1/4
+ 19 -z+1/4,+y+1/2,-x+3/4
+ 20 -x+3/4,-z+1/4,+y+1/2
+ 21 +x+1/2,-z+1/4,-y+3/4
+ 22 -y+3/4,+x+1/2,-z+1/4
+ 23 -z+1/4,-y+3/4,+x+1/2
+ 24 +y+1/2,-x+3/4,-z+1/4
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x+3/4,-y+3/4,+z
+ -5 +z,-x+3/4,-y+3/4
+ -6 -y+3/4,+z,-x+3/4
+ -7 +z+3/4,-x+1/2,+y+1/4
+ -8 +y+1/4,+z+3/4,-x+1/2
+ -9 -y+1/2,+z+3/4,+x+1/4
+ -10 +x+1/4,-y+1/2,+z+3/4
+ -11 +z+3/4,+x+1/4,-y+1/2
+ -12 -x+1/2,+y+1/4,+z+3/4
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y+3/4,-x+3/4,+z
+ -17 +z,-y+3/4,-x+3/4
+ -18 -x+3/4,+z,-y+3/4
+ -19 +z+3/4,-y+1/2,+x+1/4
+ -20 +x+1/4,+z+3/4,-y+1/2
+ -21 -x+1/2,+z+3/4,+y+1/4
+ -22 +y+1/4,-x+1/2,+z+3/4
+ -23 +z+3/4,+y+1/4,-x+1/2
+ -24 -y+1/2,+x+1/4,+z+3/4
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x+1/4,+y+3/4,-z+1/2
+ 105 -z,+x+3/4,+y+3/4
+ 106 +y+1/4,-z+1/2,+x+3/4
+ 107 -z+1/4,+x,-y+1/4
+ 108 -y+3/4,-z+3/4,+x
+ 109 +y+1/2,-z+3/4,-x+1/4
+ 110 -x+3/4,+y,-z+3/4
+ 111 -z+1/4,-x+1/4,+y
+ 112 +x+1/2,-y+1/4,-z+3/4
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y+1/4,+x+3/4,-z+1/2
+ 117 -z,+y+3/4,+x+3/4
+ 118 +x+1/4,-z+1/2,+y+3/4
+ 119 -z+1/4,+y,-x+1/4
+ 120 -x+3/4,-z+3/4,+y
+ 121 +x+1/2,-z+3/4,-y+1/4
+ 122 -y+3/4,+x,-z+3/4
+ 123 -z+1/4,-y+1/4,+x
+ 124 +y+1/2,-x+1/4,-z+3/4
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x+3/4,-y+1/4,+z+1/2
+ -105 +z,-x+1/4,-y+1/4
+ -106 -y+3/4,+z+1/2,-x+1/4
+ -107 +z+3/4,-x,+y+3/4
+ -108 +y+1/4,+z+1/4,-x
+ -109 -y+1/2,+z+1/4,+x+3/4
+ -110 +x+1/4,-y,+z+1/4
+ -111 +z+3/4,+x+3/4,-y
+ -112 -x+1/2,+y+3/4,+z+1/4
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y+3/4,-x+1/4,+z+1/2
+ -117 +z,-y+1/4,-x+1/4
+ -118 -x+3/4,+z+1/2,-y+1/4
+ -119 +z+3/4,-y,+x+3/4
+ -120 +x+1/4,+z+1/4,-y
+ -121 -x+1/2,+z+1/4,+y+3/4
+ -122 +y+1/4,-x,+z+1/4
+ -123 +z+3/4,+y+3/4,-x
+ -124 -y+1/2,+x+3/4,+z+1/4
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+3/4,+y+1/4,-z+1/2
+ 205 -z+1/2,+x+1/4,+y+3/4
+ 206 +y+3/4,-z,+x+3/4
+ 207 -z+3/4,+x+1/2,-y+1/4
+ 208 -y+1/4,-z+1/4,+x
+ 209 +y,-z+1/4,-x+1/4
+ 210 -x+1/4,+y+1/2,-z+3/4
+ 211 -z+3/4,-x+3/4,+y
+ 212 +x,-y+3/4,-z+3/4
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+3/4,+x+1/4,-z+1/2
+ 217 -z+1/2,+y+1/4,+x+3/4
+ 218 +x+3/4,-z,+y+3/4
+ 219 -z+3/4,+y+1/2,-x+1/4
+ 220 -x+1/4,-z+1/4,+y
+ 221 +x,-z+1/4,-y+1/4
+ 222 -y+1/4,+x+1/2,-z+3/4
+ 223 -z+3/4,-y+3/4,+x
+ 224 +y,-x+3/4,-z+3/4
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/4,-y+3/4,+z+1/2
+ -205 +z+1/2,-x+3/4,-y+1/4
+ -206 -y+1/4,+z,-x+1/4
+ -207 +z+1/4,-x+1/2,+y+3/4
+ -208 +y+3/4,+z+3/4,-x
+ -209 -y,+z+3/4,+x+3/4
+ -210 +x+3/4,-y+1/2,+z+1/4
+ -211 +z+1/4,+x+1/4,-y
+ -212 -x,+y+1/4,+z+1/4
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/4,-x+3/4,+z+1/2
+ -217 +z+1/2,-y+3/4,-x+1/4
+ -218 -x+1/4,+z,-y+1/4
+ -219 +z+1/4,-y+1/2,+x+3/4
+ -220 +x+3/4,+z+3/4,-y
+ -221 -x,+z+3/4,+y+3/4
+ -222 +y+3/4,-x+1/2,+z+1/4
+ -223 +z+1/4,+y+1/4,-x
+ -224 -y,+x+1/4,+z+1/4
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+3/4,+y+3/4,-z
+ 305 -z+1/2,+x+3/4,+y+1/4
+ 306 +y+3/4,-z+1/2,+x+1/4
+ 307 -z+3/4,+x,-y+3/4
+ 308 -y+1/4,-z+3/4,+x+1/2
+ 309 +y,-z+3/4,-x+3/4
+ 310 -x+1/4,+y,-z+1/4
+ 311 -z+3/4,-x+1/4,+y+1/2
+ 312 +x,-y+1/4,-z+1/4
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+3/4,+x+3/4,-z
+ 317 -z+1/2,+y+3/4,+x+1/4
+ 318 +x+3/4,-z+1/2,+y+1/4
+ 319 -z+3/4,+y,-x+3/4
+ 320 -x+1/4,-z+3/4,+y+1/2
+ 321 +x,-z+3/4,-y+3/4
+ 322 -y+1/4,+x,-z+1/4
+ 323 -z+3/4,-y+1/4,+x+1/2
+ 324 +y,-x+1/4,-z+1/4
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/4,-y+1/4,+z
+ -305 +z+1/2,-x+1/4,-y+3/4
+ -306 -y+1/4,+z+1/2,-x+3/4
+ -307 +z+1/4,-x,+y+1/4
+ -308 +y+3/4,+z+1/4,-x+1/2
+ -309 -y,+z+1/4,+x+1/4
+ -310 +x+3/4,-y,+z+3/4
+ -311 +z+1/4,+x+3/4,-y+1/2
+ -312 -x,+y+3/4,+z+3/4
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/4,-x+1/4,+z
+ -317 +z+1/2,-y+1/4,-x+3/4
+ -318 -x+1/4,+z+1/2,-y+3/4
+ -319 +z+1/4,-y,+x+1/4
+ -320 +x+3/4,+z+1/4,-y+1/2
+ -321 -x,+z+1/4,+y+1/4
+ -322 +y+3/4,-x,+z+3/4
+ -323 +z+1/4,+y+3/4,-x+1/2
+ -324 -y,+x+3/4,+z+3/4
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -441,13 +441,13 @@ loop_
_atom_site_thermal_displace_type
_atom_site_U_iso_or_equiv
_atom_site_symmetry_multiplicity
-W
+W
W1 0.0 0.0 0.0 1.0 Uiso 0.025 16
loop_ _atom_type_symbol
_atom_type_number_in_cell
- W 16.0
-
+ W 16.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum W
_chemical_formula_weight 183.85
diff --git a/scripts/Engineering/ENGINX/phase_info/CR.cif b/scripts/Engineering/ENGINX/phase_info/CR.cif
index 7746584110ca21843fbfdd3b4e3ea8663909af58..a4647680ac8cbf9c04f1439f4ff42356c6f04b71 100644
--- a/scripts/Engineering/ENGINX/phase_info/CR.cif
+++ b/scripts/Engineering/ENGINX/phase_info/CR.cif
@@ -235,102 +235,102 @@ _cell_volume 24.00252
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "I m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x+1/2,+y+1/2,+z+1/2
- 102 +z+1/2,+x+1/2,+y+1/2
- 103 +y+1/2,+z+1/2,+x+1/2
- 104 +x+1/2,+y+1/2,-z+1/2
- 105 -z+1/2,+x+1/2,+y+1/2
- 106 +y+1/2,-z+1/2,+x+1/2
- 107 -z+1/2,+x+1/2,-y+1/2
- 108 -y+1/2,-z+1/2,+x+1/2
- 109 +y+1/2,-z+1/2,-x+1/2
- 110 -x+1/2,+y+1/2,-z+1/2
- 111 -z+1/2,-x+1/2,+y+1/2
- 112 +x+1/2,-y+1/2,-z+1/2
- 113 +y+1/2,+x+1/2,+z+1/2
- 114 +z+1/2,+y+1/2,+x+1/2
- 115 +x+1/2,+z+1/2,+y+1/2
- 116 +y+1/2,+x+1/2,-z+1/2
- 117 -z+1/2,+y+1/2,+x+1/2
- 118 +x+1/2,-z+1/2,+y+1/2
- 119 -z+1/2,+y+1/2,-x+1/2
- 120 -x+1/2,-z+1/2,+y+1/2
- 121 +x+1/2,-z+1/2,-y+1/2
- 122 -y+1/2,+x+1/2,-z+1/2
- 123 -z+1/2,-y+1/2,+x+1/2
- 124 +y+1/2,-x+1/2,-z+1/2
- -101 -x+1/2,-y+1/2,-z+1/2
- -102 -z+1/2,-x+1/2,-y+1/2
- -103 -y+1/2,-z+1/2,-x+1/2
- -104 -x+1/2,-y+1/2,+z+1/2
- -105 +z+1/2,-x+1/2,-y+1/2
- -106 -y+1/2,+z+1/2,-x+1/2
- -107 +z+1/2,-x+1/2,+y+1/2
- -108 +y+1/2,+z+1/2,-x+1/2
- -109 -y+1/2,+z+1/2,+x+1/2
- -110 +x+1/2,-y+1/2,+z+1/2
- -111 +z+1/2,+x+1/2,-y+1/2
- -112 -x+1/2,+y+1/2,+z+1/2
- -113 -y+1/2,-x+1/2,-z+1/2
- -114 -z+1/2,-y+1/2,-x+1/2
- -115 -x+1/2,-z+1/2,-y+1/2
- -116 -y+1/2,-x+1/2,+z+1/2
- -117 +z+1/2,-y+1/2,-x+1/2
- -118 -x+1/2,+z+1/2,-y+1/2
- -119 +z+1/2,-y+1/2,+x+1/2
- -120 +x+1/2,+z+1/2,-y+1/2
- -121 -x+1/2,+z+1/2,+y+1/2
- -122 +y+1/2,-x+1/2,+z+1/2
- -123 +z+1/2,+y+1/2,-x+1/2
- -124 -y+1/2,+x+1/2,+z+1/2
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x+1/2,+y+1/2,+z+1/2
+ 102 +z+1/2,+x+1/2,+y+1/2
+ 103 +y+1/2,+z+1/2,+x+1/2
+ 104 +x+1/2,+y+1/2,-z+1/2
+ 105 -z+1/2,+x+1/2,+y+1/2
+ 106 +y+1/2,-z+1/2,+x+1/2
+ 107 -z+1/2,+x+1/2,-y+1/2
+ 108 -y+1/2,-z+1/2,+x+1/2
+ 109 +y+1/2,-z+1/2,-x+1/2
+ 110 -x+1/2,+y+1/2,-z+1/2
+ 111 -z+1/2,-x+1/2,+y+1/2
+ 112 +x+1/2,-y+1/2,-z+1/2
+ 113 +y+1/2,+x+1/2,+z+1/2
+ 114 +z+1/2,+y+1/2,+x+1/2
+ 115 +x+1/2,+z+1/2,+y+1/2
+ 116 +y+1/2,+x+1/2,-z+1/2
+ 117 -z+1/2,+y+1/2,+x+1/2
+ 118 +x+1/2,-z+1/2,+y+1/2
+ 119 -z+1/2,+y+1/2,-x+1/2
+ 120 -x+1/2,-z+1/2,+y+1/2
+ 121 +x+1/2,-z+1/2,-y+1/2
+ 122 -y+1/2,+x+1/2,-z+1/2
+ 123 -z+1/2,-y+1/2,+x+1/2
+ 124 +y+1/2,-x+1/2,-z+1/2
+ -101 -x+1/2,-y+1/2,-z+1/2
+ -102 -z+1/2,-x+1/2,-y+1/2
+ -103 -y+1/2,-z+1/2,-x+1/2
+ -104 -x+1/2,-y+1/2,+z+1/2
+ -105 +z+1/2,-x+1/2,-y+1/2
+ -106 -y+1/2,+z+1/2,-x+1/2
+ -107 +z+1/2,-x+1/2,+y+1/2
+ -108 +y+1/2,+z+1/2,-x+1/2
+ -109 -y+1/2,+z+1/2,+x+1/2
+ -110 +x+1/2,-y+1/2,+z+1/2
+ -111 +z+1/2,+x+1/2,-y+1/2
+ -112 -x+1/2,+y+1/2,+z+1/2
+ -113 -y+1/2,-x+1/2,-z+1/2
+ -114 -z+1/2,-y+1/2,-x+1/2
+ -115 -x+1/2,-z+1/2,-y+1/2
+ -116 -y+1/2,-x+1/2,+z+1/2
+ -117 +z+1/2,-y+1/2,-x+1/2
+ -118 -x+1/2,+z+1/2,-y+1/2
+ -119 +z+1/2,-y+1/2,+x+1/2
+ -120 +x+1/2,+z+1/2,-y+1/2
+ -121 -x+1/2,+z+1/2,+y+1/2
+ -122 +y+1/2,-x+1/2,+z+1/2
+ -123 +z+1/2,+y+1/2,-x+1/2
+ -124 -y+1/2,+x+1/2,+z+1/2
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -350,8 +350,8 @@ CR1 0.0 0.0 0.0 1.0 Uiso 0.025 2
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Cr 2.0
-
+ Cr 2.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Cr
_chemical_formula_weight 52.00
diff --git a/scripts/Engineering/ENGINX/phase_info/CU.cif b/scripts/Engineering/ENGINX/phase_info/CU.cif
index 9bcab3a84c71d78c0b9828ba7f3ce723b99bf3cc..a977a492e8844268c5c3dd80c02aa622ee844561 100644
--- a/scripts/Engineering/ENGINX/phase_info/CU.cif
+++ b/scripts/Engineering/ENGINX/phase_info/CU.cif
@@ -235,198 +235,198 @@ _cell_volume 47.44972
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x,+y+1/2,-z+1/2
- 105 -z,+x+1/2,+y+1/2
- 106 +y,-z+1/2,+x+1/2
- 107 -z,+x+1/2,-y+1/2
- 108 -y,-z+1/2,+x+1/2
- 109 +y,-z+1/2,-x+1/2
- 110 -x,+y+1/2,-z+1/2
- 111 -z,-x+1/2,+y+1/2
- 112 +x,-y+1/2,-z+1/2
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y,+x+1/2,-z+1/2
- 117 -z,+y+1/2,+x+1/2
- 118 +x,-z+1/2,+y+1/2
- 119 -z,+y+1/2,-x+1/2
- 120 -x,-z+1/2,+y+1/2
- 121 +x,-z+1/2,-y+1/2
- 122 -y,+x+1/2,-z+1/2
- 123 -z,-y+1/2,+x+1/2
- 124 +y,-x+1/2,-z+1/2
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x,-y+1/2,+z+1/2
- -105 +z,-x+1/2,-y+1/2
- -106 -y,+z+1/2,-x+1/2
- -107 +z,-x+1/2,+y+1/2
- -108 +y,+z+1/2,-x+1/2
- -109 -y,+z+1/2,+x+1/2
- -110 +x,-y+1/2,+z+1/2
- -111 +z,+x+1/2,-y+1/2
- -112 -x,+y+1/2,+z+1/2
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y,-x+1/2,+z+1/2
- -117 +z,-y+1/2,-x+1/2
- -118 -x,+z+1/2,-y+1/2
- -119 +z,-y+1/2,+x+1/2
- -120 +x,+z+1/2,-y+1/2
- -121 -x,+z+1/2,+y+1/2
- -122 +y,-x+1/2,+z+1/2
- -123 +z,+y+1/2,-x+1/2
- -124 -y,+x+1/2,+z+1/2
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+1/2,+y,-z+1/2
- 205 -z+1/2,+x,+y+1/2
- 206 +y+1/2,-z,+x+1/2
- 207 -z+1/2,+x,-y+1/2
- 208 -y+1/2,-z,+x+1/2
- 209 +y+1/2,-z,-x+1/2
- 210 -x+1/2,+y,-z+1/2
- 211 -z+1/2,-x,+y+1/2
- 212 +x+1/2,-y,-z+1/2
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+1/2,+x,-z+1/2
- 217 -z+1/2,+y,+x+1/2
- 218 +x+1/2,-z,+y+1/2
- 219 -z+1/2,+y,-x+1/2
- 220 -x+1/2,-z,+y+1/2
- 221 +x+1/2,-z,-y+1/2
- 222 -y+1/2,+x,-z+1/2
- 223 -z+1/2,-y,+x+1/2
- 224 +y+1/2,-x,-z+1/2
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/2,-y,+z+1/2
- -205 +z+1/2,-x,-y+1/2
- -206 -y+1/2,+z,-x+1/2
- -207 +z+1/2,-x,+y+1/2
- -208 +y+1/2,+z,-x+1/2
- -209 -y+1/2,+z,+x+1/2
- -210 +x+1/2,-y,+z+1/2
- -211 +z+1/2,+x,-y+1/2
- -212 -x+1/2,+y,+z+1/2
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/2,-x,+z+1/2
- -217 +z+1/2,-y,-x+1/2
- -218 -x+1/2,+z,-y+1/2
- -219 +z+1/2,-y,+x+1/2
- -220 +x+1/2,+z,-y+1/2
- -221 -x+1/2,+z,+y+1/2
- -222 +y+1/2,-x,+z+1/2
- -223 +z+1/2,+y,-x+1/2
- -224 -y+1/2,+x,+z+1/2
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+1/2,+y+1/2,-z
- 305 -z+1/2,+x+1/2,+y
- 306 +y+1/2,-z+1/2,+x
- 307 -z+1/2,+x+1/2,-y
- 308 -y+1/2,-z+1/2,+x
- 309 +y+1/2,-z+1/2,-x
- 310 -x+1/2,+y+1/2,-z
- 311 -z+1/2,-x+1/2,+y
- 312 +x+1/2,-y+1/2,-z
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+1/2,+x+1/2,-z
- 317 -z+1/2,+y+1/2,+x
- 318 +x+1/2,-z+1/2,+y
- 319 -z+1/2,+y+1/2,-x
- 320 -x+1/2,-z+1/2,+y
- 321 +x+1/2,-z+1/2,-y
- 322 -y+1/2,+x+1/2,-z
- 323 -z+1/2,-y+1/2,+x
- 324 +y+1/2,-x+1/2,-z
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/2,-y+1/2,+z
- -305 +z+1/2,-x+1/2,-y
- -306 -y+1/2,+z+1/2,-x
- -307 +z+1/2,-x+1/2,+y
- -308 +y+1/2,+z+1/2,-x
- -309 -y+1/2,+z+1/2,+x
- -310 +x+1/2,-y+1/2,+z
- -311 +z+1/2,+x+1/2,-y
- -312 -x+1/2,+y+1/2,+z
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/2,-x+1/2,+z
- -317 +z+1/2,-y+1/2,-x
- -318 -x+1/2,+z+1/2,-y
- -319 +z+1/2,-y+1/2,+x
- -320 +x+1/2,+z+1/2,-y
- -321 -x+1/2,+z+1/2,+y
- -322 +y+1/2,-x+1/2,+z
- -323 +z+1/2,+y+1/2,-x
- -324 -y+1/2,+x+1/2,+z
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x,+y+1/2,-z+1/2
+ 105 -z,+x+1/2,+y+1/2
+ 106 +y,-z+1/2,+x+1/2
+ 107 -z,+x+1/2,-y+1/2
+ 108 -y,-z+1/2,+x+1/2
+ 109 +y,-z+1/2,-x+1/2
+ 110 -x,+y+1/2,-z+1/2
+ 111 -z,-x+1/2,+y+1/2
+ 112 +x,-y+1/2,-z+1/2
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y,+x+1/2,-z+1/2
+ 117 -z,+y+1/2,+x+1/2
+ 118 +x,-z+1/2,+y+1/2
+ 119 -z,+y+1/2,-x+1/2
+ 120 -x,-z+1/2,+y+1/2
+ 121 +x,-z+1/2,-y+1/2
+ 122 -y,+x+1/2,-z+1/2
+ 123 -z,-y+1/2,+x+1/2
+ 124 +y,-x+1/2,-z+1/2
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x,-y+1/2,+z+1/2
+ -105 +z,-x+1/2,-y+1/2
+ -106 -y,+z+1/2,-x+1/2
+ -107 +z,-x+1/2,+y+1/2
+ -108 +y,+z+1/2,-x+1/2
+ -109 -y,+z+1/2,+x+1/2
+ -110 +x,-y+1/2,+z+1/2
+ -111 +z,+x+1/2,-y+1/2
+ -112 -x,+y+1/2,+z+1/2
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y,-x+1/2,+z+1/2
+ -117 +z,-y+1/2,-x+1/2
+ -118 -x,+z+1/2,-y+1/2
+ -119 +z,-y+1/2,+x+1/2
+ -120 +x,+z+1/2,-y+1/2
+ -121 -x,+z+1/2,+y+1/2
+ -122 +y,-x+1/2,+z+1/2
+ -123 +z,+y+1/2,-x+1/2
+ -124 -y,+x+1/2,+z+1/2
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+1/2,+y,-z+1/2
+ 205 -z+1/2,+x,+y+1/2
+ 206 +y+1/2,-z,+x+1/2
+ 207 -z+1/2,+x,-y+1/2
+ 208 -y+1/2,-z,+x+1/2
+ 209 +y+1/2,-z,-x+1/2
+ 210 -x+1/2,+y,-z+1/2
+ 211 -z+1/2,-x,+y+1/2
+ 212 +x+1/2,-y,-z+1/2
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+1/2,+x,-z+1/2
+ 217 -z+1/2,+y,+x+1/2
+ 218 +x+1/2,-z,+y+1/2
+ 219 -z+1/2,+y,-x+1/2
+ 220 -x+1/2,-z,+y+1/2
+ 221 +x+1/2,-z,-y+1/2
+ 222 -y+1/2,+x,-z+1/2
+ 223 -z+1/2,-y,+x+1/2
+ 224 +y+1/2,-x,-z+1/2
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/2,-y,+z+1/2
+ -205 +z+1/2,-x,-y+1/2
+ -206 -y+1/2,+z,-x+1/2
+ -207 +z+1/2,-x,+y+1/2
+ -208 +y+1/2,+z,-x+1/2
+ -209 -y+1/2,+z,+x+1/2
+ -210 +x+1/2,-y,+z+1/2
+ -211 +z+1/2,+x,-y+1/2
+ -212 -x+1/2,+y,+z+1/2
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/2,-x,+z+1/2
+ -217 +z+1/2,-y,-x+1/2
+ -218 -x+1/2,+z,-y+1/2
+ -219 +z+1/2,-y,+x+1/2
+ -220 +x+1/2,+z,-y+1/2
+ -221 -x+1/2,+z,+y+1/2
+ -222 +y+1/2,-x,+z+1/2
+ -223 +z+1/2,+y,-x+1/2
+ -224 -y+1/2,+x,+z+1/2
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+1/2,+y+1/2,-z
+ 305 -z+1/2,+x+1/2,+y
+ 306 +y+1/2,-z+1/2,+x
+ 307 -z+1/2,+x+1/2,-y
+ 308 -y+1/2,-z+1/2,+x
+ 309 +y+1/2,-z+1/2,-x
+ 310 -x+1/2,+y+1/2,-z
+ 311 -z+1/2,-x+1/2,+y
+ 312 +x+1/2,-y+1/2,-z
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+1/2,+x+1/2,-z
+ 317 -z+1/2,+y+1/2,+x
+ 318 +x+1/2,-z+1/2,+y
+ 319 -z+1/2,+y+1/2,-x
+ 320 -x+1/2,-z+1/2,+y
+ 321 +x+1/2,-z+1/2,-y
+ 322 -y+1/2,+x+1/2,-z
+ 323 -z+1/2,-y+1/2,+x
+ 324 +y+1/2,-x+1/2,-z
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/2,-y+1/2,+z
+ -305 +z+1/2,-x+1/2,-y
+ -306 -y+1/2,+z+1/2,-x
+ -307 +z+1/2,-x+1/2,+y
+ -308 +y+1/2,+z+1/2,-x
+ -309 -y+1/2,+z+1/2,+x
+ -310 +x+1/2,-y+1/2,+z
+ -311 +z+1/2,+x+1/2,-y
+ -312 -x+1/2,+y+1/2,+z
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/2,-x+1/2,+z
+ -317 +z+1/2,-y+1/2,-x
+ -318 -x+1/2,+z+1/2,-y
+ -319 +z+1/2,-y+1/2,+x
+ -320 +x+1/2,+z+1/2,-y
+ -321 -x+1/2,+z+1/2,+y
+ -322 +y+1/2,-x+1/2,+z
+ -323 +z+1/2,+y+1/2,-x
+ -324 -y+1/2,+x+1/2,+z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -446,8 +446,8 @@ CU1 0.0 0.0 0.0 1.0 Uiso 0.025 4
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Cu 4.0
-
+ Cu 4.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Cu
_chemical_formula_weight 63.54
diff --git a/scripts/Engineering/ENGINX/phase_info/FE.cif b/scripts/Engineering/ENGINX/phase_info/FE.cif
index 112c18134ca1cb48f1fd81848b03845e40a266b9..d57617db25ae2a6a49db570734f59dfe0e3b7bd0 100644
--- a/scripts/Engineering/ENGINX/phase_info/FE.cif
+++ b/scripts/Engineering/ENGINX/phase_info/FE.cif
@@ -235,102 +235,102 @@ _cell_volume 23.39366
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "I m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x+1/2,+y+1/2,+z+1/2
- 102 +z+1/2,+x+1/2,+y+1/2
- 103 +y+1/2,+z+1/2,+x+1/2
- 104 +x+1/2,+y+1/2,-z+1/2
- 105 -z+1/2,+x+1/2,+y+1/2
- 106 +y+1/2,-z+1/2,+x+1/2
- 107 -z+1/2,+x+1/2,-y+1/2
- 108 -y+1/2,-z+1/2,+x+1/2
- 109 +y+1/2,-z+1/2,-x+1/2
- 110 -x+1/2,+y+1/2,-z+1/2
- 111 -z+1/2,-x+1/2,+y+1/2
- 112 +x+1/2,-y+1/2,-z+1/2
- 113 +y+1/2,+x+1/2,+z+1/2
- 114 +z+1/2,+y+1/2,+x+1/2
- 115 +x+1/2,+z+1/2,+y+1/2
- 116 +y+1/2,+x+1/2,-z+1/2
- 117 -z+1/2,+y+1/2,+x+1/2
- 118 +x+1/2,-z+1/2,+y+1/2
- 119 -z+1/2,+y+1/2,-x+1/2
- 120 -x+1/2,-z+1/2,+y+1/2
- 121 +x+1/2,-z+1/2,-y+1/2
- 122 -y+1/2,+x+1/2,-z+1/2
- 123 -z+1/2,-y+1/2,+x+1/2
- 124 +y+1/2,-x+1/2,-z+1/2
- -101 -x+1/2,-y+1/2,-z+1/2
- -102 -z+1/2,-x+1/2,-y+1/2
- -103 -y+1/2,-z+1/2,-x+1/2
- -104 -x+1/2,-y+1/2,+z+1/2
- -105 +z+1/2,-x+1/2,-y+1/2
- -106 -y+1/2,+z+1/2,-x+1/2
- -107 +z+1/2,-x+1/2,+y+1/2
- -108 +y+1/2,+z+1/2,-x+1/2
- -109 -y+1/2,+z+1/2,+x+1/2
- -110 +x+1/2,-y+1/2,+z+1/2
- -111 +z+1/2,+x+1/2,-y+1/2
- -112 -x+1/2,+y+1/2,+z+1/2
- -113 -y+1/2,-x+1/2,-z+1/2
- -114 -z+1/2,-y+1/2,-x+1/2
- -115 -x+1/2,-z+1/2,-y+1/2
- -116 -y+1/2,-x+1/2,+z+1/2
- -117 +z+1/2,-y+1/2,-x+1/2
- -118 -x+1/2,+z+1/2,-y+1/2
- -119 +z+1/2,-y+1/2,+x+1/2
- -120 +x+1/2,+z+1/2,-y+1/2
- -121 -x+1/2,+z+1/2,+y+1/2
- -122 +y+1/2,-x+1/2,+z+1/2
- -123 +z+1/2,+y+1/2,-x+1/2
- -124 -y+1/2,+x+1/2,+z+1/2
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x+1/2,+y+1/2,+z+1/2
+ 102 +z+1/2,+x+1/2,+y+1/2
+ 103 +y+1/2,+z+1/2,+x+1/2
+ 104 +x+1/2,+y+1/2,-z+1/2
+ 105 -z+1/2,+x+1/2,+y+1/2
+ 106 +y+1/2,-z+1/2,+x+1/2
+ 107 -z+1/2,+x+1/2,-y+1/2
+ 108 -y+1/2,-z+1/2,+x+1/2
+ 109 +y+1/2,-z+1/2,-x+1/2
+ 110 -x+1/2,+y+1/2,-z+1/2
+ 111 -z+1/2,-x+1/2,+y+1/2
+ 112 +x+1/2,-y+1/2,-z+1/2
+ 113 +y+1/2,+x+1/2,+z+1/2
+ 114 +z+1/2,+y+1/2,+x+1/2
+ 115 +x+1/2,+z+1/2,+y+1/2
+ 116 +y+1/2,+x+1/2,-z+1/2
+ 117 -z+1/2,+y+1/2,+x+1/2
+ 118 +x+1/2,-z+1/2,+y+1/2
+ 119 -z+1/2,+y+1/2,-x+1/2
+ 120 -x+1/2,-z+1/2,+y+1/2
+ 121 +x+1/2,-z+1/2,-y+1/2
+ 122 -y+1/2,+x+1/2,-z+1/2
+ 123 -z+1/2,-y+1/2,+x+1/2
+ 124 +y+1/2,-x+1/2,-z+1/2
+ -101 -x+1/2,-y+1/2,-z+1/2
+ -102 -z+1/2,-x+1/2,-y+1/2
+ -103 -y+1/2,-z+1/2,-x+1/2
+ -104 -x+1/2,-y+1/2,+z+1/2
+ -105 +z+1/2,-x+1/2,-y+1/2
+ -106 -y+1/2,+z+1/2,-x+1/2
+ -107 +z+1/2,-x+1/2,+y+1/2
+ -108 +y+1/2,+z+1/2,-x+1/2
+ -109 -y+1/2,+z+1/2,+x+1/2
+ -110 +x+1/2,-y+1/2,+z+1/2
+ -111 +z+1/2,+x+1/2,-y+1/2
+ -112 -x+1/2,+y+1/2,+z+1/2
+ -113 -y+1/2,-x+1/2,-z+1/2
+ -114 -z+1/2,-y+1/2,-x+1/2
+ -115 -x+1/2,-z+1/2,-y+1/2
+ -116 -y+1/2,-x+1/2,+z+1/2
+ -117 +z+1/2,-y+1/2,-x+1/2
+ -118 -x+1/2,+z+1/2,-y+1/2
+ -119 +z+1/2,-y+1/2,+x+1/2
+ -120 +x+1/2,+z+1/2,-y+1/2
+ -121 -x+1/2,+z+1/2,+y+1/2
+ -122 +y+1/2,-x+1/2,+z+1/2
+ -123 +z+1/2,+y+1/2,-x+1/2
+ -124 -y+1/2,+x+1/2,+z+1/2
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -352,8 +352,8 @@ FE2 0.5 0.5 0.5 1.0 Uiso 0.025 2
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Fe 4.0
-
+ Fe 4.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Fe
_chemical_formula_weight 55.85
diff --git a/scripts/Engineering/ENGINX/phase_info/FECO_B2.cif b/scripts/Engineering/ENGINX/phase_info/FECO_B2.cif
index 938dacf294b03ac4db310fdeedb15739259496ca..bb2e9efa3432dce761042315aa3798c722a798b0 100644
--- a/scripts/Engineering/ENGINX/phase_info/FECO_B2.cif
+++ b/scripts/Engineering/ENGINX/phase_info/FECO_B2.cif
@@ -235,54 +235,54 @@ _cell_volume 23.32012
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "P m -3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -304,9 +304,9 @@ Fe 0.5 0.5 0.5 1.0 Uiso 0.025 1
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Co 1.0
- Fe 1.0
-
+ Co 1.0
+ Fe 1.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum "Co Fe"
_chemical_formula_weight 114.78
diff --git a/scripts/Engineering/ENGINX/phase_info/FE_ALPHA.cif b/scripts/Engineering/ENGINX/phase_info/FE_ALPHA.cif
index 5618294983fd57850f441299aecbaec8c189d73b..c508a8328845863a6dad538b362c84e52c01f314 100644
--- a/scripts/Engineering/ENGINX/phase_info/FE_ALPHA.cif
+++ b/scripts/Engineering/ENGINX/phase_info/FE_ALPHA.cif
@@ -235,102 +235,102 @@ _cell_volume 23.55352
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "I m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x+1/2,+y+1/2,+z+1/2
- 102 +z+1/2,+x+1/2,+y+1/2
- 103 +y+1/2,+z+1/2,+x+1/2
- 104 +x+1/2,+y+1/2,-z+1/2
- 105 -z+1/2,+x+1/2,+y+1/2
- 106 +y+1/2,-z+1/2,+x+1/2
- 107 -z+1/2,+x+1/2,-y+1/2
- 108 -y+1/2,-z+1/2,+x+1/2
- 109 +y+1/2,-z+1/2,-x+1/2
- 110 -x+1/2,+y+1/2,-z+1/2
- 111 -z+1/2,-x+1/2,+y+1/2
- 112 +x+1/2,-y+1/2,-z+1/2
- 113 +y+1/2,+x+1/2,+z+1/2
- 114 +z+1/2,+y+1/2,+x+1/2
- 115 +x+1/2,+z+1/2,+y+1/2
- 116 +y+1/2,+x+1/2,-z+1/2
- 117 -z+1/2,+y+1/2,+x+1/2
- 118 +x+1/2,-z+1/2,+y+1/2
- 119 -z+1/2,+y+1/2,-x+1/2
- 120 -x+1/2,-z+1/2,+y+1/2
- 121 +x+1/2,-z+1/2,-y+1/2
- 122 -y+1/2,+x+1/2,-z+1/2
- 123 -z+1/2,-y+1/2,+x+1/2
- 124 +y+1/2,-x+1/2,-z+1/2
- -101 -x+1/2,-y+1/2,-z+1/2
- -102 -z+1/2,-x+1/2,-y+1/2
- -103 -y+1/2,-z+1/2,-x+1/2
- -104 -x+1/2,-y+1/2,+z+1/2
- -105 +z+1/2,-x+1/2,-y+1/2
- -106 -y+1/2,+z+1/2,-x+1/2
- -107 +z+1/2,-x+1/2,+y+1/2
- -108 +y+1/2,+z+1/2,-x+1/2
- -109 -y+1/2,+z+1/2,+x+1/2
- -110 +x+1/2,-y+1/2,+z+1/2
- -111 +z+1/2,+x+1/2,-y+1/2
- -112 -x+1/2,+y+1/2,+z+1/2
- -113 -y+1/2,-x+1/2,-z+1/2
- -114 -z+1/2,-y+1/2,-x+1/2
- -115 -x+1/2,-z+1/2,-y+1/2
- -116 -y+1/2,-x+1/2,+z+1/2
- -117 +z+1/2,-y+1/2,-x+1/2
- -118 -x+1/2,+z+1/2,-y+1/2
- -119 +z+1/2,-y+1/2,+x+1/2
- -120 +x+1/2,+z+1/2,-y+1/2
- -121 -x+1/2,+z+1/2,+y+1/2
- -122 +y+1/2,-x+1/2,+z+1/2
- -123 +z+1/2,+y+1/2,-x+1/2
- -124 -y+1/2,+x+1/2,+z+1/2
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x+1/2,+y+1/2,+z+1/2
+ 102 +z+1/2,+x+1/2,+y+1/2
+ 103 +y+1/2,+z+1/2,+x+1/2
+ 104 +x+1/2,+y+1/2,-z+1/2
+ 105 -z+1/2,+x+1/2,+y+1/2
+ 106 +y+1/2,-z+1/2,+x+1/2
+ 107 -z+1/2,+x+1/2,-y+1/2
+ 108 -y+1/2,-z+1/2,+x+1/2
+ 109 +y+1/2,-z+1/2,-x+1/2
+ 110 -x+1/2,+y+1/2,-z+1/2
+ 111 -z+1/2,-x+1/2,+y+1/2
+ 112 +x+1/2,-y+1/2,-z+1/2
+ 113 +y+1/2,+x+1/2,+z+1/2
+ 114 +z+1/2,+y+1/2,+x+1/2
+ 115 +x+1/2,+z+1/2,+y+1/2
+ 116 +y+1/2,+x+1/2,-z+1/2
+ 117 -z+1/2,+y+1/2,+x+1/2
+ 118 +x+1/2,-z+1/2,+y+1/2
+ 119 -z+1/2,+y+1/2,-x+1/2
+ 120 -x+1/2,-z+1/2,+y+1/2
+ 121 +x+1/2,-z+1/2,-y+1/2
+ 122 -y+1/2,+x+1/2,-z+1/2
+ 123 -z+1/2,-y+1/2,+x+1/2
+ 124 +y+1/2,-x+1/2,-z+1/2
+ -101 -x+1/2,-y+1/2,-z+1/2
+ -102 -z+1/2,-x+1/2,-y+1/2
+ -103 -y+1/2,-z+1/2,-x+1/2
+ -104 -x+1/2,-y+1/2,+z+1/2
+ -105 +z+1/2,-x+1/2,-y+1/2
+ -106 -y+1/2,+z+1/2,-x+1/2
+ -107 +z+1/2,-x+1/2,+y+1/2
+ -108 +y+1/2,+z+1/2,-x+1/2
+ -109 -y+1/2,+z+1/2,+x+1/2
+ -110 +x+1/2,-y+1/2,+z+1/2
+ -111 +z+1/2,+x+1/2,-y+1/2
+ -112 -x+1/2,+y+1/2,+z+1/2
+ -113 -y+1/2,-x+1/2,-z+1/2
+ -114 -z+1/2,-y+1/2,-x+1/2
+ -115 -x+1/2,-z+1/2,-y+1/2
+ -116 -y+1/2,-x+1/2,+z+1/2
+ -117 +z+1/2,-y+1/2,-x+1/2
+ -118 -x+1/2,+z+1/2,-y+1/2
+ -119 +z+1/2,-y+1/2,+x+1/2
+ -120 +x+1/2,+z+1/2,-y+1/2
+ -121 -x+1/2,+z+1/2,+y+1/2
+ -122 +y+1/2,-x+1/2,+z+1/2
+ -123 +z+1/2,+y+1/2,-x+1/2
+ -124 -y+1/2,+x+1/2,+z+1/2
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -350,8 +350,8 @@ FE1 0.0 0.0 0.0 1.0 Uiso 0.025 2
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Fe 2.0
-
+ Fe 2.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Fe
_chemical_formula_weight 55.85
diff --git a/scripts/Engineering/ENGINX/phase_info/FE_GAMMA.cif b/scripts/Engineering/ENGINX/phase_info/FE_GAMMA.cif
index 3a48046eb03bd51b11280ce49997441b3013a8ae..74309c6ed15da779fa48360b7340371f57285e5d 100644
--- a/scripts/Engineering/ENGINX/phase_info/FE_GAMMA.cif
+++ b/scripts/Engineering/ENGINX/phase_info/FE_GAMMA.cif
@@ -235,198 +235,198 @@ _cell_volume 47.06544
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x,+y+1/2,-z+1/2
- 105 -z,+x+1/2,+y+1/2
- 106 +y,-z+1/2,+x+1/2
- 107 -z,+x+1/2,-y+1/2
- 108 -y,-z+1/2,+x+1/2
- 109 +y,-z+1/2,-x+1/2
- 110 -x,+y+1/2,-z+1/2
- 111 -z,-x+1/2,+y+1/2
- 112 +x,-y+1/2,-z+1/2
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y,+x+1/2,-z+1/2
- 117 -z,+y+1/2,+x+1/2
- 118 +x,-z+1/2,+y+1/2
- 119 -z,+y+1/2,-x+1/2
- 120 -x,-z+1/2,+y+1/2
- 121 +x,-z+1/2,-y+1/2
- 122 -y,+x+1/2,-z+1/2
- 123 -z,-y+1/2,+x+1/2
- 124 +y,-x+1/2,-z+1/2
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x,-y+1/2,+z+1/2
- -105 +z,-x+1/2,-y+1/2
- -106 -y,+z+1/2,-x+1/2
- -107 +z,-x+1/2,+y+1/2
- -108 +y,+z+1/2,-x+1/2
- -109 -y,+z+1/2,+x+1/2
- -110 +x,-y+1/2,+z+1/2
- -111 +z,+x+1/2,-y+1/2
- -112 -x,+y+1/2,+z+1/2
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y,-x+1/2,+z+1/2
- -117 +z,-y+1/2,-x+1/2
- -118 -x,+z+1/2,-y+1/2
- -119 +z,-y+1/2,+x+1/2
- -120 +x,+z+1/2,-y+1/2
- -121 -x,+z+1/2,+y+1/2
- -122 +y,-x+1/2,+z+1/2
- -123 +z,+y+1/2,-x+1/2
- -124 -y,+x+1/2,+z+1/2
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+1/2,+y,-z+1/2
- 205 -z+1/2,+x,+y+1/2
- 206 +y+1/2,-z,+x+1/2
- 207 -z+1/2,+x,-y+1/2
- 208 -y+1/2,-z,+x+1/2
- 209 +y+1/2,-z,-x+1/2
- 210 -x+1/2,+y,-z+1/2
- 211 -z+1/2,-x,+y+1/2
- 212 +x+1/2,-y,-z+1/2
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+1/2,+x,-z+1/2
- 217 -z+1/2,+y,+x+1/2
- 218 +x+1/2,-z,+y+1/2
- 219 -z+1/2,+y,-x+1/2
- 220 -x+1/2,-z,+y+1/2
- 221 +x+1/2,-z,-y+1/2
- 222 -y+1/2,+x,-z+1/2
- 223 -z+1/2,-y,+x+1/2
- 224 +y+1/2,-x,-z+1/2
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/2,-y,+z+1/2
- -205 +z+1/2,-x,-y+1/2
- -206 -y+1/2,+z,-x+1/2
- -207 +z+1/2,-x,+y+1/2
- -208 +y+1/2,+z,-x+1/2
- -209 -y+1/2,+z,+x+1/2
- -210 +x+1/2,-y,+z+1/2
- -211 +z+1/2,+x,-y+1/2
- -212 -x+1/2,+y,+z+1/2
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/2,-x,+z+1/2
- -217 +z+1/2,-y,-x+1/2
- -218 -x+1/2,+z,-y+1/2
- -219 +z+1/2,-y,+x+1/2
- -220 +x+1/2,+z,-y+1/2
- -221 -x+1/2,+z,+y+1/2
- -222 +y+1/2,-x,+z+1/2
- -223 +z+1/2,+y,-x+1/2
- -224 -y+1/2,+x,+z+1/2
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+1/2,+y+1/2,-z
- 305 -z+1/2,+x+1/2,+y
- 306 +y+1/2,-z+1/2,+x
- 307 -z+1/2,+x+1/2,-y
- 308 -y+1/2,-z+1/2,+x
- 309 +y+1/2,-z+1/2,-x
- 310 -x+1/2,+y+1/2,-z
- 311 -z+1/2,-x+1/2,+y
- 312 +x+1/2,-y+1/2,-z
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+1/2,+x+1/2,-z
- 317 -z+1/2,+y+1/2,+x
- 318 +x+1/2,-z+1/2,+y
- 319 -z+1/2,+y+1/2,-x
- 320 -x+1/2,-z+1/2,+y
- 321 +x+1/2,-z+1/2,-y
- 322 -y+1/2,+x+1/2,-z
- 323 -z+1/2,-y+1/2,+x
- 324 +y+1/2,-x+1/2,-z
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/2,-y+1/2,+z
- -305 +z+1/2,-x+1/2,-y
- -306 -y+1/2,+z+1/2,-x
- -307 +z+1/2,-x+1/2,+y
- -308 +y+1/2,+z+1/2,-x
- -309 -y+1/2,+z+1/2,+x
- -310 +x+1/2,-y+1/2,+z
- -311 +z+1/2,+x+1/2,-y
- -312 -x+1/2,+y+1/2,+z
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/2,-x+1/2,+z
- -317 +z+1/2,-y+1/2,-x
- -318 -x+1/2,+z+1/2,-y
- -319 +z+1/2,-y+1/2,+x
- -320 +x+1/2,+z+1/2,-y
- -321 -x+1/2,+z+1/2,+y
- -322 +y+1/2,-x+1/2,+z
- -323 +z+1/2,+y+1/2,-x
- -324 -y+1/2,+x+1/2,+z
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x,+y+1/2,-z+1/2
+ 105 -z,+x+1/2,+y+1/2
+ 106 +y,-z+1/2,+x+1/2
+ 107 -z,+x+1/2,-y+1/2
+ 108 -y,-z+1/2,+x+1/2
+ 109 +y,-z+1/2,-x+1/2
+ 110 -x,+y+1/2,-z+1/2
+ 111 -z,-x+1/2,+y+1/2
+ 112 +x,-y+1/2,-z+1/2
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y,+x+1/2,-z+1/2
+ 117 -z,+y+1/2,+x+1/2
+ 118 +x,-z+1/2,+y+1/2
+ 119 -z,+y+1/2,-x+1/2
+ 120 -x,-z+1/2,+y+1/2
+ 121 +x,-z+1/2,-y+1/2
+ 122 -y,+x+1/2,-z+1/2
+ 123 -z,-y+1/2,+x+1/2
+ 124 +y,-x+1/2,-z+1/2
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x,-y+1/2,+z+1/2
+ -105 +z,-x+1/2,-y+1/2
+ -106 -y,+z+1/2,-x+1/2
+ -107 +z,-x+1/2,+y+1/2
+ -108 +y,+z+1/2,-x+1/2
+ -109 -y,+z+1/2,+x+1/2
+ -110 +x,-y+1/2,+z+1/2
+ -111 +z,+x+1/2,-y+1/2
+ -112 -x,+y+1/2,+z+1/2
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y,-x+1/2,+z+1/2
+ -117 +z,-y+1/2,-x+1/2
+ -118 -x,+z+1/2,-y+1/2
+ -119 +z,-y+1/2,+x+1/2
+ -120 +x,+z+1/2,-y+1/2
+ -121 -x,+z+1/2,+y+1/2
+ -122 +y,-x+1/2,+z+1/2
+ -123 +z,+y+1/2,-x+1/2
+ -124 -y,+x+1/2,+z+1/2
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+1/2,+y,-z+1/2
+ 205 -z+1/2,+x,+y+1/2
+ 206 +y+1/2,-z,+x+1/2
+ 207 -z+1/2,+x,-y+1/2
+ 208 -y+1/2,-z,+x+1/2
+ 209 +y+1/2,-z,-x+1/2
+ 210 -x+1/2,+y,-z+1/2
+ 211 -z+1/2,-x,+y+1/2
+ 212 +x+1/2,-y,-z+1/2
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+1/2,+x,-z+1/2
+ 217 -z+1/2,+y,+x+1/2
+ 218 +x+1/2,-z,+y+1/2
+ 219 -z+1/2,+y,-x+1/2
+ 220 -x+1/2,-z,+y+1/2
+ 221 +x+1/2,-z,-y+1/2
+ 222 -y+1/2,+x,-z+1/2
+ 223 -z+1/2,-y,+x+1/2
+ 224 +y+1/2,-x,-z+1/2
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/2,-y,+z+1/2
+ -205 +z+1/2,-x,-y+1/2
+ -206 -y+1/2,+z,-x+1/2
+ -207 +z+1/2,-x,+y+1/2
+ -208 +y+1/2,+z,-x+1/2
+ -209 -y+1/2,+z,+x+1/2
+ -210 +x+1/2,-y,+z+1/2
+ -211 +z+1/2,+x,-y+1/2
+ -212 -x+1/2,+y,+z+1/2
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/2,-x,+z+1/2
+ -217 +z+1/2,-y,-x+1/2
+ -218 -x+1/2,+z,-y+1/2
+ -219 +z+1/2,-y,+x+1/2
+ -220 +x+1/2,+z,-y+1/2
+ -221 -x+1/2,+z,+y+1/2
+ -222 +y+1/2,-x,+z+1/2
+ -223 +z+1/2,+y,-x+1/2
+ -224 -y+1/2,+x,+z+1/2
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+1/2,+y+1/2,-z
+ 305 -z+1/2,+x+1/2,+y
+ 306 +y+1/2,-z+1/2,+x
+ 307 -z+1/2,+x+1/2,-y
+ 308 -y+1/2,-z+1/2,+x
+ 309 +y+1/2,-z+1/2,-x
+ 310 -x+1/2,+y+1/2,-z
+ 311 -z+1/2,-x+1/2,+y
+ 312 +x+1/2,-y+1/2,-z
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+1/2,+x+1/2,-z
+ 317 -z+1/2,+y+1/2,+x
+ 318 +x+1/2,-z+1/2,+y
+ 319 -z+1/2,+y+1/2,-x
+ 320 -x+1/2,-z+1/2,+y
+ 321 +x+1/2,-z+1/2,-y
+ 322 -y+1/2,+x+1/2,-z
+ 323 -z+1/2,-y+1/2,+x
+ 324 +y+1/2,-x+1/2,-z
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/2,-y+1/2,+z
+ -305 +z+1/2,-x+1/2,-y
+ -306 -y+1/2,+z+1/2,-x
+ -307 +z+1/2,-x+1/2,+y
+ -308 +y+1/2,+z+1/2,-x
+ -309 -y+1/2,+z+1/2,+x
+ -310 +x+1/2,-y+1/2,+z
+ -311 +z+1/2,+x+1/2,-y
+ -312 -x+1/2,+y+1/2,+z
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/2,-x+1/2,+z
+ -317 +z+1/2,-y+1/2,-x
+ -318 -x+1/2,+z+1/2,-y
+ -319 +z+1/2,-y+1/2,+x
+ -320 +x+1/2,+z+1/2,-y
+ -321 -x+1/2,+z+1/2,+y
+ -322 +y+1/2,-x+1/2,+z
+ -323 +z+1/2,+y+1/2,-x
+ -324 -y+1/2,+x+1/2,+z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -446,8 +446,8 @@ FE1 0.0 0.0 0.0 1.0 Uiso 0.025 4
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Fe 4.0
-
+ Fe 4.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Fe
_chemical_formula_weight 55.85
diff --git a/scripts/Engineering/ENGINX/phase_info/GRAPHITE_P63MC.cif b/scripts/Engineering/ENGINX/phase_info/GRAPHITE_P63MC.cif
index 2aebc954777795b94ecea8acecbf24d2ce78e68a..46f422aa95dd04bdf7b754685e7b370d199ce647 100644
--- a/scripts/Engineering/ENGINX/phase_info/GRAPHITE_P63MC.cif
+++ b/scripts/Engineering/ENGINX/phase_info/GRAPHITE_P63MC.cif
@@ -236,18 +236,18 @@ _cell_volume 35.8752
_symmetry_cell_setting hexagonal
_symmetry_space_group_name_H-M "P 63 m c"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 x-y,+x,+z+1/2
- 3 -y,x-y,+z
- 4 -x,-y,+z+1/2
- 5 y-x,-x,+z
- 6 +y,y-x,+z+1/2
- 7 y-x,+y,+z
- 8 -x,y-x,+z+1/2
- 9 -y,-x,+z
- 10 x-y,-y,+z+1/2
- 11 +x,x-y,+z
- 12 +y,+x,+z+1/2
+ 1 +x,+y,+z
+ 2 x-y,+x,+z+1/2
+ 3 -y,x-y,+z
+ 4 -x,-y,+z+1/2
+ 5 y-x,-x,+z
+ 6 +y,y-x,+z+1/2
+ 7 y-x,+y,+z
+ 8 -x,y-x,+z+1/2
+ 9 -y,-x,+z
+ 10 x-y,-y,+z+1/2
+ 11 +x,x-y,+z
+ 12 +y,+x,+z+1/2
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -262,15 +262,15 @@ loop_
_atom_site_thermal_displace_type
_atom_site_U_iso_or_equiv
_atom_site_symmetry_multiplicity
-C
+C
C1 0.0 0.0 0.0 1.0 Uiso 0.025 2
-C
+C
C2 0.3333 0.6667 0.005 1.0 Uiso 0.025 2
loop_ _atom_type_symbol
_atom_type_number_in_cell
- C 4.0
-
+ C 4.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum C
_chemical_formula_weight 12.01
diff --git a/scripts/Engineering/ENGINX/phase_info/LI_BETA.cif b/scripts/Engineering/ENGINX/phase_info/LI_BETA.cif
index 0b90df879c7058b16cdc62d7d25bddea87bff2f1..9e73b326402e5d828ba6a6d5b5597fd0e2c15ca9 100644
--- a/scripts/Engineering/ENGINX/phase_info/LI_BETA.cif
+++ b/scripts/Engineering/ENGINX/phase_info/LI_BETA.cif
@@ -235,198 +235,198 @@ _cell_volume 83.97014
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x,+y+1/2,-z+1/2
- 105 -z,+x+1/2,+y+1/2
- 106 +y,-z+1/2,+x+1/2
- 107 -z,+x+1/2,-y+1/2
- 108 -y,-z+1/2,+x+1/2
- 109 +y,-z+1/2,-x+1/2
- 110 -x,+y+1/2,-z+1/2
- 111 -z,-x+1/2,+y+1/2
- 112 +x,-y+1/2,-z+1/2
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y,+x+1/2,-z+1/2
- 117 -z,+y+1/2,+x+1/2
- 118 +x,-z+1/2,+y+1/2
- 119 -z,+y+1/2,-x+1/2
- 120 -x,-z+1/2,+y+1/2
- 121 +x,-z+1/2,-y+1/2
- 122 -y,+x+1/2,-z+1/2
- 123 -z,-y+1/2,+x+1/2
- 124 +y,-x+1/2,-z+1/2
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x,-y+1/2,+z+1/2
- -105 +z,-x+1/2,-y+1/2
- -106 -y,+z+1/2,-x+1/2
- -107 +z,-x+1/2,+y+1/2
- -108 +y,+z+1/2,-x+1/2
- -109 -y,+z+1/2,+x+1/2
- -110 +x,-y+1/2,+z+1/2
- -111 +z,+x+1/2,-y+1/2
- -112 -x,+y+1/2,+z+1/2
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y,-x+1/2,+z+1/2
- -117 +z,-y+1/2,-x+1/2
- -118 -x,+z+1/2,-y+1/2
- -119 +z,-y+1/2,+x+1/2
- -120 +x,+z+1/2,-y+1/2
- -121 -x,+z+1/2,+y+1/2
- -122 +y,-x+1/2,+z+1/2
- -123 +z,+y+1/2,-x+1/2
- -124 -y,+x+1/2,+z+1/2
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+1/2,+y,-z+1/2
- 205 -z+1/2,+x,+y+1/2
- 206 +y+1/2,-z,+x+1/2
- 207 -z+1/2,+x,-y+1/2
- 208 -y+1/2,-z,+x+1/2
- 209 +y+1/2,-z,-x+1/2
- 210 -x+1/2,+y,-z+1/2
- 211 -z+1/2,-x,+y+1/2
- 212 +x+1/2,-y,-z+1/2
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+1/2,+x,-z+1/2
- 217 -z+1/2,+y,+x+1/2
- 218 +x+1/2,-z,+y+1/2
- 219 -z+1/2,+y,-x+1/2
- 220 -x+1/2,-z,+y+1/2
- 221 +x+1/2,-z,-y+1/2
- 222 -y+1/2,+x,-z+1/2
- 223 -z+1/2,-y,+x+1/2
- 224 +y+1/2,-x,-z+1/2
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/2,-y,+z+1/2
- -205 +z+1/2,-x,-y+1/2
- -206 -y+1/2,+z,-x+1/2
- -207 +z+1/2,-x,+y+1/2
- -208 +y+1/2,+z,-x+1/2
- -209 -y+1/2,+z,+x+1/2
- -210 +x+1/2,-y,+z+1/2
- -211 +z+1/2,+x,-y+1/2
- -212 -x+1/2,+y,+z+1/2
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/2,-x,+z+1/2
- -217 +z+1/2,-y,-x+1/2
- -218 -x+1/2,+z,-y+1/2
- -219 +z+1/2,-y,+x+1/2
- -220 +x+1/2,+z,-y+1/2
- -221 -x+1/2,+z,+y+1/2
- -222 +y+1/2,-x,+z+1/2
- -223 +z+1/2,+y,-x+1/2
- -224 -y+1/2,+x,+z+1/2
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+1/2,+y+1/2,-z
- 305 -z+1/2,+x+1/2,+y
- 306 +y+1/2,-z+1/2,+x
- 307 -z+1/2,+x+1/2,-y
- 308 -y+1/2,-z+1/2,+x
- 309 +y+1/2,-z+1/2,-x
- 310 -x+1/2,+y+1/2,-z
- 311 -z+1/2,-x+1/2,+y
- 312 +x+1/2,-y+1/2,-z
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+1/2,+x+1/2,-z
- 317 -z+1/2,+y+1/2,+x
- 318 +x+1/2,-z+1/2,+y
- 319 -z+1/2,+y+1/2,-x
- 320 -x+1/2,-z+1/2,+y
- 321 +x+1/2,-z+1/2,-y
- 322 -y+1/2,+x+1/2,-z
- 323 -z+1/2,-y+1/2,+x
- 324 +y+1/2,-x+1/2,-z
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/2,-y+1/2,+z
- -305 +z+1/2,-x+1/2,-y
- -306 -y+1/2,+z+1/2,-x
- -307 +z+1/2,-x+1/2,+y
- -308 +y+1/2,+z+1/2,-x
- -309 -y+1/2,+z+1/2,+x
- -310 +x+1/2,-y+1/2,+z
- -311 +z+1/2,+x+1/2,-y
- -312 -x+1/2,+y+1/2,+z
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/2,-x+1/2,+z
- -317 +z+1/2,-y+1/2,-x
- -318 -x+1/2,+z+1/2,-y
- -319 +z+1/2,-y+1/2,+x
- -320 +x+1/2,+z+1/2,-y
- -321 -x+1/2,+z+1/2,+y
- -322 +y+1/2,-x+1/2,+z
- -323 +z+1/2,+y+1/2,-x
- -324 -y+1/2,+x+1/2,+z
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x,+y+1/2,-z+1/2
+ 105 -z,+x+1/2,+y+1/2
+ 106 +y,-z+1/2,+x+1/2
+ 107 -z,+x+1/2,-y+1/2
+ 108 -y,-z+1/2,+x+1/2
+ 109 +y,-z+1/2,-x+1/2
+ 110 -x,+y+1/2,-z+1/2
+ 111 -z,-x+1/2,+y+1/2
+ 112 +x,-y+1/2,-z+1/2
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y,+x+1/2,-z+1/2
+ 117 -z,+y+1/2,+x+1/2
+ 118 +x,-z+1/2,+y+1/2
+ 119 -z,+y+1/2,-x+1/2
+ 120 -x,-z+1/2,+y+1/2
+ 121 +x,-z+1/2,-y+1/2
+ 122 -y,+x+1/2,-z+1/2
+ 123 -z,-y+1/2,+x+1/2
+ 124 +y,-x+1/2,-z+1/2
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x,-y+1/2,+z+1/2
+ -105 +z,-x+1/2,-y+1/2
+ -106 -y,+z+1/2,-x+1/2
+ -107 +z,-x+1/2,+y+1/2
+ -108 +y,+z+1/2,-x+1/2
+ -109 -y,+z+1/2,+x+1/2
+ -110 +x,-y+1/2,+z+1/2
+ -111 +z,+x+1/2,-y+1/2
+ -112 -x,+y+1/2,+z+1/2
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y,-x+1/2,+z+1/2
+ -117 +z,-y+1/2,-x+1/2
+ -118 -x,+z+1/2,-y+1/2
+ -119 +z,-y+1/2,+x+1/2
+ -120 +x,+z+1/2,-y+1/2
+ -121 -x,+z+1/2,+y+1/2
+ -122 +y,-x+1/2,+z+1/2
+ -123 +z,+y+1/2,-x+1/2
+ -124 -y,+x+1/2,+z+1/2
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+1/2,+y,-z+1/2
+ 205 -z+1/2,+x,+y+1/2
+ 206 +y+1/2,-z,+x+1/2
+ 207 -z+1/2,+x,-y+1/2
+ 208 -y+1/2,-z,+x+1/2
+ 209 +y+1/2,-z,-x+1/2
+ 210 -x+1/2,+y,-z+1/2
+ 211 -z+1/2,-x,+y+1/2
+ 212 +x+1/2,-y,-z+1/2
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+1/2,+x,-z+1/2
+ 217 -z+1/2,+y,+x+1/2
+ 218 +x+1/2,-z,+y+1/2
+ 219 -z+1/2,+y,-x+1/2
+ 220 -x+1/2,-z,+y+1/2
+ 221 +x+1/2,-z,-y+1/2
+ 222 -y+1/2,+x,-z+1/2
+ 223 -z+1/2,-y,+x+1/2
+ 224 +y+1/2,-x,-z+1/2
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/2,-y,+z+1/2
+ -205 +z+1/2,-x,-y+1/2
+ -206 -y+1/2,+z,-x+1/2
+ -207 +z+1/2,-x,+y+1/2
+ -208 +y+1/2,+z,-x+1/2
+ -209 -y+1/2,+z,+x+1/2
+ -210 +x+1/2,-y,+z+1/2
+ -211 +z+1/2,+x,-y+1/2
+ -212 -x+1/2,+y,+z+1/2
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/2,-x,+z+1/2
+ -217 +z+1/2,-y,-x+1/2
+ -218 -x+1/2,+z,-y+1/2
+ -219 +z+1/2,-y,+x+1/2
+ -220 +x+1/2,+z,-y+1/2
+ -221 -x+1/2,+z,+y+1/2
+ -222 +y+1/2,-x,+z+1/2
+ -223 +z+1/2,+y,-x+1/2
+ -224 -y+1/2,+x,+z+1/2
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+1/2,+y+1/2,-z
+ 305 -z+1/2,+x+1/2,+y
+ 306 +y+1/2,-z+1/2,+x
+ 307 -z+1/2,+x+1/2,-y
+ 308 -y+1/2,-z+1/2,+x
+ 309 +y+1/2,-z+1/2,-x
+ 310 -x+1/2,+y+1/2,-z
+ 311 -z+1/2,-x+1/2,+y
+ 312 +x+1/2,-y+1/2,-z
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+1/2,+x+1/2,-z
+ 317 -z+1/2,+y+1/2,+x
+ 318 +x+1/2,-z+1/2,+y
+ 319 -z+1/2,+y+1/2,-x
+ 320 -x+1/2,-z+1/2,+y
+ 321 +x+1/2,-z+1/2,-y
+ 322 -y+1/2,+x+1/2,-z
+ 323 -z+1/2,-y+1/2,+x
+ 324 +y+1/2,-x+1/2,-z
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/2,-y+1/2,+z
+ -305 +z+1/2,-x+1/2,-y
+ -306 -y+1/2,+z+1/2,-x
+ -307 +z+1/2,-x+1/2,+y
+ -308 +y+1/2,+z+1/2,-x
+ -309 -y+1/2,+z+1/2,+x
+ -310 +x+1/2,-y+1/2,+z
+ -311 +z+1/2,+x+1/2,-y
+ -312 -x+1/2,+y+1/2,+z
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/2,-x+1/2,+z
+ -317 +z+1/2,-y+1/2,-x
+ -318 -x+1/2,+z+1/2,-y
+ -319 +z+1/2,-y+1/2,+x
+ -320 +x+1/2,+z+1/2,-y
+ -321 -x+1/2,+z+1/2,+y
+ -322 +y+1/2,-x+1/2,+z
+ -323 +z+1/2,+y+1/2,-x
+ -324 -y+1/2,+x+1/2,+z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -446,8 +446,8 @@ LI1 0.0 0.0 0.0 1.0 Uiso 0.025 4
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Li 4.0
-
+ Li 4.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Li
_chemical_formula_weight 6.94
diff --git a/scripts/Engineering/ENGINX/phase_info/MO.cif b/scripts/Engineering/ENGINX/phase_info/MO.cif
index 41308cd55c33da62546f511bc0e0077e9b6047e1..941665861b473bd08d1061545473c7f603f0d022 100644
--- a/scripts/Engineering/ENGINX/phase_info/MO.cif
+++ b/scripts/Engineering/ENGINX/phase_info/MO.cif
@@ -235,102 +235,102 @@ _cell_volume 31.21719
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "I m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x+1/2,+y+1/2,+z+1/2
- 102 +z+1/2,+x+1/2,+y+1/2
- 103 +y+1/2,+z+1/2,+x+1/2
- 104 +x+1/2,+y+1/2,-z+1/2
- 105 -z+1/2,+x+1/2,+y+1/2
- 106 +y+1/2,-z+1/2,+x+1/2
- 107 -z+1/2,+x+1/2,-y+1/2
- 108 -y+1/2,-z+1/2,+x+1/2
- 109 +y+1/2,-z+1/2,-x+1/2
- 110 -x+1/2,+y+1/2,-z+1/2
- 111 -z+1/2,-x+1/2,+y+1/2
- 112 +x+1/2,-y+1/2,-z+1/2
- 113 +y+1/2,+x+1/2,+z+1/2
- 114 +z+1/2,+y+1/2,+x+1/2
- 115 +x+1/2,+z+1/2,+y+1/2
- 116 +y+1/2,+x+1/2,-z+1/2
- 117 -z+1/2,+y+1/2,+x+1/2
- 118 +x+1/2,-z+1/2,+y+1/2
- 119 -z+1/2,+y+1/2,-x+1/2
- 120 -x+1/2,-z+1/2,+y+1/2
- 121 +x+1/2,-z+1/2,-y+1/2
- 122 -y+1/2,+x+1/2,-z+1/2
- 123 -z+1/2,-y+1/2,+x+1/2
- 124 +y+1/2,-x+1/2,-z+1/2
- -101 -x+1/2,-y+1/2,-z+1/2
- -102 -z+1/2,-x+1/2,-y+1/2
- -103 -y+1/2,-z+1/2,-x+1/2
- -104 -x+1/2,-y+1/2,+z+1/2
- -105 +z+1/2,-x+1/2,-y+1/2
- -106 -y+1/2,+z+1/2,-x+1/2
- -107 +z+1/2,-x+1/2,+y+1/2
- -108 +y+1/2,+z+1/2,-x+1/2
- -109 -y+1/2,+z+1/2,+x+1/2
- -110 +x+1/2,-y+1/2,+z+1/2
- -111 +z+1/2,+x+1/2,-y+1/2
- -112 -x+1/2,+y+1/2,+z+1/2
- -113 -y+1/2,-x+1/2,-z+1/2
- -114 -z+1/2,-y+1/2,-x+1/2
- -115 -x+1/2,-z+1/2,-y+1/2
- -116 -y+1/2,-x+1/2,+z+1/2
- -117 +z+1/2,-y+1/2,-x+1/2
- -118 -x+1/2,+z+1/2,-y+1/2
- -119 +z+1/2,-y+1/2,+x+1/2
- -120 +x+1/2,+z+1/2,-y+1/2
- -121 -x+1/2,+z+1/2,+y+1/2
- -122 +y+1/2,-x+1/2,+z+1/2
- -123 +z+1/2,+y+1/2,-x+1/2
- -124 -y+1/2,+x+1/2,+z+1/2
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x+1/2,+y+1/2,+z+1/2
+ 102 +z+1/2,+x+1/2,+y+1/2
+ 103 +y+1/2,+z+1/2,+x+1/2
+ 104 +x+1/2,+y+1/2,-z+1/2
+ 105 -z+1/2,+x+1/2,+y+1/2
+ 106 +y+1/2,-z+1/2,+x+1/2
+ 107 -z+1/2,+x+1/2,-y+1/2
+ 108 -y+1/2,-z+1/2,+x+1/2
+ 109 +y+1/2,-z+1/2,-x+1/2
+ 110 -x+1/2,+y+1/2,-z+1/2
+ 111 -z+1/2,-x+1/2,+y+1/2
+ 112 +x+1/2,-y+1/2,-z+1/2
+ 113 +y+1/2,+x+1/2,+z+1/2
+ 114 +z+1/2,+y+1/2,+x+1/2
+ 115 +x+1/2,+z+1/2,+y+1/2
+ 116 +y+1/2,+x+1/2,-z+1/2
+ 117 -z+1/2,+y+1/2,+x+1/2
+ 118 +x+1/2,-z+1/2,+y+1/2
+ 119 -z+1/2,+y+1/2,-x+1/2
+ 120 -x+1/2,-z+1/2,+y+1/2
+ 121 +x+1/2,-z+1/2,-y+1/2
+ 122 -y+1/2,+x+1/2,-z+1/2
+ 123 -z+1/2,-y+1/2,+x+1/2
+ 124 +y+1/2,-x+1/2,-z+1/2
+ -101 -x+1/2,-y+1/2,-z+1/2
+ -102 -z+1/2,-x+1/2,-y+1/2
+ -103 -y+1/2,-z+1/2,-x+1/2
+ -104 -x+1/2,-y+1/2,+z+1/2
+ -105 +z+1/2,-x+1/2,-y+1/2
+ -106 -y+1/2,+z+1/2,-x+1/2
+ -107 +z+1/2,-x+1/2,+y+1/2
+ -108 +y+1/2,+z+1/2,-x+1/2
+ -109 -y+1/2,+z+1/2,+x+1/2
+ -110 +x+1/2,-y+1/2,+z+1/2
+ -111 +z+1/2,+x+1/2,-y+1/2
+ -112 -x+1/2,+y+1/2,+z+1/2
+ -113 -y+1/2,-x+1/2,-z+1/2
+ -114 -z+1/2,-y+1/2,-x+1/2
+ -115 -x+1/2,-z+1/2,-y+1/2
+ -116 -y+1/2,-x+1/2,+z+1/2
+ -117 +z+1/2,-y+1/2,-x+1/2
+ -118 -x+1/2,+z+1/2,-y+1/2
+ -119 +z+1/2,-y+1/2,+x+1/2
+ -120 +x+1/2,+z+1/2,-y+1/2
+ -121 -x+1/2,+z+1/2,+y+1/2
+ -122 +y+1/2,-x+1/2,+z+1/2
+ -123 +z+1/2,+y+1/2,-x+1/2
+ -124 -y+1/2,+x+1/2,+z+1/2
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -350,8 +350,8 @@ MO1 0.0 0.0 0.0 1.0 Uiso 0.025 2
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Mo 2.0
-
+ Mo 2.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Mo
_chemical_formula_weight 95.94
diff --git a/scripts/Engineering/ENGINX/phase_info/NB.cif b/scripts/Engineering/ENGINX/phase_info/NB.cif
index d4cb7b148b91ee954b44a3e7106a66c4c4613c0b..353eee3642637bdc99b845c6d961b4b43d408145 100644
--- a/scripts/Engineering/ENGINX/phase_info/NB.cif
+++ b/scripts/Engineering/ENGINX/phase_info/NB.cif
@@ -235,102 +235,102 @@ _cell_volume 35.89128
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "I m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x+1/2,+y+1/2,+z+1/2
- 102 +z+1/2,+x+1/2,+y+1/2
- 103 +y+1/2,+z+1/2,+x+1/2
- 104 +x+1/2,+y+1/2,-z+1/2
- 105 -z+1/2,+x+1/2,+y+1/2
- 106 +y+1/2,-z+1/2,+x+1/2
- 107 -z+1/2,+x+1/2,-y+1/2
- 108 -y+1/2,-z+1/2,+x+1/2
- 109 +y+1/2,-z+1/2,-x+1/2
- 110 -x+1/2,+y+1/2,-z+1/2
- 111 -z+1/2,-x+1/2,+y+1/2
- 112 +x+1/2,-y+1/2,-z+1/2
- 113 +y+1/2,+x+1/2,+z+1/2
- 114 +z+1/2,+y+1/2,+x+1/2
- 115 +x+1/2,+z+1/2,+y+1/2
- 116 +y+1/2,+x+1/2,-z+1/2
- 117 -z+1/2,+y+1/2,+x+1/2
- 118 +x+1/2,-z+1/2,+y+1/2
- 119 -z+1/2,+y+1/2,-x+1/2
- 120 -x+1/2,-z+1/2,+y+1/2
- 121 +x+1/2,-z+1/2,-y+1/2
- 122 -y+1/2,+x+1/2,-z+1/2
- 123 -z+1/2,-y+1/2,+x+1/2
- 124 +y+1/2,-x+1/2,-z+1/2
- -101 -x+1/2,-y+1/2,-z+1/2
- -102 -z+1/2,-x+1/2,-y+1/2
- -103 -y+1/2,-z+1/2,-x+1/2
- -104 -x+1/2,-y+1/2,+z+1/2
- -105 +z+1/2,-x+1/2,-y+1/2
- -106 -y+1/2,+z+1/2,-x+1/2
- -107 +z+1/2,-x+1/2,+y+1/2
- -108 +y+1/2,+z+1/2,-x+1/2
- -109 -y+1/2,+z+1/2,+x+1/2
- -110 +x+1/2,-y+1/2,+z+1/2
- -111 +z+1/2,+x+1/2,-y+1/2
- -112 -x+1/2,+y+1/2,+z+1/2
- -113 -y+1/2,-x+1/2,-z+1/2
- -114 -z+1/2,-y+1/2,-x+1/2
- -115 -x+1/2,-z+1/2,-y+1/2
- -116 -y+1/2,-x+1/2,+z+1/2
- -117 +z+1/2,-y+1/2,-x+1/2
- -118 -x+1/2,+z+1/2,-y+1/2
- -119 +z+1/2,-y+1/2,+x+1/2
- -120 +x+1/2,+z+1/2,-y+1/2
- -121 -x+1/2,+z+1/2,+y+1/2
- -122 +y+1/2,-x+1/2,+z+1/2
- -123 +z+1/2,+y+1/2,-x+1/2
- -124 -y+1/2,+x+1/2,+z+1/2
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x+1/2,+y+1/2,+z+1/2
+ 102 +z+1/2,+x+1/2,+y+1/2
+ 103 +y+1/2,+z+1/2,+x+1/2
+ 104 +x+1/2,+y+1/2,-z+1/2
+ 105 -z+1/2,+x+1/2,+y+1/2
+ 106 +y+1/2,-z+1/2,+x+1/2
+ 107 -z+1/2,+x+1/2,-y+1/2
+ 108 -y+1/2,-z+1/2,+x+1/2
+ 109 +y+1/2,-z+1/2,-x+1/2
+ 110 -x+1/2,+y+1/2,-z+1/2
+ 111 -z+1/2,-x+1/2,+y+1/2
+ 112 +x+1/2,-y+1/2,-z+1/2
+ 113 +y+1/2,+x+1/2,+z+1/2
+ 114 +z+1/2,+y+1/2,+x+1/2
+ 115 +x+1/2,+z+1/2,+y+1/2
+ 116 +y+1/2,+x+1/2,-z+1/2
+ 117 -z+1/2,+y+1/2,+x+1/2
+ 118 +x+1/2,-z+1/2,+y+1/2
+ 119 -z+1/2,+y+1/2,-x+1/2
+ 120 -x+1/2,-z+1/2,+y+1/2
+ 121 +x+1/2,-z+1/2,-y+1/2
+ 122 -y+1/2,+x+1/2,-z+1/2
+ 123 -z+1/2,-y+1/2,+x+1/2
+ 124 +y+1/2,-x+1/2,-z+1/2
+ -101 -x+1/2,-y+1/2,-z+1/2
+ -102 -z+1/2,-x+1/2,-y+1/2
+ -103 -y+1/2,-z+1/2,-x+1/2
+ -104 -x+1/2,-y+1/2,+z+1/2
+ -105 +z+1/2,-x+1/2,-y+1/2
+ -106 -y+1/2,+z+1/2,-x+1/2
+ -107 +z+1/2,-x+1/2,+y+1/2
+ -108 +y+1/2,+z+1/2,-x+1/2
+ -109 -y+1/2,+z+1/2,+x+1/2
+ -110 +x+1/2,-y+1/2,+z+1/2
+ -111 +z+1/2,+x+1/2,-y+1/2
+ -112 -x+1/2,+y+1/2,+z+1/2
+ -113 -y+1/2,-x+1/2,-z+1/2
+ -114 -z+1/2,-y+1/2,-x+1/2
+ -115 -x+1/2,-z+1/2,-y+1/2
+ -116 -y+1/2,-x+1/2,+z+1/2
+ -117 +z+1/2,-y+1/2,-x+1/2
+ -118 -x+1/2,+z+1/2,-y+1/2
+ -119 +z+1/2,-y+1/2,+x+1/2
+ -120 +x+1/2,+z+1/2,-y+1/2
+ -121 -x+1/2,+z+1/2,+y+1/2
+ -122 +y+1/2,-x+1/2,+z+1/2
+ -123 +z+1/2,+y+1/2,-x+1/2
+ -124 -y+1/2,+x+1/2,+z+1/2
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -350,8 +350,8 @@ NB1 0.0 0.0 0.0 1.0 Uiso 0.025 2
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Nb 2.0
-
+ Nb 2.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Nb
_chemical_formula_weight 92.91
diff --git a/scripts/Engineering/ENGINX/phase_info/NI.cif b/scripts/Engineering/ENGINX/phase_info/NI.cif
index b0abd26cb582ef5c9c89e0b80f1b7f99be6e3199..330c81de056a87dc8ce70a09000743b613a86955 100644
--- a/scripts/Engineering/ENGINX/phase_info/NI.cif
+++ b/scripts/Engineering/ENGINX/phase_info/NI.cif
@@ -235,198 +235,198 @@ _cell_volume 43.71092
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x,+y+1/2,-z+1/2
- 105 -z,+x+1/2,+y+1/2
- 106 +y,-z+1/2,+x+1/2
- 107 -z,+x+1/2,-y+1/2
- 108 -y,-z+1/2,+x+1/2
- 109 +y,-z+1/2,-x+1/2
- 110 -x,+y+1/2,-z+1/2
- 111 -z,-x+1/2,+y+1/2
- 112 +x,-y+1/2,-z+1/2
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y,+x+1/2,-z+1/2
- 117 -z,+y+1/2,+x+1/2
- 118 +x,-z+1/2,+y+1/2
- 119 -z,+y+1/2,-x+1/2
- 120 -x,-z+1/2,+y+1/2
- 121 +x,-z+1/2,-y+1/2
- 122 -y,+x+1/2,-z+1/2
- 123 -z,-y+1/2,+x+1/2
- 124 +y,-x+1/2,-z+1/2
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x,-y+1/2,+z+1/2
- -105 +z,-x+1/2,-y+1/2
- -106 -y,+z+1/2,-x+1/2
- -107 +z,-x+1/2,+y+1/2
- -108 +y,+z+1/2,-x+1/2
- -109 -y,+z+1/2,+x+1/2
- -110 +x,-y+1/2,+z+1/2
- -111 +z,+x+1/2,-y+1/2
- -112 -x,+y+1/2,+z+1/2
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y,-x+1/2,+z+1/2
- -117 +z,-y+1/2,-x+1/2
- -118 -x,+z+1/2,-y+1/2
- -119 +z,-y+1/2,+x+1/2
- -120 +x,+z+1/2,-y+1/2
- -121 -x,+z+1/2,+y+1/2
- -122 +y,-x+1/2,+z+1/2
- -123 +z,+y+1/2,-x+1/2
- -124 -y,+x+1/2,+z+1/2
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+1/2,+y,-z+1/2
- 205 -z+1/2,+x,+y+1/2
- 206 +y+1/2,-z,+x+1/2
- 207 -z+1/2,+x,-y+1/2
- 208 -y+1/2,-z,+x+1/2
- 209 +y+1/2,-z,-x+1/2
- 210 -x+1/2,+y,-z+1/2
- 211 -z+1/2,-x,+y+1/2
- 212 +x+1/2,-y,-z+1/2
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+1/2,+x,-z+1/2
- 217 -z+1/2,+y,+x+1/2
- 218 +x+1/2,-z,+y+1/2
- 219 -z+1/2,+y,-x+1/2
- 220 -x+1/2,-z,+y+1/2
- 221 +x+1/2,-z,-y+1/2
- 222 -y+1/2,+x,-z+1/2
- 223 -z+1/2,-y,+x+1/2
- 224 +y+1/2,-x,-z+1/2
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/2,-y,+z+1/2
- -205 +z+1/2,-x,-y+1/2
- -206 -y+1/2,+z,-x+1/2
- -207 +z+1/2,-x,+y+1/2
- -208 +y+1/2,+z,-x+1/2
- -209 -y+1/2,+z,+x+1/2
- -210 +x+1/2,-y,+z+1/2
- -211 +z+1/2,+x,-y+1/2
- -212 -x+1/2,+y,+z+1/2
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/2,-x,+z+1/2
- -217 +z+1/2,-y,-x+1/2
- -218 -x+1/2,+z,-y+1/2
- -219 +z+1/2,-y,+x+1/2
- -220 +x+1/2,+z,-y+1/2
- -221 -x+1/2,+z,+y+1/2
- -222 +y+1/2,-x,+z+1/2
- -223 +z+1/2,+y,-x+1/2
- -224 -y+1/2,+x,+z+1/2
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+1/2,+y+1/2,-z
- 305 -z+1/2,+x+1/2,+y
- 306 +y+1/2,-z+1/2,+x
- 307 -z+1/2,+x+1/2,-y
- 308 -y+1/2,-z+1/2,+x
- 309 +y+1/2,-z+1/2,-x
- 310 -x+1/2,+y+1/2,-z
- 311 -z+1/2,-x+1/2,+y
- 312 +x+1/2,-y+1/2,-z
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+1/2,+x+1/2,-z
- 317 -z+1/2,+y+1/2,+x
- 318 +x+1/2,-z+1/2,+y
- 319 -z+1/2,+y+1/2,-x
- 320 -x+1/2,-z+1/2,+y
- 321 +x+1/2,-z+1/2,-y
- 322 -y+1/2,+x+1/2,-z
- 323 -z+1/2,-y+1/2,+x
- 324 +y+1/2,-x+1/2,-z
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/2,-y+1/2,+z
- -305 +z+1/2,-x+1/2,-y
- -306 -y+1/2,+z+1/2,-x
- -307 +z+1/2,-x+1/2,+y
- -308 +y+1/2,+z+1/2,-x
- -309 -y+1/2,+z+1/2,+x
- -310 +x+1/2,-y+1/2,+z
- -311 +z+1/2,+x+1/2,-y
- -312 -x+1/2,+y+1/2,+z
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/2,-x+1/2,+z
- -317 +z+1/2,-y+1/2,-x
- -318 -x+1/2,+z+1/2,-y
- -319 +z+1/2,-y+1/2,+x
- -320 +x+1/2,+z+1/2,-y
- -321 -x+1/2,+z+1/2,+y
- -322 +y+1/2,-x+1/2,+z
- -323 +z+1/2,+y+1/2,-x
- -324 -y+1/2,+x+1/2,+z
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x,+y+1/2,-z+1/2
+ 105 -z,+x+1/2,+y+1/2
+ 106 +y,-z+1/2,+x+1/2
+ 107 -z,+x+1/2,-y+1/2
+ 108 -y,-z+1/2,+x+1/2
+ 109 +y,-z+1/2,-x+1/2
+ 110 -x,+y+1/2,-z+1/2
+ 111 -z,-x+1/2,+y+1/2
+ 112 +x,-y+1/2,-z+1/2
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y,+x+1/2,-z+1/2
+ 117 -z,+y+1/2,+x+1/2
+ 118 +x,-z+1/2,+y+1/2
+ 119 -z,+y+1/2,-x+1/2
+ 120 -x,-z+1/2,+y+1/2
+ 121 +x,-z+1/2,-y+1/2
+ 122 -y,+x+1/2,-z+1/2
+ 123 -z,-y+1/2,+x+1/2
+ 124 +y,-x+1/2,-z+1/2
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x,-y+1/2,+z+1/2
+ -105 +z,-x+1/2,-y+1/2
+ -106 -y,+z+1/2,-x+1/2
+ -107 +z,-x+1/2,+y+1/2
+ -108 +y,+z+1/2,-x+1/2
+ -109 -y,+z+1/2,+x+1/2
+ -110 +x,-y+1/2,+z+1/2
+ -111 +z,+x+1/2,-y+1/2
+ -112 -x,+y+1/2,+z+1/2
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y,-x+1/2,+z+1/2
+ -117 +z,-y+1/2,-x+1/2
+ -118 -x,+z+1/2,-y+1/2
+ -119 +z,-y+1/2,+x+1/2
+ -120 +x,+z+1/2,-y+1/2
+ -121 -x,+z+1/2,+y+1/2
+ -122 +y,-x+1/2,+z+1/2
+ -123 +z,+y+1/2,-x+1/2
+ -124 -y,+x+1/2,+z+1/2
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+1/2,+y,-z+1/2
+ 205 -z+1/2,+x,+y+1/2
+ 206 +y+1/2,-z,+x+1/2
+ 207 -z+1/2,+x,-y+1/2
+ 208 -y+1/2,-z,+x+1/2
+ 209 +y+1/2,-z,-x+1/2
+ 210 -x+1/2,+y,-z+1/2
+ 211 -z+1/2,-x,+y+1/2
+ 212 +x+1/2,-y,-z+1/2
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+1/2,+x,-z+1/2
+ 217 -z+1/2,+y,+x+1/2
+ 218 +x+1/2,-z,+y+1/2
+ 219 -z+1/2,+y,-x+1/2
+ 220 -x+1/2,-z,+y+1/2
+ 221 +x+1/2,-z,-y+1/2
+ 222 -y+1/2,+x,-z+1/2
+ 223 -z+1/2,-y,+x+1/2
+ 224 +y+1/2,-x,-z+1/2
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/2,-y,+z+1/2
+ -205 +z+1/2,-x,-y+1/2
+ -206 -y+1/2,+z,-x+1/2
+ -207 +z+1/2,-x,+y+1/2
+ -208 +y+1/2,+z,-x+1/2
+ -209 -y+1/2,+z,+x+1/2
+ -210 +x+1/2,-y,+z+1/2
+ -211 +z+1/2,+x,-y+1/2
+ -212 -x+1/2,+y,+z+1/2
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/2,-x,+z+1/2
+ -217 +z+1/2,-y,-x+1/2
+ -218 -x+1/2,+z,-y+1/2
+ -219 +z+1/2,-y,+x+1/2
+ -220 +x+1/2,+z,-y+1/2
+ -221 -x+1/2,+z,+y+1/2
+ -222 +y+1/2,-x,+z+1/2
+ -223 +z+1/2,+y,-x+1/2
+ -224 -y+1/2,+x,+z+1/2
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+1/2,+y+1/2,-z
+ 305 -z+1/2,+x+1/2,+y
+ 306 +y+1/2,-z+1/2,+x
+ 307 -z+1/2,+x+1/2,-y
+ 308 -y+1/2,-z+1/2,+x
+ 309 +y+1/2,-z+1/2,-x
+ 310 -x+1/2,+y+1/2,-z
+ 311 -z+1/2,-x+1/2,+y
+ 312 +x+1/2,-y+1/2,-z
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+1/2,+x+1/2,-z
+ 317 -z+1/2,+y+1/2,+x
+ 318 +x+1/2,-z+1/2,+y
+ 319 -z+1/2,+y+1/2,-x
+ 320 -x+1/2,-z+1/2,+y
+ 321 +x+1/2,-z+1/2,-y
+ 322 -y+1/2,+x+1/2,-z
+ 323 -z+1/2,-y+1/2,+x
+ 324 +y+1/2,-x+1/2,-z
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/2,-y+1/2,+z
+ -305 +z+1/2,-x+1/2,-y
+ -306 -y+1/2,+z+1/2,-x
+ -307 +z+1/2,-x+1/2,+y
+ -308 +y+1/2,+z+1/2,-x
+ -309 -y+1/2,+z+1/2,+x
+ -310 +x+1/2,-y+1/2,+z
+ -311 +z+1/2,+x+1/2,-y
+ -312 -x+1/2,+y+1/2,+z
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/2,-x+1/2,+z
+ -317 +z+1/2,-y+1/2,-x
+ -318 -x+1/2,+z+1/2,-y
+ -319 +z+1/2,-y+1/2,+x
+ -320 +x+1/2,+z+1/2,-y
+ -321 -x+1/2,+z+1/2,+y
+ -322 +y+1/2,-x+1/2,+z
+ -323 +z+1/2,+y+1/2,-x
+ -324 -y+1/2,+x+1/2,+z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -446,8 +446,8 @@ NI1 0.0 0.0 0.0 1.0 Uiso 0.025 4
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Ni 4.0
-
+ Ni 4.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Ni
_chemical_formula_weight 58.71
diff --git a/scripts/Engineering/ENGINX/phase_info/NI_GAMMA.cif b/scripts/Engineering/ENGINX/phase_info/NI_GAMMA.cif
index 8a760ab4d45804f70824804264c1c969b7e9bd3d..3aab10d61541f7a674473564dd46a314705d9548 100644
--- a/scripts/Engineering/ENGINX/phase_info/NI_GAMMA.cif
+++ b/scripts/Engineering/ENGINX/phase_info/NI_GAMMA.cif
@@ -235,198 +235,198 @@ _cell_volume 45.88271
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x,+y+1/2,-z+1/2
- 105 -z,+x+1/2,+y+1/2
- 106 +y,-z+1/2,+x+1/2
- 107 -z,+x+1/2,-y+1/2
- 108 -y,-z+1/2,+x+1/2
- 109 +y,-z+1/2,-x+1/2
- 110 -x,+y+1/2,-z+1/2
- 111 -z,-x+1/2,+y+1/2
- 112 +x,-y+1/2,-z+1/2
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y,+x+1/2,-z+1/2
- 117 -z,+y+1/2,+x+1/2
- 118 +x,-z+1/2,+y+1/2
- 119 -z,+y+1/2,-x+1/2
- 120 -x,-z+1/2,+y+1/2
- 121 +x,-z+1/2,-y+1/2
- 122 -y,+x+1/2,-z+1/2
- 123 -z,-y+1/2,+x+1/2
- 124 +y,-x+1/2,-z+1/2
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x,-y+1/2,+z+1/2
- -105 +z,-x+1/2,-y+1/2
- -106 -y,+z+1/2,-x+1/2
- -107 +z,-x+1/2,+y+1/2
- -108 +y,+z+1/2,-x+1/2
- -109 -y,+z+1/2,+x+1/2
- -110 +x,-y+1/2,+z+1/2
- -111 +z,+x+1/2,-y+1/2
- -112 -x,+y+1/2,+z+1/2
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y,-x+1/2,+z+1/2
- -117 +z,-y+1/2,-x+1/2
- -118 -x,+z+1/2,-y+1/2
- -119 +z,-y+1/2,+x+1/2
- -120 +x,+z+1/2,-y+1/2
- -121 -x,+z+1/2,+y+1/2
- -122 +y,-x+1/2,+z+1/2
- -123 +z,+y+1/2,-x+1/2
- -124 -y,+x+1/2,+z+1/2
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+1/2,+y,-z+1/2
- 205 -z+1/2,+x,+y+1/2
- 206 +y+1/2,-z,+x+1/2
- 207 -z+1/2,+x,-y+1/2
- 208 -y+1/2,-z,+x+1/2
- 209 +y+1/2,-z,-x+1/2
- 210 -x+1/2,+y,-z+1/2
- 211 -z+1/2,-x,+y+1/2
- 212 +x+1/2,-y,-z+1/2
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+1/2,+x,-z+1/2
- 217 -z+1/2,+y,+x+1/2
- 218 +x+1/2,-z,+y+1/2
- 219 -z+1/2,+y,-x+1/2
- 220 -x+1/2,-z,+y+1/2
- 221 +x+1/2,-z,-y+1/2
- 222 -y+1/2,+x,-z+1/2
- 223 -z+1/2,-y,+x+1/2
- 224 +y+1/2,-x,-z+1/2
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/2,-y,+z+1/2
- -205 +z+1/2,-x,-y+1/2
- -206 -y+1/2,+z,-x+1/2
- -207 +z+1/2,-x,+y+1/2
- -208 +y+1/2,+z,-x+1/2
- -209 -y+1/2,+z,+x+1/2
- -210 +x+1/2,-y,+z+1/2
- -211 +z+1/2,+x,-y+1/2
- -212 -x+1/2,+y,+z+1/2
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/2,-x,+z+1/2
- -217 +z+1/2,-y,-x+1/2
- -218 -x+1/2,+z,-y+1/2
- -219 +z+1/2,-y,+x+1/2
- -220 +x+1/2,+z,-y+1/2
- -221 -x+1/2,+z,+y+1/2
- -222 +y+1/2,-x,+z+1/2
- -223 +z+1/2,+y,-x+1/2
- -224 -y+1/2,+x,+z+1/2
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+1/2,+y+1/2,-z
- 305 -z+1/2,+x+1/2,+y
- 306 +y+1/2,-z+1/2,+x
- 307 -z+1/2,+x+1/2,-y
- 308 -y+1/2,-z+1/2,+x
- 309 +y+1/2,-z+1/2,-x
- 310 -x+1/2,+y+1/2,-z
- 311 -z+1/2,-x+1/2,+y
- 312 +x+1/2,-y+1/2,-z
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+1/2,+x+1/2,-z
- 317 -z+1/2,+y+1/2,+x
- 318 +x+1/2,-z+1/2,+y
- 319 -z+1/2,+y+1/2,-x
- 320 -x+1/2,-z+1/2,+y
- 321 +x+1/2,-z+1/2,-y
- 322 -y+1/2,+x+1/2,-z
- 323 -z+1/2,-y+1/2,+x
- 324 +y+1/2,-x+1/2,-z
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/2,-y+1/2,+z
- -305 +z+1/2,-x+1/2,-y
- -306 -y+1/2,+z+1/2,-x
- -307 +z+1/2,-x+1/2,+y
- -308 +y+1/2,+z+1/2,-x
- -309 -y+1/2,+z+1/2,+x
- -310 +x+1/2,-y+1/2,+z
- -311 +z+1/2,+x+1/2,-y
- -312 -x+1/2,+y+1/2,+z
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/2,-x+1/2,+z
- -317 +z+1/2,-y+1/2,-x
- -318 -x+1/2,+z+1/2,-y
- -319 +z+1/2,-y+1/2,+x
- -320 +x+1/2,+z+1/2,-y
- -321 -x+1/2,+z+1/2,+y
- -322 +y+1/2,-x+1/2,+z
- -323 +z+1/2,+y+1/2,-x
- -324 -y+1/2,+x+1/2,+z
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x,+y+1/2,-z+1/2
+ 105 -z,+x+1/2,+y+1/2
+ 106 +y,-z+1/2,+x+1/2
+ 107 -z,+x+1/2,-y+1/2
+ 108 -y,-z+1/2,+x+1/2
+ 109 +y,-z+1/2,-x+1/2
+ 110 -x,+y+1/2,-z+1/2
+ 111 -z,-x+1/2,+y+1/2
+ 112 +x,-y+1/2,-z+1/2
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y,+x+1/2,-z+1/2
+ 117 -z,+y+1/2,+x+1/2
+ 118 +x,-z+1/2,+y+1/2
+ 119 -z,+y+1/2,-x+1/2
+ 120 -x,-z+1/2,+y+1/2
+ 121 +x,-z+1/2,-y+1/2
+ 122 -y,+x+1/2,-z+1/2
+ 123 -z,-y+1/2,+x+1/2
+ 124 +y,-x+1/2,-z+1/2
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x,-y+1/2,+z+1/2
+ -105 +z,-x+1/2,-y+1/2
+ -106 -y,+z+1/2,-x+1/2
+ -107 +z,-x+1/2,+y+1/2
+ -108 +y,+z+1/2,-x+1/2
+ -109 -y,+z+1/2,+x+1/2
+ -110 +x,-y+1/2,+z+1/2
+ -111 +z,+x+1/2,-y+1/2
+ -112 -x,+y+1/2,+z+1/2
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y,-x+1/2,+z+1/2
+ -117 +z,-y+1/2,-x+1/2
+ -118 -x,+z+1/2,-y+1/2
+ -119 +z,-y+1/2,+x+1/2
+ -120 +x,+z+1/2,-y+1/2
+ -121 -x,+z+1/2,+y+1/2
+ -122 +y,-x+1/2,+z+1/2
+ -123 +z,+y+1/2,-x+1/2
+ -124 -y,+x+1/2,+z+1/2
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+1/2,+y,-z+1/2
+ 205 -z+1/2,+x,+y+1/2
+ 206 +y+1/2,-z,+x+1/2
+ 207 -z+1/2,+x,-y+1/2
+ 208 -y+1/2,-z,+x+1/2
+ 209 +y+1/2,-z,-x+1/2
+ 210 -x+1/2,+y,-z+1/2
+ 211 -z+1/2,-x,+y+1/2
+ 212 +x+1/2,-y,-z+1/2
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+1/2,+x,-z+1/2
+ 217 -z+1/2,+y,+x+1/2
+ 218 +x+1/2,-z,+y+1/2
+ 219 -z+1/2,+y,-x+1/2
+ 220 -x+1/2,-z,+y+1/2
+ 221 +x+1/2,-z,-y+1/2
+ 222 -y+1/2,+x,-z+1/2
+ 223 -z+1/2,-y,+x+1/2
+ 224 +y+1/2,-x,-z+1/2
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/2,-y,+z+1/2
+ -205 +z+1/2,-x,-y+1/2
+ -206 -y+1/2,+z,-x+1/2
+ -207 +z+1/2,-x,+y+1/2
+ -208 +y+1/2,+z,-x+1/2
+ -209 -y+1/2,+z,+x+1/2
+ -210 +x+1/2,-y,+z+1/2
+ -211 +z+1/2,+x,-y+1/2
+ -212 -x+1/2,+y,+z+1/2
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/2,-x,+z+1/2
+ -217 +z+1/2,-y,-x+1/2
+ -218 -x+1/2,+z,-y+1/2
+ -219 +z+1/2,-y,+x+1/2
+ -220 +x+1/2,+z,-y+1/2
+ -221 -x+1/2,+z,+y+1/2
+ -222 +y+1/2,-x,+z+1/2
+ -223 +z+1/2,+y,-x+1/2
+ -224 -y+1/2,+x,+z+1/2
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+1/2,+y+1/2,-z
+ 305 -z+1/2,+x+1/2,+y
+ 306 +y+1/2,-z+1/2,+x
+ 307 -z+1/2,+x+1/2,-y
+ 308 -y+1/2,-z+1/2,+x
+ 309 +y+1/2,-z+1/2,-x
+ 310 -x+1/2,+y+1/2,-z
+ 311 -z+1/2,-x+1/2,+y
+ 312 +x+1/2,-y+1/2,-z
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+1/2,+x+1/2,-z
+ 317 -z+1/2,+y+1/2,+x
+ 318 +x+1/2,-z+1/2,+y
+ 319 -z+1/2,+y+1/2,-x
+ 320 -x+1/2,-z+1/2,+y
+ 321 +x+1/2,-z+1/2,-y
+ 322 -y+1/2,+x+1/2,-z
+ 323 -z+1/2,-y+1/2,+x
+ 324 +y+1/2,-x+1/2,-z
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/2,-y+1/2,+z
+ -305 +z+1/2,-x+1/2,-y
+ -306 -y+1/2,+z+1/2,-x
+ -307 +z+1/2,-x+1/2,+y
+ -308 +y+1/2,+z+1/2,-x
+ -309 -y+1/2,+z+1/2,+x
+ -310 +x+1/2,-y+1/2,+z
+ -311 +z+1/2,+x+1/2,-y
+ -312 -x+1/2,+y+1/2,+z
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/2,-x+1/2,+z
+ -317 +z+1/2,-y+1/2,-x
+ -318 -x+1/2,+z+1/2,-y
+ -319 +z+1/2,-y+1/2,+x
+ -320 +x+1/2,+z+1/2,-y
+ -321 -x+1/2,+z+1/2,+y
+ -322 +y+1/2,-x+1/2,+z
+ -323 +z+1/2,+y+1/2,-x
+ -324 -y+1/2,+x+1/2,+z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -446,8 +446,8 @@ NI1 0.0 0.0 0.0 1.0 Uiso 0.025 4
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Ni 4.0
-
+ Ni 4.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Ni
_chemical_formula_weight 58.71
diff --git a/scripts/Engineering/ENGINX/phase_info/NI_GAMMA_P.cif b/scripts/Engineering/ENGINX/phase_info/NI_GAMMA_P.cif
index 4b9b803e757a3ec2a73bad69b62de1550775a911..d0ffa0c4e8402dbf19bbdeb7c8cdc1937a8518d9 100644
--- a/scripts/Engineering/ENGINX/phase_info/NI_GAMMA_P.cif
+++ b/scripts/Engineering/ENGINX/phase_info/NI_GAMMA_P.cif
@@ -235,198 +235,198 @@ _cell_volume 46.26828
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x,+y+1/2,-z+1/2
- 105 -z,+x+1/2,+y+1/2
- 106 +y,-z+1/2,+x+1/2
- 107 -z,+x+1/2,-y+1/2
- 108 -y,-z+1/2,+x+1/2
- 109 +y,-z+1/2,-x+1/2
- 110 -x,+y+1/2,-z+1/2
- 111 -z,-x+1/2,+y+1/2
- 112 +x,-y+1/2,-z+1/2
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y,+x+1/2,-z+1/2
- 117 -z,+y+1/2,+x+1/2
- 118 +x,-z+1/2,+y+1/2
- 119 -z,+y+1/2,-x+1/2
- 120 -x,-z+1/2,+y+1/2
- 121 +x,-z+1/2,-y+1/2
- 122 -y,+x+1/2,-z+1/2
- 123 -z,-y+1/2,+x+1/2
- 124 +y,-x+1/2,-z+1/2
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x,-y+1/2,+z+1/2
- -105 +z,-x+1/2,-y+1/2
- -106 -y,+z+1/2,-x+1/2
- -107 +z,-x+1/2,+y+1/2
- -108 +y,+z+1/2,-x+1/2
- -109 -y,+z+1/2,+x+1/2
- -110 +x,-y+1/2,+z+1/2
- -111 +z,+x+1/2,-y+1/2
- -112 -x,+y+1/2,+z+1/2
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y,-x+1/2,+z+1/2
- -117 +z,-y+1/2,-x+1/2
- -118 -x,+z+1/2,-y+1/2
- -119 +z,-y+1/2,+x+1/2
- -120 +x,+z+1/2,-y+1/2
- -121 -x,+z+1/2,+y+1/2
- -122 +y,-x+1/2,+z+1/2
- -123 +z,+y+1/2,-x+1/2
- -124 -y,+x+1/2,+z+1/2
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+1/2,+y,-z+1/2
- 205 -z+1/2,+x,+y+1/2
- 206 +y+1/2,-z,+x+1/2
- 207 -z+1/2,+x,-y+1/2
- 208 -y+1/2,-z,+x+1/2
- 209 +y+1/2,-z,-x+1/2
- 210 -x+1/2,+y,-z+1/2
- 211 -z+1/2,-x,+y+1/2
- 212 +x+1/2,-y,-z+1/2
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+1/2,+x,-z+1/2
- 217 -z+1/2,+y,+x+1/2
- 218 +x+1/2,-z,+y+1/2
- 219 -z+1/2,+y,-x+1/2
- 220 -x+1/2,-z,+y+1/2
- 221 +x+1/2,-z,-y+1/2
- 222 -y+1/2,+x,-z+1/2
- 223 -z+1/2,-y,+x+1/2
- 224 +y+1/2,-x,-z+1/2
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/2,-y,+z+1/2
- -205 +z+1/2,-x,-y+1/2
- -206 -y+1/2,+z,-x+1/2
- -207 +z+1/2,-x,+y+1/2
- -208 +y+1/2,+z,-x+1/2
- -209 -y+1/2,+z,+x+1/2
- -210 +x+1/2,-y,+z+1/2
- -211 +z+1/2,+x,-y+1/2
- -212 -x+1/2,+y,+z+1/2
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/2,-x,+z+1/2
- -217 +z+1/2,-y,-x+1/2
- -218 -x+1/2,+z,-y+1/2
- -219 +z+1/2,-y,+x+1/2
- -220 +x+1/2,+z,-y+1/2
- -221 -x+1/2,+z,+y+1/2
- -222 +y+1/2,-x,+z+1/2
- -223 +z+1/2,+y,-x+1/2
- -224 -y+1/2,+x,+z+1/2
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+1/2,+y+1/2,-z
- 305 -z+1/2,+x+1/2,+y
- 306 +y+1/2,-z+1/2,+x
- 307 -z+1/2,+x+1/2,-y
- 308 -y+1/2,-z+1/2,+x
- 309 +y+1/2,-z+1/2,-x
- 310 -x+1/2,+y+1/2,-z
- 311 -z+1/2,-x+1/2,+y
- 312 +x+1/2,-y+1/2,-z
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+1/2,+x+1/2,-z
- 317 -z+1/2,+y+1/2,+x
- 318 +x+1/2,-z+1/2,+y
- 319 -z+1/2,+y+1/2,-x
- 320 -x+1/2,-z+1/2,+y
- 321 +x+1/2,-z+1/2,-y
- 322 -y+1/2,+x+1/2,-z
- 323 -z+1/2,-y+1/2,+x
- 324 +y+1/2,-x+1/2,-z
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/2,-y+1/2,+z
- -305 +z+1/2,-x+1/2,-y
- -306 -y+1/2,+z+1/2,-x
- -307 +z+1/2,-x+1/2,+y
- -308 +y+1/2,+z+1/2,-x
- -309 -y+1/2,+z+1/2,+x
- -310 +x+1/2,-y+1/2,+z
- -311 +z+1/2,+x+1/2,-y
- -312 -x+1/2,+y+1/2,+z
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/2,-x+1/2,+z
- -317 +z+1/2,-y+1/2,-x
- -318 -x+1/2,+z+1/2,-y
- -319 +z+1/2,-y+1/2,+x
- -320 +x+1/2,+z+1/2,-y
- -321 -x+1/2,+z+1/2,+y
- -322 +y+1/2,-x+1/2,+z
- -323 +z+1/2,+y+1/2,-x
- -324 -y+1/2,+x+1/2,+z
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x,+y+1/2,-z+1/2
+ 105 -z,+x+1/2,+y+1/2
+ 106 +y,-z+1/2,+x+1/2
+ 107 -z,+x+1/2,-y+1/2
+ 108 -y,-z+1/2,+x+1/2
+ 109 +y,-z+1/2,-x+1/2
+ 110 -x,+y+1/2,-z+1/2
+ 111 -z,-x+1/2,+y+1/2
+ 112 +x,-y+1/2,-z+1/2
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y,+x+1/2,-z+1/2
+ 117 -z,+y+1/2,+x+1/2
+ 118 +x,-z+1/2,+y+1/2
+ 119 -z,+y+1/2,-x+1/2
+ 120 -x,-z+1/2,+y+1/2
+ 121 +x,-z+1/2,-y+1/2
+ 122 -y,+x+1/2,-z+1/2
+ 123 -z,-y+1/2,+x+1/2
+ 124 +y,-x+1/2,-z+1/2
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x,-y+1/2,+z+1/2
+ -105 +z,-x+1/2,-y+1/2
+ -106 -y,+z+1/2,-x+1/2
+ -107 +z,-x+1/2,+y+1/2
+ -108 +y,+z+1/2,-x+1/2
+ -109 -y,+z+1/2,+x+1/2
+ -110 +x,-y+1/2,+z+1/2
+ -111 +z,+x+1/2,-y+1/2
+ -112 -x,+y+1/2,+z+1/2
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y,-x+1/2,+z+1/2
+ -117 +z,-y+1/2,-x+1/2
+ -118 -x,+z+1/2,-y+1/2
+ -119 +z,-y+1/2,+x+1/2
+ -120 +x,+z+1/2,-y+1/2
+ -121 -x,+z+1/2,+y+1/2
+ -122 +y,-x+1/2,+z+1/2
+ -123 +z,+y+1/2,-x+1/2
+ -124 -y,+x+1/2,+z+1/2
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+1/2,+y,-z+1/2
+ 205 -z+1/2,+x,+y+1/2
+ 206 +y+1/2,-z,+x+1/2
+ 207 -z+1/2,+x,-y+1/2
+ 208 -y+1/2,-z,+x+1/2
+ 209 +y+1/2,-z,-x+1/2
+ 210 -x+1/2,+y,-z+1/2
+ 211 -z+1/2,-x,+y+1/2
+ 212 +x+1/2,-y,-z+1/2
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+1/2,+x,-z+1/2
+ 217 -z+1/2,+y,+x+1/2
+ 218 +x+1/2,-z,+y+1/2
+ 219 -z+1/2,+y,-x+1/2
+ 220 -x+1/2,-z,+y+1/2
+ 221 +x+1/2,-z,-y+1/2
+ 222 -y+1/2,+x,-z+1/2
+ 223 -z+1/2,-y,+x+1/2
+ 224 +y+1/2,-x,-z+1/2
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/2,-y,+z+1/2
+ -205 +z+1/2,-x,-y+1/2
+ -206 -y+1/2,+z,-x+1/2
+ -207 +z+1/2,-x,+y+1/2
+ -208 +y+1/2,+z,-x+1/2
+ -209 -y+1/2,+z,+x+1/2
+ -210 +x+1/2,-y,+z+1/2
+ -211 +z+1/2,+x,-y+1/2
+ -212 -x+1/2,+y,+z+1/2
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/2,-x,+z+1/2
+ -217 +z+1/2,-y,-x+1/2
+ -218 -x+1/2,+z,-y+1/2
+ -219 +z+1/2,-y,+x+1/2
+ -220 +x+1/2,+z,-y+1/2
+ -221 -x+1/2,+z,+y+1/2
+ -222 +y+1/2,-x,+z+1/2
+ -223 +z+1/2,+y,-x+1/2
+ -224 -y+1/2,+x,+z+1/2
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+1/2,+y+1/2,-z
+ 305 -z+1/2,+x+1/2,+y
+ 306 +y+1/2,-z+1/2,+x
+ 307 -z+1/2,+x+1/2,-y
+ 308 -y+1/2,-z+1/2,+x
+ 309 +y+1/2,-z+1/2,-x
+ 310 -x+1/2,+y+1/2,-z
+ 311 -z+1/2,-x+1/2,+y
+ 312 +x+1/2,-y+1/2,-z
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+1/2,+x+1/2,-z
+ 317 -z+1/2,+y+1/2,+x
+ 318 +x+1/2,-z+1/2,+y
+ 319 -z+1/2,+y+1/2,-x
+ 320 -x+1/2,-z+1/2,+y
+ 321 +x+1/2,-z+1/2,-y
+ 322 -y+1/2,+x+1/2,-z
+ 323 -z+1/2,-y+1/2,+x
+ 324 +y+1/2,-x+1/2,-z
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/2,-y+1/2,+z
+ -305 +z+1/2,-x+1/2,-y
+ -306 -y+1/2,+z+1/2,-x
+ -307 +z+1/2,-x+1/2,+y
+ -308 +y+1/2,+z+1/2,-x
+ -309 -y+1/2,+z+1/2,+x
+ -310 +x+1/2,-y+1/2,+z
+ -311 +z+1/2,+x+1/2,-y
+ -312 -x+1/2,+y+1/2,+z
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/2,-x+1/2,+z
+ -317 +z+1/2,-y+1/2,-x
+ -318 -x+1/2,+z+1/2,-y
+ -319 +z+1/2,-y+1/2,+x
+ -320 +x+1/2,+z+1/2,-y
+ -321 -x+1/2,+z+1/2,+y
+ -322 +y+1/2,-x+1/2,+z
+ -323 +z+1/2,+y+1/2,-x
+ -324 -y+1/2,+x+1/2,+z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -446,8 +446,8 @@ NI1 0.0 0.0 0.0 1.0 Uiso 0.025 4
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Ni 4.0
-
+ Ni 4.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Ni
_chemical_formula_weight 58.71
diff --git a/scripts/Engineering/ENGINX/phase_info/PB.cif b/scripts/Engineering/ENGINX/phase_info/PB.cif
index 5499f135170d9e8acc543d84bbbbb723c6bb69ce..d7a769701c07ef77047a79f9bcc6eb055d60f221 100644
--- a/scripts/Engineering/ENGINX/phase_info/PB.cif
+++ b/scripts/Engineering/ENGINX/phase_info/PB.cif
@@ -235,198 +235,198 @@ _cell_volume 121.28737
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x,+y+1/2,-z+1/2
- 105 -z,+x+1/2,+y+1/2
- 106 +y,-z+1/2,+x+1/2
- 107 -z,+x+1/2,-y+1/2
- 108 -y,-z+1/2,+x+1/2
- 109 +y,-z+1/2,-x+1/2
- 110 -x,+y+1/2,-z+1/2
- 111 -z,-x+1/2,+y+1/2
- 112 +x,-y+1/2,-z+1/2
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y,+x+1/2,-z+1/2
- 117 -z,+y+1/2,+x+1/2
- 118 +x,-z+1/2,+y+1/2
- 119 -z,+y+1/2,-x+1/2
- 120 -x,-z+1/2,+y+1/2
- 121 +x,-z+1/2,-y+1/2
- 122 -y,+x+1/2,-z+1/2
- 123 -z,-y+1/2,+x+1/2
- 124 +y,-x+1/2,-z+1/2
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x,-y+1/2,+z+1/2
- -105 +z,-x+1/2,-y+1/2
- -106 -y,+z+1/2,-x+1/2
- -107 +z,-x+1/2,+y+1/2
- -108 +y,+z+1/2,-x+1/2
- -109 -y,+z+1/2,+x+1/2
- -110 +x,-y+1/2,+z+1/2
- -111 +z,+x+1/2,-y+1/2
- -112 -x,+y+1/2,+z+1/2
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y,-x+1/2,+z+1/2
- -117 +z,-y+1/2,-x+1/2
- -118 -x,+z+1/2,-y+1/2
- -119 +z,-y+1/2,+x+1/2
- -120 +x,+z+1/2,-y+1/2
- -121 -x,+z+1/2,+y+1/2
- -122 +y,-x+1/2,+z+1/2
- -123 +z,+y+1/2,-x+1/2
- -124 -y,+x+1/2,+z+1/2
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+1/2,+y,-z+1/2
- 205 -z+1/2,+x,+y+1/2
- 206 +y+1/2,-z,+x+1/2
- 207 -z+1/2,+x,-y+1/2
- 208 -y+1/2,-z,+x+1/2
- 209 +y+1/2,-z,-x+1/2
- 210 -x+1/2,+y,-z+1/2
- 211 -z+1/2,-x,+y+1/2
- 212 +x+1/2,-y,-z+1/2
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+1/2,+x,-z+1/2
- 217 -z+1/2,+y,+x+1/2
- 218 +x+1/2,-z,+y+1/2
- 219 -z+1/2,+y,-x+1/2
- 220 -x+1/2,-z,+y+1/2
- 221 +x+1/2,-z,-y+1/2
- 222 -y+1/2,+x,-z+1/2
- 223 -z+1/2,-y,+x+1/2
- 224 +y+1/2,-x,-z+1/2
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/2,-y,+z+1/2
- -205 +z+1/2,-x,-y+1/2
- -206 -y+1/2,+z,-x+1/2
- -207 +z+1/2,-x,+y+1/2
- -208 +y+1/2,+z,-x+1/2
- -209 -y+1/2,+z,+x+1/2
- -210 +x+1/2,-y,+z+1/2
- -211 +z+1/2,+x,-y+1/2
- -212 -x+1/2,+y,+z+1/2
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/2,-x,+z+1/2
- -217 +z+1/2,-y,-x+1/2
- -218 -x+1/2,+z,-y+1/2
- -219 +z+1/2,-y,+x+1/2
- -220 +x+1/2,+z,-y+1/2
- -221 -x+1/2,+z,+y+1/2
- -222 +y+1/2,-x,+z+1/2
- -223 +z+1/2,+y,-x+1/2
- -224 -y+1/2,+x,+z+1/2
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+1/2,+y+1/2,-z
- 305 -z+1/2,+x+1/2,+y
- 306 +y+1/2,-z+1/2,+x
- 307 -z+1/2,+x+1/2,-y
- 308 -y+1/2,-z+1/2,+x
- 309 +y+1/2,-z+1/2,-x
- 310 -x+1/2,+y+1/2,-z
- 311 -z+1/2,-x+1/2,+y
- 312 +x+1/2,-y+1/2,-z
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+1/2,+x+1/2,-z
- 317 -z+1/2,+y+1/2,+x
- 318 +x+1/2,-z+1/2,+y
- 319 -z+1/2,+y+1/2,-x
- 320 -x+1/2,-z+1/2,+y
- 321 +x+1/2,-z+1/2,-y
- 322 -y+1/2,+x+1/2,-z
- 323 -z+1/2,-y+1/2,+x
- 324 +y+1/2,-x+1/2,-z
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/2,-y+1/2,+z
- -305 +z+1/2,-x+1/2,-y
- -306 -y+1/2,+z+1/2,-x
- -307 +z+1/2,-x+1/2,+y
- -308 +y+1/2,+z+1/2,-x
- -309 -y+1/2,+z+1/2,+x
- -310 +x+1/2,-y+1/2,+z
- -311 +z+1/2,+x+1/2,-y
- -312 -x+1/2,+y+1/2,+z
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/2,-x+1/2,+z
- -317 +z+1/2,-y+1/2,-x
- -318 -x+1/2,+z+1/2,-y
- -319 +z+1/2,-y+1/2,+x
- -320 +x+1/2,+z+1/2,-y
- -321 -x+1/2,+z+1/2,+y
- -322 +y+1/2,-x+1/2,+z
- -323 +z+1/2,+y+1/2,-x
- -324 -y+1/2,+x+1/2,+z
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x,+y+1/2,-z+1/2
+ 105 -z,+x+1/2,+y+1/2
+ 106 +y,-z+1/2,+x+1/2
+ 107 -z,+x+1/2,-y+1/2
+ 108 -y,-z+1/2,+x+1/2
+ 109 +y,-z+1/2,-x+1/2
+ 110 -x,+y+1/2,-z+1/2
+ 111 -z,-x+1/2,+y+1/2
+ 112 +x,-y+1/2,-z+1/2
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y,+x+1/2,-z+1/2
+ 117 -z,+y+1/2,+x+1/2
+ 118 +x,-z+1/2,+y+1/2
+ 119 -z,+y+1/2,-x+1/2
+ 120 -x,-z+1/2,+y+1/2
+ 121 +x,-z+1/2,-y+1/2
+ 122 -y,+x+1/2,-z+1/2
+ 123 -z,-y+1/2,+x+1/2
+ 124 +y,-x+1/2,-z+1/2
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x,-y+1/2,+z+1/2
+ -105 +z,-x+1/2,-y+1/2
+ -106 -y,+z+1/2,-x+1/2
+ -107 +z,-x+1/2,+y+1/2
+ -108 +y,+z+1/2,-x+1/2
+ -109 -y,+z+1/2,+x+1/2
+ -110 +x,-y+1/2,+z+1/2
+ -111 +z,+x+1/2,-y+1/2
+ -112 -x,+y+1/2,+z+1/2
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y,-x+1/2,+z+1/2
+ -117 +z,-y+1/2,-x+1/2
+ -118 -x,+z+1/2,-y+1/2
+ -119 +z,-y+1/2,+x+1/2
+ -120 +x,+z+1/2,-y+1/2
+ -121 -x,+z+1/2,+y+1/2
+ -122 +y,-x+1/2,+z+1/2
+ -123 +z,+y+1/2,-x+1/2
+ -124 -y,+x+1/2,+z+1/2
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+1/2,+y,-z+1/2
+ 205 -z+1/2,+x,+y+1/2
+ 206 +y+1/2,-z,+x+1/2
+ 207 -z+1/2,+x,-y+1/2
+ 208 -y+1/2,-z,+x+1/2
+ 209 +y+1/2,-z,-x+1/2
+ 210 -x+1/2,+y,-z+1/2
+ 211 -z+1/2,-x,+y+1/2
+ 212 +x+1/2,-y,-z+1/2
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+1/2,+x,-z+1/2
+ 217 -z+1/2,+y,+x+1/2
+ 218 +x+1/2,-z,+y+1/2
+ 219 -z+1/2,+y,-x+1/2
+ 220 -x+1/2,-z,+y+1/2
+ 221 +x+1/2,-z,-y+1/2
+ 222 -y+1/2,+x,-z+1/2
+ 223 -z+1/2,-y,+x+1/2
+ 224 +y+1/2,-x,-z+1/2
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/2,-y,+z+1/2
+ -205 +z+1/2,-x,-y+1/2
+ -206 -y+1/2,+z,-x+1/2
+ -207 +z+1/2,-x,+y+1/2
+ -208 +y+1/2,+z,-x+1/2
+ -209 -y+1/2,+z,+x+1/2
+ -210 +x+1/2,-y,+z+1/2
+ -211 +z+1/2,+x,-y+1/2
+ -212 -x+1/2,+y,+z+1/2
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/2,-x,+z+1/2
+ -217 +z+1/2,-y,-x+1/2
+ -218 -x+1/2,+z,-y+1/2
+ -219 +z+1/2,-y,+x+1/2
+ -220 +x+1/2,+z,-y+1/2
+ -221 -x+1/2,+z,+y+1/2
+ -222 +y+1/2,-x,+z+1/2
+ -223 +z+1/2,+y,-x+1/2
+ -224 -y+1/2,+x,+z+1/2
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+1/2,+y+1/2,-z
+ 305 -z+1/2,+x+1/2,+y
+ 306 +y+1/2,-z+1/2,+x
+ 307 -z+1/2,+x+1/2,-y
+ 308 -y+1/2,-z+1/2,+x
+ 309 +y+1/2,-z+1/2,-x
+ 310 -x+1/2,+y+1/2,-z
+ 311 -z+1/2,-x+1/2,+y
+ 312 +x+1/2,-y+1/2,-z
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+1/2,+x+1/2,-z
+ 317 -z+1/2,+y+1/2,+x
+ 318 +x+1/2,-z+1/2,+y
+ 319 -z+1/2,+y+1/2,-x
+ 320 -x+1/2,-z+1/2,+y
+ 321 +x+1/2,-z+1/2,-y
+ 322 -y+1/2,+x+1/2,-z
+ 323 -z+1/2,-y+1/2,+x
+ 324 +y+1/2,-x+1/2,-z
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/2,-y+1/2,+z
+ -305 +z+1/2,-x+1/2,-y
+ -306 -y+1/2,+z+1/2,-x
+ -307 +z+1/2,-x+1/2,+y
+ -308 +y+1/2,+z+1/2,-x
+ -309 -y+1/2,+z+1/2,+x
+ -310 +x+1/2,-y+1/2,+z
+ -311 +z+1/2,+x+1/2,-y
+ -312 -x+1/2,+y+1/2,+z
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/2,-x+1/2,+z
+ -317 +z+1/2,-y+1/2,-x
+ -318 -x+1/2,+z+1/2,-y
+ -319 +z+1/2,-y+1/2,+x
+ -320 +x+1/2,+z+1/2,-y
+ -321 -x+1/2,+z+1/2,+y
+ -322 +y+1/2,-x+1/2,+z
+ -323 +z+1/2,+y+1/2,-x
+ -324 -y+1/2,+x+1/2,+z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -446,8 +446,8 @@ PB1 0.0 0.0 0.0 1.0 Uiso 0.025 4
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Pb 4.0
-
+ Pb 4.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Pb
_chemical_formula_weight 203.97
diff --git a/scripts/Engineering/ENGINX/phase_info/PT.cif b/scripts/Engineering/ENGINX/phase_info/PT.cif
index 03c92e43c2515d7c4d1cce902ba1182b24f13238..a28044d0b244c1352dc6bd74dd47daebd9b5c4ef 100644
--- a/scripts/Engineering/ENGINX/phase_info/PT.cif
+++ b/scripts/Engineering/ENGINX/phase_info/PT.cif
@@ -235,198 +235,198 @@ _cell_volume 60.42088
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x,+y+1/2,-z+1/2
- 105 -z,+x+1/2,+y+1/2
- 106 +y,-z+1/2,+x+1/2
- 107 -z,+x+1/2,-y+1/2
- 108 -y,-z+1/2,+x+1/2
- 109 +y,-z+1/2,-x+1/2
- 110 -x,+y+1/2,-z+1/2
- 111 -z,-x+1/2,+y+1/2
- 112 +x,-y+1/2,-z+1/2
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y,+x+1/2,-z+1/2
- 117 -z,+y+1/2,+x+1/2
- 118 +x,-z+1/2,+y+1/2
- 119 -z,+y+1/2,-x+1/2
- 120 -x,-z+1/2,+y+1/2
- 121 +x,-z+1/2,-y+1/2
- 122 -y,+x+1/2,-z+1/2
- 123 -z,-y+1/2,+x+1/2
- 124 +y,-x+1/2,-z+1/2
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x,-y+1/2,+z+1/2
- -105 +z,-x+1/2,-y+1/2
- -106 -y,+z+1/2,-x+1/2
- -107 +z,-x+1/2,+y+1/2
- -108 +y,+z+1/2,-x+1/2
- -109 -y,+z+1/2,+x+1/2
- -110 +x,-y+1/2,+z+1/2
- -111 +z,+x+1/2,-y+1/2
- -112 -x,+y+1/2,+z+1/2
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y,-x+1/2,+z+1/2
- -117 +z,-y+1/2,-x+1/2
- -118 -x,+z+1/2,-y+1/2
- -119 +z,-y+1/2,+x+1/2
- -120 +x,+z+1/2,-y+1/2
- -121 -x,+z+1/2,+y+1/2
- -122 +y,-x+1/2,+z+1/2
- -123 +z,+y+1/2,-x+1/2
- -124 -y,+x+1/2,+z+1/2
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+1/2,+y,-z+1/2
- 205 -z+1/2,+x,+y+1/2
- 206 +y+1/2,-z,+x+1/2
- 207 -z+1/2,+x,-y+1/2
- 208 -y+1/2,-z,+x+1/2
- 209 +y+1/2,-z,-x+1/2
- 210 -x+1/2,+y,-z+1/2
- 211 -z+1/2,-x,+y+1/2
- 212 +x+1/2,-y,-z+1/2
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+1/2,+x,-z+1/2
- 217 -z+1/2,+y,+x+1/2
- 218 +x+1/2,-z,+y+1/2
- 219 -z+1/2,+y,-x+1/2
- 220 -x+1/2,-z,+y+1/2
- 221 +x+1/2,-z,-y+1/2
- 222 -y+1/2,+x,-z+1/2
- 223 -z+1/2,-y,+x+1/2
- 224 +y+1/2,-x,-z+1/2
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/2,-y,+z+1/2
- -205 +z+1/2,-x,-y+1/2
- -206 -y+1/2,+z,-x+1/2
- -207 +z+1/2,-x,+y+1/2
- -208 +y+1/2,+z,-x+1/2
- -209 -y+1/2,+z,+x+1/2
- -210 +x+1/2,-y,+z+1/2
- -211 +z+1/2,+x,-y+1/2
- -212 -x+1/2,+y,+z+1/2
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/2,-x,+z+1/2
- -217 +z+1/2,-y,-x+1/2
- -218 -x+1/2,+z,-y+1/2
- -219 +z+1/2,-y,+x+1/2
- -220 +x+1/2,+z,-y+1/2
- -221 -x+1/2,+z,+y+1/2
- -222 +y+1/2,-x,+z+1/2
- -223 +z+1/2,+y,-x+1/2
- -224 -y+1/2,+x,+z+1/2
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+1/2,+y+1/2,-z
- 305 -z+1/2,+x+1/2,+y
- 306 +y+1/2,-z+1/2,+x
- 307 -z+1/2,+x+1/2,-y
- 308 -y+1/2,-z+1/2,+x
- 309 +y+1/2,-z+1/2,-x
- 310 -x+1/2,+y+1/2,-z
- 311 -z+1/2,-x+1/2,+y
- 312 +x+1/2,-y+1/2,-z
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+1/2,+x+1/2,-z
- 317 -z+1/2,+y+1/2,+x
- 318 +x+1/2,-z+1/2,+y
- 319 -z+1/2,+y+1/2,-x
- 320 -x+1/2,-z+1/2,+y
- 321 +x+1/2,-z+1/2,-y
- 322 -y+1/2,+x+1/2,-z
- 323 -z+1/2,-y+1/2,+x
- 324 +y+1/2,-x+1/2,-z
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/2,-y+1/2,+z
- -305 +z+1/2,-x+1/2,-y
- -306 -y+1/2,+z+1/2,-x
- -307 +z+1/2,-x+1/2,+y
- -308 +y+1/2,+z+1/2,-x
- -309 -y+1/2,+z+1/2,+x
- -310 +x+1/2,-y+1/2,+z
- -311 +z+1/2,+x+1/2,-y
- -312 -x+1/2,+y+1/2,+z
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/2,-x+1/2,+z
- -317 +z+1/2,-y+1/2,-x
- -318 -x+1/2,+z+1/2,-y
- -319 +z+1/2,-y+1/2,+x
- -320 +x+1/2,+z+1/2,-y
- -321 -x+1/2,+z+1/2,+y
- -322 +y+1/2,-x+1/2,+z
- -323 +z+1/2,+y+1/2,-x
- -324 -y+1/2,+x+1/2,+z
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x,+y+1/2,-z+1/2
+ 105 -z,+x+1/2,+y+1/2
+ 106 +y,-z+1/2,+x+1/2
+ 107 -z,+x+1/2,-y+1/2
+ 108 -y,-z+1/2,+x+1/2
+ 109 +y,-z+1/2,-x+1/2
+ 110 -x,+y+1/2,-z+1/2
+ 111 -z,-x+1/2,+y+1/2
+ 112 +x,-y+1/2,-z+1/2
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y,+x+1/2,-z+1/2
+ 117 -z,+y+1/2,+x+1/2
+ 118 +x,-z+1/2,+y+1/2
+ 119 -z,+y+1/2,-x+1/2
+ 120 -x,-z+1/2,+y+1/2
+ 121 +x,-z+1/2,-y+1/2
+ 122 -y,+x+1/2,-z+1/2
+ 123 -z,-y+1/2,+x+1/2
+ 124 +y,-x+1/2,-z+1/2
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x,-y+1/2,+z+1/2
+ -105 +z,-x+1/2,-y+1/2
+ -106 -y,+z+1/2,-x+1/2
+ -107 +z,-x+1/2,+y+1/2
+ -108 +y,+z+1/2,-x+1/2
+ -109 -y,+z+1/2,+x+1/2
+ -110 +x,-y+1/2,+z+1/2
+ -111 +z,+x+1/2,-y+1/2
+ -112 -x,+y+1/2,+z+1/2
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y,-x+1/2,+z+1/2
+ -117 +z,-y+1/2,-x+1/2
+ -118 -x,+z+1/2,-y+1/2
+ -119 +z,-y+1/2,+x+1/2
+ -120 +x,+z+1/2,-y+1/2
+ -121 -x,+z+1/2,+y+1/2
+ -122 +y,-x+1/2,+z+1/2
+ -123 +z,+y+1/2,-x+1/2
+ -124 -y,+x+1/2,+z+1/2
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+1/2,+y,-z+1/2
+ 205 -z+1/2,+x,+y+1/2
+ 206 +y+1/2,-z,+x+1/2
+ 207 -z+1/2,+x,-y+1/2
+ 208 -y+1/2,-z,+x+1/2
+ 209 +y+1/2,-z,-x+1/2
+ 210 -x+1/2,+y,-z+1/2
+ 211 -z+1/2,-x,+y+1/2
+ 212 +x+1/2,-y,-z+1/2
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+1/2,+x,-z+1/2
+ 217 -z+1/2,+y,+x+1/2
+ 218 +x+1/2,-z,+y+1/2
+ 219 -z+1/2,+y,-x+1/2
+ 220 -x+1/2,-z,+y+1/2
+ 221 +x+1/2,-z,-y+1/2
+ 222 -y+1/2,+x,-z+1/2
+ 223 -z+1/2,-y,+x+1/2
+ 224 +y+1/2,-x,-z+1/2
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/2,-y,+z+1/2
+ -205 +z+1/2,-x,-y+1/2
+ -206 -y+1/2,+z,-x+1/2
+ -207 +z+1/2,-x,+y+1/2
+ -208 +y+1/2,+z,-x+1/2
+ -209 -y+1/2,+z,+x+1/2
+ -210 +x+1/2,-y,+z+1/2
+ -211 +z+1/2,+x,-y+1/2
+ -212 -x+1/2,+y,+z+1/2
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/2,-x,+z+1/2
+ -217 +z+1/2,-y,-x+1/2
+ -218 -x+1/2,+z,-y+1/2
+ -219 +z+1/2,-y,+x+1/2
+ -220 +x+1/2,+z,-y+1/2
+ -221 -x+1/2,+z,+y+1/2
+ -222 +y+1/2,-x,+z+1/2
+ -223 +z+1/2,+y,-x+1/2
+ -224 -y+1/2,+x,+z+1/2
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+1/2,+y+1/2,-z
+ 305 -z+1/2,+x+1/2,+y
+ 306 +y+1/2,-z+1/2,+x
+ 307 -z+1/2,+x+1/2,-y
+ 308 -y+1/2,-z+1/2,+x
+ 309 +y+1/2,-z+1/2,-x
+ 310 -x+1/2,+y+1/2,-z
+ 311 -z+1/2,-x+1/2,+y
+ 312 +x+1/2,-y+1/2,-z
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+1/2,+x+1/2,-z
+ 317 -z+1/2,+y+1/2,+x
+ 318 +x+1/2,-z+1/2,+y
+ 319 -z+1/2,+y+1/2,-x
+ 320 -x+1/2,-z+1/2,+y
+ 321 +x+1/2,-z+1/2,-y
+ 322 -y+1/2,+x+1/2,-z
+ 323 -z+1/2,-y+1/2,+x
+ 324 +y+1/2,-x+1/2,-z
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/2,-y+1/2,+z
+ -305 +z+1/2,-x+1/2,-y
+ -306 -y+1/2,+z+1/2,-x
+ -307 +z+1/2,-x+1/2,+y
+ -308 +y+1/2,+z+1/2,-x
+ -309 -y+1/2,+z+1/2,+x
+ -310 +x+1/2,-y+1/2,+z
+ -311 +z+1/2,+x+1/2,-y
+ -312 -x+1/2,+y+1/2,+z
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/2,-x+1/2,+z
+ -317 +z+1/2,-y+1/2,-x
+ -318 -x+1/2,+z+1/2,-y
+ -319 +z+1/2,-y+1/2,+x
+ -320 +x+1/2,+z+1/2,-y
+ -321 -x+1/2,+z+1/2,+y
+ -322 +y+1/2,-x+1/2,+z
+ -323 +z+1/2,+y+1/2,-x
+ -324 -y+1/2,+x+1/2,+z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -446,8 +446,8 @@ PT1 0.0 0.0 0.0 1.0 Uiso 0.025 4
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Pt 4.0
-
+ Pt 4.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Pt
_chemical_formula_weight 195.05
diff --git a/scripts/Engineering/ENGINX/phase_info/SI.cif b/scripts/Engineering/ENGINX/phase_info/SI.cif
index 3dbd751762988b3d5a500246302bd9e88ead0acb..a2f8691382c101973df80a5855939ecc829dc8ed 100644
--- a/scripts/Engineering/ENGINX/phase_info/SI.cif
+++ b/scripts/Engineering/ENGINX/phase_info/SI.cif
@@ -235,198 +235,198 @@ _cell_volume 160.18626
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F d 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x+1/4,+y+1/4,-z
- 5 -z,+x+1/4,+y+1/4
- 6 +y+1/4,-z,+x+1/4
- 7 -z+1/4,+x+1/2,-y+3/4
- 8 -y+3/4,-z+1/4,+x+1/2
- 9 +y+1/2,-z+1/4,-x+3/4
- 10 -x+3/4,+y+1/2,-z+1/4
- 11 -z+1/4,-x+3/4,+y+1/2
- 12 +x+1/2,-y+3/4,-z+1/4
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y+1/4,+x+1/4,-z
- 17 -z,+y+1/4,+x+1/4
- 18 +x+1/4,-z,+y+1/4
- 19 -z+1/4,+y+1/2,-x+3/4
- 20 -x+3/4,-z+1/4,+y+1/2
- 21 +x+1/2,-z+1/4,-y+3/4
- 22 -y+3/4,+x+1/2,-z+1/4
- 23 -z+1/4,-y+3/4,+x+1/2
- 24 +y+1/2,-x+3/4,-z+1/4
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x+3/4,-y+3/4,+z
- -5 +z,-x+3/4,-y+3/4
- -6 -y+3/4,+z,-x+3/4
- -7 +z+3/4,-x+1/2,+y+1/4
- -8 +y+1/4,+z+3/4,-x+1/2
- -9 -y+1/2,+z+3/4,+x+1/4
- -10 +x+1/4,-y+1/2,+z+3/4
- -11 +z+3/4,+x+1/4,-y+1/2
- -12 -x+1/2,+y+1/4,+z+3/4
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y+3/4,-x+3/4,+z
- -17 +z,-y+3/4,-x+3/4
- -18 -x+3/4,+z,-y+3/4
- -19 +z+3/4,-y+1/2,+x+1/4
- -20 +x+1/4,+z+3/4,-y+1/2
- -21 -x+1/2,+z+3/4,+y+1/4
- -22 +y+1/4,-x+1/2,+z+3/4
- -23 +z+3/4,+y+1/4,-x+1/2
- -24 -y+1/2,+x+1/4,+z+3/4
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x+1/4,+y+3/4,-z+1/2
- 105 -z,+x+3/4,+y+3/4
- 106 +y+1/4,-z+1/2,+x+3/4
- 107 -z+1/4,+x,-y+1/4
- 108 -y+3/4,-z+3/4,+x
- 109 +y+1/2,-z+3/4,-x+1/4
- 110 -x+3/4,+y,-z+3/4
- 111 -z+1/4,-x+1/4,+y
- 112 +x+1/2,-y+1/4,-z+3/4
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y+1/4,+x+3/4,-z+1/2
- 117 -z,+y+3/4,+x+3/4
- 118 +x+1/4,-z+1/2,+y+3/4
- 119 -z+1/4,+y,-x+1/4
- 120 -x+3/4,-z+3/4,+y
- 121 +x+1/2,-z+3/4,-y+1/4
- 122 -y+3/4,+x,-z+3/4
- 123 -z+1/4,-y+1/4,+x
- 124 +y+1/2,-x+1/4,-z+3/4
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x+3/4,-y+1/4,+z+1/2
- -105 +z,-x+1/4,-y+1/4
- -106 -y+3/4,+z+1/2,-x+1/4
- -107 +z+3/4,-x,+y+3/4
- -108 +y+1/4,+z+1/4,-x
- -109 -y+1/2,+z+1/4,+x+3/4
- -110 +x+1/4,-y,+z+1/4
- -111 +z+3/4,+x+3/4,-y
- -112 -x+1/2,+y+3/4,+z+1/4
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y+3/4,-x+1/4,+z+1/2
- -117 +z,-y+1/4,-x+1/4
- -118 -x+3/4,+z+1/2,-y+1/4
- -119 +z+3/4,-y,+x+3/4
- -120 +x+1/4,+z+1/4,-y
- -121 -x+1/2,+z+1/4,+y+3/4
- -122 +y+1/4,-x,+z+1/4
- -123 +z+3/4,+y+3/4,-x
- -124 -y+1/2,+x+3/4,+z+1/4
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+3/4,+y+1/4,-z+1/2
- 205 -z+1/2,+x+1/4,+y+3/4
- 206 +y+3/4,-z,+x+3/4
- 207 -z+3/4,+x+1/2,-y+1/4
- 208 -y+1/4,-z+1/4,+x
- 209 +y,-z+1/4,-x+1/4
- 210 -x+1/4,+y+1/2,-z+3/4
- 211 -z+3/4,-x+3/4,+y
- 212 +x,-y+3/4,-z+3/4
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+3/4,+x+1/4,-z+1/2
- 217 -z+1/2,+y+1/4,+x+3/4
- 218 +x+3/4,-z,+y+3/4
- 219 -z+3/4,+y+1/2,-x+1/4
- 220 -x+1/4,-z+1/4,+y
- 221 +x,-z+1/4,-y+1/4
- 222 -y+1/4,+x+1/2,-z+3/4
- 223 -z+3/4,-y+3/4,+x
- 224 +y,-x+3/4,-z+3/4
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/4,-y+3/4,+z+1/2
- -205 +z+1/2,-x+3/4,-y+1/4
- -206 -y+1/4,+z,-x+1/4
- -207 +z+1/4,-x+1/2,+y+3/4
- -208 +y+3/4,+z+3/4,-x
- -209 -y,+z+3/4,+x+3/4
- -210 +x+3/4,-y+1/2,+z+1/4
- -211 +z+1/4,+x+1/4,-y
- -212 -x,+y+1/4,+z+1/4
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/4,-x+3/4,+z+1/2
- -217 +z+1/2,-y+3/4,-x+1/4
- -218 -x+1/4,+z,-y+1/4
- -219 +z+1/4,-y+1/2,+x+3/4
- -220 +x+3/4,+z+3/4,-y
- -221 -x,+z+3/4,+y+3/4
- -222 +y+3/4,-x+1/2,+z+1/4
- -223 +z+1/4,+y+1/4,-x
- -224 -y,+x+1/4,+z+1/4
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+3/4,+y+3/4,-z
- 305 -z+1/2,+x+3/4,+y+1/4
- 306 +y+3/4,-z+1/2,+x+1/4
- 307 -z+3/4,+x,-y+3/4
- 308 -y+1/4,-z+3/4,+x+1/2
- 309 +y,-z+3/4,-x+3/4
- 310 -x+1/4,+y,-z+1/4
- 311 -z+3/4,-x+1/4,+y+1/2
- 312 +x,-y+1/4,-z+1/4
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+3/4,+x+3/4,-z
- 317 -z+1/2,+y+3/4,+x+1/4
- 318 +x+3/4,-z+1/2,+y+1/4
- 319 -z+3/4,+y,-x+3/4
- 320 -x+1/4,-z+3/4,+y+1/2
- 321 +x,-z+3/4,-y+3/4
- 322 -y+1/4,+x,-z+1/4
- 323 -z+3/4,-y+1/4,+x+1/2
- 324 +y,-x+1/4,-z+1/4
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/4,-y+1/4,+z
- -305 +z+1/2,-x+1/4,-y+3/4
- -306 -y+1/4,+z+1/2,-x+3/4
- -307 +z+1/4,-x,+y+1/4
- -308 +y+3/4,+z+1/4,-x+1/2
- -309 -y,+z+1/4,+x+1/4
- -310 +x+3/4,-y,+z+3/4
- -311 +z+1/4,+x+3/4,-y+1/2
- -312 -x,+y+3/4,+z+3/4
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/4,-x+1/4,+z
- -317 +z+1/2,-y+1/4,-x+3/4
- -318 -x+1/4,+z+1/2,-y+3/4
- -319 +z+1/4,-y,+x+1/4
- -320 +x+3/4,+z+1/4,-y+1/2
- -321 -x,+z+1/4,+y+1/4
- -322 +y+3/4,-x,+z+3/4
- -323 +z+1/4,+y+3/4,-x+1/2
- -324 -y,+x+3/4,+z+3/4
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x+1/4,+y+1/4,-z
+ 5 -z,+x+1/4,+y+1/4
+ 6 +y+1/4,-z,+x+1/4
+ 7 -z+1/4,+x+1/2,-y+3/4
+ 8 -y+3/4,-z+1/4,+x+1/2
+ 9 +y+1/2,-z+1/4,-x+3/4
+ 10 -x+3/4,+y+1/2,-z+1/4
+ 11 -z+1/4,-x+3/4,+y+1/2
+ 12 +x+1/2,-y+3/4,-z+1/4
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y+1/4,+x+1/4,-z
+ 17 -z,+y+1/4,+x+1/4
+ 18 +x+1/4,-z,+y+1/4
+ 19 -z+1/4,+y+1/2,-x+3/4
+ 20 -x+3/4,-z+1/4,+y+1/2
+ 21 +x+1/2,-z+1/4,-y+3/4
+ 22 -y+3/4,+x+1/2,-z+1/4
+ 23 -z+1/4,-y+3/4,+x+1/2
+ 24 +y+1/2,-x+3/4,-z+1/4
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x+3/4,-y+3/4,+z
+ -5 +z,-x+3/4,-y+3/4
+ -6 -y+3/4,+z,-x+3/4
+ -7 +z+3/4,-x+1/2,+y+1/4
+ -8 +y+1/4,+z+3/4,-x+1/2
+ -9 -y+1/2,+z+3/4,+x+1/4
+ -10 +x+1/4,-y+1/2,+z+3/4
+ -11 +z+3/4,+x+1/4,-y+1/2
+ -12 -x+1/2,+y+1/4,+z+3/4
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y+3/4,-x+3/4,+z
+ -17 +z,-y+3/4,-x+3/4
+ -18 -x+3/4,+z,-y+3/4
+ -19 +z+3/4,-y+1/2,+x+1/4
+ -20 +x+1/4,+z+3/4,-y+1/2
+ -21 -x+1/2,+z+3/4,+y+1/4
+ -22 +y+1/4,-x+1/2,+z+3/4
+ -23 +z+3/4,+y+1/4,-x+1/2
+ -24 -y+1/2,+x+1/4,+z+3/4
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x+1/4,+y+3/4,-z+1/2
+ 105 -z,+x+3/4,+y+3/4
+ 106 +y+1/4,-z+1/2,+x+3/4
+ 107 -z+1/4,+x,-y+1/4
+ 108 -y+3/4,-z+3/4,+x
+ 109 +y+1/2,-z+3/4,-x+1/4
+ 110 -x+3/4,+y,-z+3/4
+ 111 -z+1/4,-x+1/4,+y
+ 112 +x+1/2,-y+1/4,-z+3/4
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y+1/4,+x+3/4,-z+1/2
+ 117 -z,+y+3/4,+x+3/4
+ 118 +x+1/4,-z+1/2,+y+3/4
+ 119 -z+1/4,+y,-x+1/4
+ 120 -x+3/4,-z+3/4,+y
+ 121 +x+1/2,-z+3/4,-y+1/4
+ 122 -y+3/4,+x,-z+3/4
+ 123 -z+1/4,-y+1/4,+x
+ 124 +y+1/2,-x+1/4,-z+3/4
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x+3/4,-y+1/4,+z+1/2
+ -105 +z,-x+1/4,-y+1/4
+ -106 -y+3/4,+z+1/2,-x+1/4
+ -107 +z+3/4,-x,+y+3/4
+ -108 +y+1/4,+z+1/4,-x
+ -109 -y+1/2,+z+1/4,+x+3/4
+ -110 +x+1/4,-y,+z+1/4
+ -111 +z+3/4,+x+3/4,-y
+ -112 -x+1/2,+y+3/4,+z+1/4
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y+3/4,-x+1/4,+z+1/2
+ -117 +z,-y+1/4,-x+1/4
+ -118 -x+3/4,+z+1/2,-y+1/4
+ -119 +z+3/4,-y,+x+3/4
+ -120 +x+1/4,+z+1/4,-y
+ -121 -x+1/2,+z+1/4,+y+3/4
+ -122 +y+1/4,-x,+z+1/4
+ -123 +z+3/4,+y+3/4,-x
+ -124 -y+1/2,+x+3/4,+z+1/4
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+3/4,+y+1/4,-z+1/2
+ 205 -z+1/2,+x+1/4,+y+3/4
+ 206 +y+3/4,-z,+x+3/4
+ 207 -z+3/4,+x+1/2,-y+1/4
+ 208 -y+1/4,-z+1/4,+x
+ 209 +y,-z+1/4,-x+1/4
+ 210 -x+1/4,+y+1/2,-z+3/4
+ 211 -z+3/4,-x+3/4,+y
+ 212 +x,-y+3/4,-z+3/4
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+3/4,+x+1/4,-z+1/2
+ 217 -z+1/2,+y+1/4,+x+3/4
+ 218 +x+3/4,-z,+y+3/4
+ 219 -z+3/4,+y+1/2,-x+1/4
+ 220 -x+1/4,-z+1/4,+y
+ 221 +x,-z+1/4,-y+1/4
+ 222 -y+1/4,+x+1/2,-z+3/4
+ 223 -z+3/4,-y+3/4,+x
+ 224 +y,-x+3/4,-z+3/4
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/4,-y+3/4,+z+1/2
+ -205 +z+1/2,-x+3/4,-y+1/4
+ -206 -y+1/4,+z,-x+1/4
+ -207 +z+1/4,-x+1/2,+y+3/4
+ -208 +y+3/4,+z+3/4,-x
+ -209 -y,+z+3/4,+x+3/4
+ -210 +x+3/4,-y+1/2,+z+1/4
+ -211 +z+1/4,+x+1/4,-y
+ -212 -x,+y+1/4,+z+1/4
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/4,-x+3/4,+z+1/2
+ -217 +z+1/2,-y+3/4,-x+1/4
+ -218 -x+1/4,+z,-y+1/4
+ -219 +z+1/4,-y+1/2,+x+3/4
+ -220 +x+3/4,+z+3/4,-y
+ -221 -x,+z+3/4,+y+3/4
+ -222 +y+3/4,-x+1/2,+z+1/4
+ -223 +z+1/4,+y+1/4,-x
+ -224 -y,+x+1/4,+z+1/4
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+3/4,+y+3/4,-z
+ 305 -z+1/2,+x+3/4,+y+1/4
+ 306 +y+3/4,-z+1/2,+x+1/4
+ 307 -z+3/4,+x,-y+3/4
+ 308 -y+1/4,-z+3/4,+x+1/2
+ 309 +y,-z+3/4,-x+3/4
+ 310 -x+1/4,+y,-z+1/4
+ 311 -z+3/4,-x+1/4,+y+1/2
+ 312 +x,-y+1/4,-z+1/4
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+3/4,+x+3/4,-z
+ 317 -z+1/2,+y+3/4,+x+1/4
+ 318 +x+3/4,-z+1/2,+y+1/4
+ 319 -z+3/4,+y,-x+3/4
+ 320 -x+1/4,-z+3/4,+y+1/2
+ 321 +x,-z+3/4,-y+3/4
+ 322 -y+1/4,+x,-z+1/4
+ 323 -z+3/4,-y+1/4,+x+1/2
+ 324 +y,-x+1/4,-z+1/4
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/4,-y+1/4,+z
+ -305 +z+1/2,-x+1/4,-y+3/4
+ -306 -y+1/4,+z+1/2,-x+3/4
+ -307 +z+1/4,-x,+y+1/4
+ -308 +y+3/4,+z+1/4,-x+1/2
+ -309 -y,+z+1/4,+x+1/4
+ -310 +x+3/4,-y,+z+3/4
+ -311 +z+1/4,+x+3/4,-y+1/2
+ -312 -x,+y+3/4,+z+3/4
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/4,-x+1/4,+z
+ -317 +z+1/2,-y+1/4,-x+3/4
+ -318 -x+1/4,+z+1/2,-y+3/4
+ -319 +z+1/4,-y,+x+1/4
+ -320 +x+3/4,+z+1/4,-y+1/2
+ -321 -x,+z+1/4,+y+1/4
+ -322 +y+3/4,-x,+z+3/4
+ -323 +z+1/4,+y+3/4,-x+1/2
+ -324 -y,+x+3/4,+z+3/4
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -446,8 +446,8 @@ SI1 0.125 0.125 0.125 1.0 Uiso 0.025 8
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Si 8.0
-
+ Si 8.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Si
_chemical_formula_weight 28.09
diff --git a/scripts/Engineering/ENGINX/phase_info/SIC_ALPHA.cif b/scripts/Engineering/ENGINX/phase_info/SIC_ALPHA.cif
index 307beee61aca8eb3660cff265ffb0dea63869608..0e57b149c094bffcf0b3c9d3c1a8c72b1b84966d 100644
Binary files a/scripts/Engineering/ENGINX/phase_info/SIC_ALPHA.cif and b/scripts/Engineering/ENGINX/phase_info/SIC_ALPHA.cif differ
diff --git a/scripts/Engineering/ENGINX/phase_info/SN_ALPHA.cif b/scripts/Engineering/ENGINX/phase_info/SN_ALPHA.cif
index 2aecfb31f200a59efeefe608b8690f27cf88a642..3d44eef0b8146f71c91ec3db7b48f6616c9747ce 100644
--- a/scripts/Engineering/ENGINX/phase_info/SN_ALPHA.cif
+++ b/scripts/Engineering/ENGINX/phase_info/SN_ALPHA.cif
@@ -235,198 +235,198 @@ _cell_volume 273.25851
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F d 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x+1/4,+y+1/4,-z
- 5 -z,+x+1/4,+y+1/4
- 6 +y+1/4,-z,+x+1/4
- 7 -z+1/4,+x+1/2,-y+3/4
- 8 -y+3/4,-z+1/4,+x+1/2
- 9 +y+1/2,-z+1/4,-x+3/4
- 10 -x+3/4,+y+1/2,-z+1/4
- 11 -z+1/4,-x+3/4,+y+1/2
- 12 +x+1/2,-y+3/4,-z+1/4
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y+1/4,+x+1/4,-z
- 17 -z,+y+1/4,+x+1/4
- 18 +x+1/4,-z,+y+1/4
- 19 -z+1/4,+y+1/2,-x+3/4
- 20 -x+3/4,-z+1/4,+y+1/2
- 21 +x+1/2,-z+1/4,-y+3/4
- 22 -y+3/4,+x+1/2,-z+1/4
- 23 -z+1/4,-y+3/4,+x+1/2
- 24 +y+1/2,-x+3/4,-z+1/4
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x+3/4,-y+3/4,+z
- -5 +z,-x+3/4,-y+3/4
- -6 -y+3/4,+z,-x+3/4
- -7 +z+3/4,-x+1/2,+y+1/4
- -8 +y+1/4,+z+3/4,-x+1/2
- -9 -y+1/2,+z+3/4,+x+1/4
- -10 +x+1/4,-y+1/2,+z+3/4
- -11 +z+3/4,+x+1/4,-y+1/2
- -12 -x+1/2,+y+1/4,+z+3/4
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y+3/4,-x+3/4,+z
- -17 +z,-y+3/4,-x+3/4
- -18 -x+3/4,+z,-y+3/4
- -19 +z+3/4,-y+1/2,+x+1/4
- -20 +x+1/4,+z+3/4,-y+1/2
- -21 -x+1/2,+z+3/4,+y+1/4
- -22 +y+1/4,-x+1/2,+z+3/4
- -23 +z+3/4,+y+1/4,-x+1/2
- -24 -y+1/2,+x+1/4,+z+3/4
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x+1/4,+y+3/4,-z+1/2
- 105 -z,+x+3/4,+y+3/4
- 106 +y+1/4,-z+1/2,+x+3/4
- 107 -z+1/4,+x,-y+1/4
- 108 -y+3/4,-z+3/4,+x
- 109 +y+1/2,-z+3/4,-x+1/4
- 110 -x+3/4,+y,-z+3/4
- 111 -z+1/4,-x+1/4,+y
- 112 +x+1/2,-y+1/4,-z+3/4
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y+1/4,+x+3/4,-z+1/2
- 117 -z,+y+3/4,+x+3/4
- 118 +x+1/4,-z+1/2,+y+3/4
- 119 -z+1/4,+y,-x+1/4
- 120 -x+3/4,-z+3/4,+y
- 121 +x+1/2,-z+3/4,-y+1/4
- 122 -y+3/4,+x,-z+3/4
- 123 -z+1/4,-y+1/4,+x
- 124 +y+1/2,-x+1/4,-z+3/4
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x+3/4,-y+1/4,+z+1/2
- -105 +z,-x+1/4,-y+1/4
- -106 -y+3/4,+z+1/2,-x+1/4
- -107 +z+3/4,-x,+y+3/4
- -108 +y+1/4,+z+1/4,-x
- -109 -y+1/2,+z+1/4,+x+3/4
- -110 +x+1/4,-y,+z+1/4
- -111 +z+3/4,+x+3/4,-y
- -112 -x+1/2,+y+3/4,+z+1/4
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y+3/4,-x+1/4,+z+1/2
- -117 +z,-y+1/4,-x+1/4
- -118 -x+3/4,+z+1/2,-y+1/4
- -119 +z+3/4,-y,+x+3/4
- -120 +x+1/4,+z+1/4,-y
- -121 -x+1/2,+z+1/4,+y+3/4
- -122 +y+1/4,-x,+z+1/4
- -123 +z+3/4,+y+3/4,-x
- -124 -y+1/2,+x+3/4,+z+1/4
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+3/4,+y+1/4,-z+1/2
- 205 -z+1/2,+x+1/4,+y+3/4
- 206 +y+3/4,-z,+x+3/4
- 207 -z+3/4,+x+1/2,-y+1/4
- 208 -y+1/4,-z+1/4,+x
- 209 +y,-z+1/4,-x+1/4
- 210 -x+1/4,+y+1/2,-z+3/4
- 211 -z+3/4,-x+3/4,+y
- 212 +x,-y+3/4,-z+3/4
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+3/4,+x+1/4,-z+1/2
- 217 -z+1/2,+y+1/4,+x+3/4
- 218 +x+3/4,-z,+y+3/4
- 219 -z+3/4,+y+1/2,-x+1/4
- 220 -x+1/4,-z+1/4,+y
- 221 +x,-z+1/4,-y+1/4
- 222 -y+1/4,+x+1/2,-z+3/4
- 223 -z+3/4,-y+3/4,+x
- 224 +y,-x+3/4,-z+3/4
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/4,-y+3/4,+z+1/2
- -205 +z+1/2,-x+3/4,-y+1/4
- -206 -y+1/4,+z,-x+1/4
- -207 +z+1/4,-x+1/2,+y+3/4
- -208 +y+3/4,+z+3/4,-x
- -209 -y,+z+3/4,+x+3/4
- -210 +x+3/4,-y+1/2,+z+1/4
- -211 +z+1/4,+x+1/4,-y
- -212 -x,+y+1/4,+z+1/4
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/4,-x+3/4,+z+1/2
- -217 +z+1/2,-y+3/4,-x+1/4
- -218 -x+1/4,+z,-y+1/4
- -219 +z+1/4,-y+1/2,+x+3/4
- -220 +x+3/4,+z+3/4,-y
- -221 -x,+z+3/4,+y+3/4
- -222 +y+3/4,-x+1/2,+z+1/4
- -223 +z+1/4,+y+1/4,-x
- -224 -y,+x+1/4,+z+1/4
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+3/4,+y+3/4,-z
- 305 -z+1/2,+x+3/4,+y+1/4
- 306 +y+3/4,-z+1/2,+x+1/4
- 307 -z+3/4,+x,-y+3/4
- 308 -y+1/4,-z+3/4,+x+1/2
- 309 +y,-z+3/4,-x+3/4
- 310 -x+1/4,+y,-z+1/4
- 311 -z+3/4,-x+1/4,+y+1/2
- 312 +x,-y+1/4,-z+1/4
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+3/4,+x+3/4,-z
- 317 -z+1/2,+y+3/4,+x+1/4
- 318 +x+3/4,-z+1/2,+y+1/4
- 319 -z+3/4,+y,-x+3/4
- 320 -x+1/4,-z+3/4,+y+1/2
- 321 +x,-z+3/4,-y+3/4
- 322 -y+1/4,+x,-z+1/4
- 323 -z+3/4,-y+1/4,+x+1/2
- 324 +y,-x+1/4,-z+1/4
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/4,-y+1/4,+z
- -305 +z+1/2,-x+1/4,-y+3/4
- -306 -y+1/4,+z+1/2,-x+3/4
- -307 +z+1/4,-x,+y+1/4
- -308 +y+3/4,+z+1/4,-x+1/2
- -309 -y,+z+1/4,+x+1/4
- -310 +x+3/4,-y,+z+3/4
- -311 +z+1/4,+x+3/4,-y+1/2
- -312 -x,+y+3/4,+z+3/4
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/4,-x+1/4,+z
- -317 +z+1/2,-y+1/4,-x+3/4
- -318 -x+1/4,+z+1/2,-y+3/4
- -319 +z+1/4,-y,+x+1/4
- -320 +x+3/4,+z+1/4,-y+1/2
- -321 -x,+z+1/4,+y+1/4
- -322 +y+3/4,-x,+z+3/4
- -323 +z+1/4,+y+3/4,-x+1/2
- -324 -y,+x+3/4,+z+3/4
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x+1/4,+y+1/4,-z
+ 5 -z,+x+1/4,+y+1/4
+ 6 +y+1/4,-z,+x+1/4
+ 7 -z+1/4,+x+1/2,-y+3/4
+ 8 -y+3/4,-z+1/4,+x+1/2
+ 9 +y+1/2,-z+1/4,-x+3/4
+ 10 -x+3/4,+y+1/2,-z+1/4
+ 11 -z+1/4,-x+3/4,+y+1/2
+ 12 +x+1/2,-y+3/4,-z+1/4
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y+1/4,+x+1/4,-z
+ 17 -z,+y+1/4,+x+1/4
+ 18 +x+1/4,-z,+y+1/4
+ 19 -z+1/4,+y+1/2,-x+3/4
+ 20 -x+3/4,-z+1/4,+y+1/2
+ 21 +x+1/2,-z+1/4,-y+3/4
+ 22 -y+3/4,+x+1/2,-z+1/4
+ 23 -z+1/4,-y+3/4,+x+1/2
+ 24 +y+1/2,-x+3/4,-z+1/4
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x+3/4,-y+3/4,+z
+ -5 +z,-x+3/4,-y+3/4
+ -6 -y+3/4,+z,-x+3/4
+ -7 +z+3/4,-x+1/2,+y+1/4
+ -8 +y+1/4,+z+3/4,-x+1/2
+ -9 -y+1/2,+z+3/4,+x+1/4
+ -10 +x+1/4,-y+1/2,+z+3/4
+ -11 +z+3/4,+x+1/4,-y+1/2
+ -12 -x+1/2,+y+1/4,+z+3/4
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y+3/4,-x+3/4,+z
+ -17 +z,-y+3/4,-x+3/4
+ -18 -x+3/4,+z,-y+3/4
+ -19 +z+3/4,-y+1/2,+x+1/4
+ -20 +x+1/4,+z+3/4,-y+1/2
+ -21 -x+1/2,+z+3/4,+y+1/4
+ -22 +y+1/4,-x+1/2,+z+3/4
+ -23 +z+3/4,+y+1/4,-x+1/2
+ -24 -y+1/2,+x+1/4,+z+3/4
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x+1/4,+y+3/4,-z+1/2
+ 105 -z,+x+3/4,+y+3/4
+ 106 +y+1/4,-z+1/2,+x+3/4
+ 107 -z+1/4,+x,-y+1/4
+ 108 -y+3/4,-z+3/4,+x
+ 109 +y+1/2,-z+3/4,-x+1/4
+ 110 -x+3/4,+y,-z+3/4
+ 111 -z+1/4,-x+1/4,+y
+ 112 +x+1/2,-y+1/4,-z+3/4
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y+1/4,+x+3/4,-z+1/2
+ 117 -z,+y+3/4,+x+3/4
+ 118 +x+1/4,-z+1/2,+y+3/4
+ 119 -z+1/4,+y,-x+1/4
+ 120 -x+3/4,-z+3/4,+y
+ 121 +x+1/2,-z+3/4,-y+1/4
+ 122 -y+3/4,+x,-z+3/4
+ 123 -z+1/4,-y+1/4,+x
+ 124 +y+1/2,-x+1/4,-z+3/4
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x+3/4,-y+1/4,+z+1/2
+ -105 +z,-x+1/4,-y+1/4
+ -106 -y+3/4,+z+1/2,-x+1/4
+ -107 +z+3/4,-x,+y+3/4
+ -108 +y+1/4,+z+1/4,-x
+ -109 -y+1/2,+z+1/4,+x+3/4
+ -110 +x+1/4,-y,+z+1/4
+ -111 +z+3/4,+x+3/4,-y
+ -112 -x+1/2,+y+3/4,+z+1/4
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y+3/4,-x+1/4,+z+1/2
+ -117 +z,-y+1/4,-x+1/4
+ -118 -x+3/4,+z+1/2,-y+1/4
+ -119 +z+3/4,-y,+x+3/4
+ -120 +x+1/4,+z+1/4,-y
+ -121 -x+1/2,+z+1/4,+y+3/4
+ -122 +y+1/4,-x,+z+1/4
+ -123 +z+3/4,+y+3/4,-x
+ -124 -y+1/2,+x+3/4,+z+1/4
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+3/4,+y+1/4,-z+1/2
+ 205 -z+1/2,+x+1/4,+y+3/4
+ 206 +y+3/4,-z,+x+3/4
+ 207 -z+3/4,+x+1/2,-y+1/4
+ 208 -y+1/4,-z+1/4,+x
+ 209 +y,-z+1/4,-x+1/4
+ 210 -x+1/4,+y+1/2,-z+3/4
+ 211 -z+3/4,-x+3/4,+y
+ 212 +x,-y+3/4,-z+3/4
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+3/4,+x+1/4,-z+1/2
+ 217 -z+1/2,+y+1/4,+x+3/4
+ 218 +x+3/4,-z,+y+3/4
+ 219 -z+3/4,+y+1/2,-x+1/4
+ 220 -x+1/4,-z+1/4,+y
+ 221 +x,-z+1/4,-y+1/4
+ 222 -y+1/4,+x+1/2,-z+3/4
+ 223 -z+3/4,-y+3/4,+x
+ 224 +y,-x+3/4,-z+3/4
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/4,-y+3/4,+z+1/2
+ -205 +z+1/2,-x+3/4,-y+1/4
+ -206 -y+1/4,+z,-x+1/4
+ -207 +z+1/4,-x+1/2,+y+3/4
+ -208 +y+3/4,+z+3/4,-x
+ -209 -y,+z+3/4,+x+3/4
+ -210 +x+3/4,-y+1/2,+z+1/4
+ -211 +z+1/4,+x+1/4,-y
+ -212 -x,+y+1/4,+z+1/4
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/4,-x+3/4,+z+1/2
+ -217 +z+1/2,-y+3/4,-x+1/4
+ -218 -x+1/4,+z,-y+1/4
+ -219 +z+1/4,-y+1/2,+x+3/4
+ -220 +x+3/4,+z+3/4,-y
+ -221 -x,+z+3/4,+y+3/4
+ -222 +y+3/4,-x+1/2,+z+1/4
+ -223 +z+1/4,+y+1/4,-x
+ -224 -y,+x+1/4,+z+1/4
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+3/4,+y+3/4,-z
+ 305 -z+1/2,+x+3/4,+y+1/4
+ 306 +y+3/4,-z+1/2,+x+1/4
+ 307 -z+3/4,+x,-y+3/4
+ 308 -y+1/4,-z+3/4,+x+1/2
+ 309 +y,-z+3/4,-x+3/4
+ 310 -x+1/4,+y,-z+1/4
+ 311 -z+3/4,-x+1/4,+y+1/2
+ 312 +x,-y+1/4,-z+1/4
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+3/4,+x+3/4,-z
+ 317 -z+1/2,+y+3/4,+x+1/4
+ 318 +x+3/4,-z+1/2,+y+1/4
+ 319 -z+3/4,+y,-x+3/4
+ 320 -x+1/4,-z+3/4,+y+1/2
+ 321 +x,-z+3/4,-y+3/4
+ 322 -y+1/4,+x,-z+1/4
+ 323 -z+3/4,-y+1/4,+x+1/2
+ 324 +y,-x+1/4,-z+1/4
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/4,-y+1/4,+z
+ -305 +z+1/2,-x+1/4,-y+3/4
+ -306 -y+1/4,+z+1/2,-x+3/4
+ -307 +z+1/4,-x,+y+1/4
+ -308 +y+3/4,+z+1/4,-x+1/2
+ -309 -y,+z+1/4,+x+1/4
+ -310 +x+3/4,-y,+z+3/4
+ -311 +z+1/4,+x+3/4,-y+1/2
+ -312 -x,+y+3/4,+z+3/4
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/4,-x+1/4,+z
+ -317 +z+1/2,-y+1/4,-x+3/4
+ -318 -x+1/4,+z+1/2,-y+3/4
+ -319 +z+1/4,-y,+x+1/4
+ -320 +x+3/4,+z+1/4,-y+1/2
+ -321 -x,+z+1/4,+y+1/4
+ -322 +y+3/4,-x,+z+3/4
+ -323 +z+1/4,+y+3/4,-x+1/2
+ -324 -y,+x+3/4,+z+3/4
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -446,8 +446,8 @@ SN1 0.125 0.125 0.125 1.0 Uiso 0.025 8
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Sn 8.0
-
+ Sn 8.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Sn
_chemical_formula_weight 118.69
diff --git a/scripts/Engineering/ENGINX/phase_info/SN_BETA.cif b/scripts/Engineering/ENGINX/phase_info/SN_BETA.cif
index cd08ad6926dd887d3ec64fb2aae72621000fea0d..453f51fd9d0d4f66414f7cc49f496a0d8a71836f 100644
--- a/scripts/Engineering/ENGINX/phase_info/SN_BETA.cif
+++ b/scripts/Engineering/ENGINX/phase_info/SN_BETA.cif
@@ -235,38 +235,38 @@ _cell_volume 108.18825
_symmetry_cell_setting tetragonal
_symmetry_space_group_name_H-M I42/amd
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 -y+1/4,+x+3/4,+z+1/2
- 3 -x+1/2,-y,+z
- 4 +y+1/4,-x+1/4,+z+1/2
- 5 -x,+y,+z
- 6 -y+1/4,-x+3/4,+z+1/2
- 7 +x+1/2,-y,+z
- 8 +y+1/4,+x+1/4,+z+1/2
- -1 -x,-y,-z
- -2 +y+3/4,-x+1/4,-z+1/2
- -3 +x+1/2,+y,-z
- -4 -y+3/4,+x+3/4,-z+1/2
- -5 +x,-y,-z
- -6 +y+3/4,+x+1/4,-z+1/2
- -7 -x+1/2,+y,-z
- -8 -y+3/4,-x+3/4,-z+1/2
- 101 +x+1/2,+y+1/2,+z+1/2
- 102 -y+3/4,+x+1/4,+z
- 103 -x,-y+1/2,+z+1/2
- 104 +y+3/4,-x+3/4,+z
- 105 -x+1/2,+y+1/2,+z+1/2
- 106 -y+3/4,-x+1/4,+z
- 107 +x,-y+1/2,+z+1/2
- 108 +y+3/4,+x+3/4,+z
- -101 -x+1/2,-y+1/2,-z+1/2
- -102 +y+1/4,-x+3/4,-z
- -103 +x,+y+1/2,-z+1/2
- -104 -y+1/4,+x+1/4,-z
- -105 +x+1/2,-y+1/2,-z+1/2
- -106 +y+1/4,+x+3/4,-z
- -107 -x,+y+1/2,-z+1/2
- -108 -y+1/4,-x+1/4,-z
+ 1 +x,+y,+z
+ 2 -y+1/4,+x+3/4,+z+1/2
+ 3 -x+1/2,-y,+z
+ 4 +y+1/4,-x+1/4,+z+1/2
+ 5 -x,+y,+z
+ 6 -y+1/4,-x+3/4,+z+1/2
+ 7 +x+1/2,-y,+z
+ 8 +y+1/4,+x+1/4,+z+1/2
+ -1 -x,-y,-z
+ -2 +y+3/4,-x+1/4,-z+1/2
+ -3 +x+1/2,+y,-z
+ -4 -y+3/4,+x+3/4,-z+1/2
+ -5 +x,-y,-z
+ -6 +y+3/4,+x+1/4,-z+1/2
+ -7 -x+1/2,+y,-z
+ -8 -y+3/4,-x+3/4,-z+1/2
+ 101 +x+1/2,+y+1/2,+z+1/2
+ 102 -y+3/4,+x+1/4,+z
+ 103 -x,-y+1/2,+z+1/2
+ 104 +y+3/4,-x+3/4,+z
+ 105 -x+1/2,+y+1/2,+z+1/2
+ 106 -y+3/4,-x+1/4,+z
+ 107 +x,-y+1/2,+z+1/2
+ 108 +y+3/4,+x+3/4,+z
+ -101 -x+1/2,-y+1/2,-z+1/2
+ -102 +y+1/4,-x+3/4,-z
+ -103 +x,+y+1/2,-z+1/2
+ -104 -y+1/4,+x+1/4,-z
+ -105 +x+1/2,-y+1/2,-z+1/2
+ -106 +y+1/4,+x+3/4,-z
+ -107 -x,+y+1/2,-z+1/2
+ -108 -y+1/4,-x+1/4,-z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -286,8 +286,8 @@ SN1 0.0 0.0 0.0 1.0 Uiso 0.025 8
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Sn 8.0
-
+ Sn 8.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Sn
_chemical_formula_weight 118.69
diff --git a/scripts/Engineering/ENGINX/phase_info/TI_ALPHA.cif b/scripts/Engineering/ENGINX/phase_info/TI_ALPHA.cif
index fbd0d6b3dfd155d4a0c879d5db0a4c6537241235..de345b640860c87f41e084dae18a2ccb89911936 100644
--- a/scripts/Engineering/ENGINX/phase_info/TI_ALPHA.cif
+++ b/scripts/Engineering/ENGINX/phase_info/TI_ALPHA.cif
@@ -235,30 +235,30 @@ _cell_volume 35.06113
_symmetry_cell_setting hexagonal
_symmetry_space_group_name_H-M P63/mmc
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 x-y,+x,+z+1/2
- 3 -y,x-y,+z
- 4 -x,-y,+z+1/2
- 5 y-x,-x,+z
- 6 +y,y-x,+z+1/2
- 7 y-x,+y,+z
- 8 -x,y-x,+z+1/2
- 9 -y,-x,+z
- 10 x-y,-y,+z+1/2
- 11 +x,x-y,+z
- 12 +y,+x,+z+1/2
- -1 -x,-y,-z
- -2 y-x,-x,-z+1/2
- -3 +y,y-x,-z
- -4 +x,+y,-z+1/2
- -5 x-y,+x,-z
- -6 -y,x-y,-z+1/2
- -7 x-y,-y,-z
- -8 +x,x-y,-z+1/2
- -9 +y,+x,-z
- -10 y-x,+y,-z+1/2
- -11 -x,y-x,-z
- -12 -y,-x,-z+1/2
+ 1 +x,+y,+z
+ 2 x-y,+x,+z+1/2
+ 3 -y,x-y,+z
+ 4 -x,-y,+z+1/2
+ 5 y-x,-x,+z
+ 6 +y,y-x,+z+1/2
+ 7 y-x,+y,+z
+ 8 -x,y-x,+z+1/2
+ 9 -y,-x,+z
+ 10 x-y,-y,+z+1/2
+ 11 +x,x-y,+z
+ 12 +y,+x,+z+1/2
+ -1 -x,-y,-z
+ -2 y-x,-x,-z+1/2
+ -3 +y,y-x,-z
+ -4 +x,+y,-z+1/2
+ -5 x-y,+x,-z
+ -6 -y,x-y,-z+1/2
+ -7 x-y,-y,-z
+ -8 +x,x-y,-z+1/2
+ -9 +y,+x,-z
+ -10 y-x,+y,-z+1/2
+ -11 -x,y-x,-z
+ -12 -y,-x,-z+1/2
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -278,8 +278,8 @@ TI1 0.33333 0.66667 0.25 1.0 Uiso 0.025 2
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Ti 2.0
-
+ Ti 2.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Ti
_chemical_formula_weight 47.90
diff --git a/scripts/Engineering/ENGINX/phase_info/TI_BETA.cif b/scripts/Engineering/ENGINX/phase_info/TI_BETA.cif
index d2e2055ef376cd600ebd59b056942461820cc141..332e5c3043f2c9bd5abae4ff2fa208518f9ba726 100644
--- a/scripts/Engineering/ENGINX/phase_info/TI_BETA.cif
+++ b/scripts/Engineering/ENGINX/phase_info/TI_BETA.cif
@@ -235,102 +235,102 @@ _cell_volume 34.82803
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "I m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x+1/2,+y+1/2,+z+1/2
- 102 +z+1/2,+x+1/2,+y+1/2
- 103 +y+1/2,+z+1/2,+x+1/2
- 104 +x+1/2,+y+1/2,-z+1/2
- 105 -z+1/2,+x+1/2,+y+1/2
- 106 +y+1/2,-z+1/2,+x+1/2
- 107 -z+1/2,+x+1/2,-y+1/2
- 108 -y+1/2,-z+1/2,+x+1/2
- 109 +y+1/2,-z+1/2,-x+1/2
- 110 -x+1/2,+y+1/2,-z+1/2
- 111 -z+1/2,-x+1/2,+y+1/2
- 112 +x+1/2,-y+1/2,-z+1/2
- 113 +y+1/2,+x+1/2,+z+1/2
- 114 +z+1/2,+y+1/2,+x+1/2
- 115 +x+1/2,+z+1/2,+y+1/2
- 116 +y+1/2,+x+1/2,-z+1/2
- 117 -z+1/2,+y+1/2,+x+1/2
- 118 +x+1/2,-z+1/2,+y+1/2
- 119 -z+1/2,+y+1/2,-x+1/2
- 120 -x+1/2,-z+1/2,+y+1/2
- 121 +x+1/2,-z+1/2,-y+1/2
- 122 -y+1/2,+x+1/2,-z+1/2
- 123 -z+1/2,-y+1/2,+x+1/2
- 124 +y+1/2,-x+1/2,-z+1/2
- -101 -x+1/2,-y+1/2,-z+1/2
- -102 -z+1/2,-x+1/2,-y+1/2
- -103 -y+1/2,-z+1/2,-x+1/2
- -104 -x+1/2,-y+1/2,+z+1/2
- -105 +z+1/2,-x+1/2,-y+1/2
- -106 -y+1/2,+z+1/2,-x+1/2
- -107 +z+1/2,-x+1/2,+y+1/2
- -108 +y+1/2,+z+1/2,-x+1/2
- -109 -y+1/2,+z+1/2,+x+1/2
- -110 +x+1/2,-y+1/2,+z+1/2
- -111 +z+1/2,+x+1/2,-y+1/2
- -112 -x+1/2,+y+1/2,+z+1/2
- -113 -y+1/2,-x+1/2,-z+1/2
- -114 -z+1/2,-y+1/2,-x+1/2
- -115 -x+1/2,-z+1/2,-y+1/2
- -116 -y+1/2,-x+1/2,+z+1/2
- -117 +z+1/2,-y+1/2,-x+1/2
- -118 -x+1/2,+z+1/2,-y+1/2
- -119 +z+1/2,-y+1/2,+x+1/2
- -120 +x+1/2,+z+1/2,-y+1/2
- -121 -x+1/2,+z+1/2,+y+1/2
- -122 +y+1/2,-x+1/2,+z+1/2
- -123 +z+1/2,+y+1/2,-x+1/2
- -124 -y+1/2,+x+1/2,+z+1/2
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x+1/2,+y+1/2,+z+1/2
+ 102 +z+1/2,+x+1/2,+y+1/2
+ 103 +y+1/2,+z+1/2,+x+1/2
+ 104 +x+1/2,+y+1/2,-z+1/2
+ 105 -z+1/2,+x+1/2,+y+1/2
+ 106 +y+1/2,-z+1/2,+x+1/2
+ 107 -z+1/2,+x+1/2,-y+1/2
+ 108 -y+1/2,-z+1/2,+x+1/2
+ 109 +y+1/2,-z+1/2,-x+1/2
+ 110 -x+1/2,+y+1/2,-z+1/2
+ 111 -z+1/2,-x+1/2,+y+1/2
+ 112 +x+1/2,-y+1/2,-z+1/2
+ 113 +y+1/2,+x+1/2,+z+1/2
+ 114 +z+1/2,+y+1/2,+x+1/2
+ 115 +x+1/2,+z+1/2,+y+1/2
+ 116 +y+1/2,+x+1/2,-z+1/2
+ 117 -z+1/2,+y+1/2,+x+1/2
+ 118 +x+1/2,-z+1/2,+y+1/2
+ 119 -z+1/2,+y+1/2,-x+1/2
+ 120 -x+1/2,-z+1/2,+y+1/2
+ 121 +x+1/2,-z+1/2,-y+1/2
+ 122 -y+1/2,+x+1/2,-z+1/2
+ 123 -z+1/2,-y+1/2,+x+1/2
+ 124 +y+1/2,-x+1/2,-z+1/2
+ -101 -x+1/2,-y+1/2,-z+1/2
+ -102 -z+1/2,-x+1/2,-y+1/2
+ -103 -y+1/2,-z+1/2,-x+1/2
+ -104 -x+1/2,-y+1/2,+z+1/2
+ -105 +z+1/2,-x+1/2,-y+1/2
+ -106 -y+1/2,+z+1/2,-x+1/2
+ -107 +z+1/2,-x+1/2,+y+1/2
+ -108 +y+1/2,+z+1/2,-x+1/2
+ -109 -y+1/2,+z+1/2,+x+1/2
+ -110 +x+1/2,-y+1/2,+z+1/2
+ -111 +z+1/2,+x+1/2,-y+1/2
+ -112 -x+1/2,+y+1/2,+z+1/2
+ -113 -y+1/2,-x+1/2,-z+1/2
+ -114 -z+1/2,-y+1/2,-x+1/2
+ -115 -x+1/2,-z+1/2,-y+1/2
+ -116 -y+1/2,-x+1/2,+z+1/2
+ -117 +z+1/2,-y+1/2,-x+1/2
+ -118 -x+1/2,+z+1/2,-y+1/2
+ -119 +z+1/2,-y+1/2,+x+1/2
+ -120 +x+1/2,+z+1/2,-y+1/2
+ -121 -x+1/2,+z+1/2,+y+1/2
+ -122 +y+1/2,-x+1/2,+z+1/2
+ -123 +z+1/2,+y+1/2,-x+1/2
+ -124 -y+1/2,+x+1/2,+z+1/2
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -350,8 +350,8 @@ TI1 0.0 0.0 0.0 1.0 Uiso 0.025 2
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Ti 2.0
-
+ Ti 2.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Ti
_chemical_formula_weight 47.90
diff --git a/scripts/Engineering/ENGINX/phase_info/UDIMET.cif b/scripts/Engineering/ENGINX/phase_info/UDIMET.cif
index 76d8ff5aaec92303f4255056bc957692ac8e7b1e..a0c26d6b380391ee32bc94b5e645b25575a04aaa 100644
--- a/scripts/Engineering/ENGINX/phase_info/UDIMET.cif
+++ b/scripts/Engineering/ENGINX/phase_info/UDIMET.cif
@@ -235,198 +235,198 @@ _cell_volume 45.94145
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "F m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x,+y+1/2,+z+1/2
- 102 +z,+x+1/2,+y+1/2
- 103 +y,+z+1/2,+x+1/2
- 104 +x,+y+1/2,-z+1/2
- 105 -z,+x+1/2,+y+1/2
- 106 +y,-z+1/2,+x+1/2
- 107 -z,+x+1/2,-y+1/2
- 108 -y,-z+1/2,+x+1/2
- 109 +y,-z+1/2,-x+1/2
- 110 -x,+y+1/2,-z+1/2
- 111 -z,-x+1/2,+y+1/2
- 112 +x,-y+1/2,-z+1/2
- 113 +y,+x+1/2,+z+1/2
- 114 +z,+y+1/2,+x+1/2
- 115 +x,+z+1/2,+y+1/2
- 116 +y,+x+1/2,-z+1/2
- 117 -z,+y+1/2,+x+1/2
- 118 +x,-z+1/2,+y+1/2
- 119 -z,+y+1/2,-x+1/2
- 120 -x,-z+1/2,+y+1/2
- 121 +x,-z+1/2,-y+1/2
- 122 -y,+x+1/2,-z+1/2
- 123 -z,-y+1/2,+x+1/2
- 124 +y,-x+1/2,-z+1/2
- -101 -x,-y+1/2,-z+1/2
- -102 -z,-x+1/2,-y+1/2
- -103 -y,-z+1/2,-x+1/2
- -104 -x,-y+1/2,+z+1/2
- -105 +z,-x+1/2,-y+1/2
- -106 -y,+z+1/2,-x+1/2
- -107 +z,-x+1/2,+y+1/2
- -108 +y,+z+1/2,-x+1/2
- -109 -y,+z+1/2,+x+1/2
- -110 +x,-y+1/2,+z+1/2
- -111 +z,+x+1/2,-y+1/2
- -112 -x,+y+1/2,+z+1/2
- -113 -y,-x+1/2,-z+1/2
- -114 -z,-y+1/2,-x+1/2
- -115 -x,-z+1/2,-y+1/2
- -116 -y,-x+1/2,+z+1/2
- -117 +z,-y+1/2,-x+1/2
- -118 -x,+z+1/2,-y+1/2
- -119 +z,-y+1/2,+x+1/2
- -120 +x,+z+1/2,-y+1/2
- -121 -x,+z+1/2,+y+1/2
- -122 +y,-x+1/2,+z+1/2
- -123 +z,+y+1/2,-x+1/2
- -124 -y,+x+1/2,+z+1/2
- 201 +x+1/2,+y,+z+1/2
- 202 +z+1/2,+x,+y+1/2
- 203 +y+1/2,+z,+x+1/2
- 204 +x+1/2,+y,-z+1/2
- 205 -z+1/2,+x,+y+1/2
- 206 +y+1/2,-z,+x+1/2
- 207 -z+1/2,+x,-y+1/2
- 208 -y+1/2,-z,+x+1/2
- 209 +y+1/2,-z,-x+1/2
- 210 -x+1/2,+y,-z+1/2
- 211 -z+1/2,-x,+y+1/2
- 212 +x+1/2,-y,-z+1/2
- 213 +y+1/2,+x,+z+1/2
- 214 +z+1/2,+y,+x+1/2
- 215 +x+1/2,+z,+y+1/2
- 216 +y+1/2,+x,-z+1/2
- 217 -z+1/2,+y,+x+1/2
- 218 +x+1/2,-z,+y+1/2
- 219 -z+1/2,+y,-x+1/2
- 220 -x+1/2,-z,+y+1/2
- 221 +x+1/2,-z,-y+1/2
- 222 -y+1/2,+x,-z+1/2
- 223 -z+1/2,-y,+x+1/2
- 224 +y+1/2,-x,-z+1/2
- -201 -x+1/2,-y,-z+1/2
- -202 -z+1/2,-x,-y+1/2
- -203 -y+1/2,-z,-x+1/2
- -204 -x+1/2,-y,+z+1/2
- -205 +z+1/2,-x,-y+1/2
- -206 -y+1/2,+z,-x+1/2
- -207 +z+1/2,-x,+y+1/2
- -208 +y+1/2,+z,-x+1/2
- -209 -y+1/2,+z,+x+1/2
- -210 +x+1/2,-y,+z+1/2
- -211 +z+1/2,+x,-y+1/2
- -212 -x+1/2,+y,+z+1/2
- -213 -y+1/2,-x,-z+1/2
- -214 -z+1/2,-y,-x+1/2
- -215 -x+1/2,-z,-y+1/2
- -216 -y+1/2,-x,+z+1/2
- -217 +z+1/2,-y,-x+1/2
- -218 -x+1/2,+z,-y+1/2
- -219 +z+1/2,-y,+x+1/2
- -220 +x+1/2,+z,-y+1/2
- -221 -x+1/2,+z,+y+1/2
- -222 +y+1/2,-x,+z+1/2
- -223 +z+1/2,+y,-x+1/2
- -224 -y+1/2,+x,+z+1/2
- 301 +x+1/2,+y+1/2,+z
- 302 +z+1/2,+x+1/2,+y
- 303 +y+1/2,+z+1/2,+x
- 304 +x+1/2,+y+1/2,-z
- 305 -z+1/2,+x+1/2,+y
- 306 +y+1/2,-z+1/2,+x
- 307 -z+1/2,+x+1/2,-y
- 308 -y+1/2,-z+1/2,+x
- 309 +y+1/2,-z+1/2,-x
- 310 -x+1/2,+y+1/2,-z
- 311 -z+1/2,-x+1/2,+y
- 312 +x+1/2,-y+1/2,-z
- 313 +y+1/2,+x+1/2,+z
- 314 +z+1/2,+y+1/2,+x
- 315 +x+1/2,+z+1/2,+y
- 316 +y+1/2,+x+1/2,-z
- 317 -z+1/2,+y+1/2,+x
- 318 +x+1/2,-z+1/2,+y
- 319 -z+1/2,+y+1/2,-x
- 320 -x+1/2,-z+1/2,+y
- 321 +x+1/2,-z+1/2,-y
- 322 -y+1/2,+x+1/2,-z
- 323 -z+1/2,-y+1/2,+x
- 324 +y+1/2,-x+1/2,-z
- -301 -x+1/2,-y+1/2,-z
- -302 -z+1/2,-x+1/2,-y
- -303 -y+1/2,-z+1/2,-x
- -304 -x+1/2,-y+1/2,+z
- -305 +z+1/2,-x+1/2,-y
- -306 -y+1/2,+z+1/2,-x
- -307 +z+1/2,-x+1/2,+y
- -308 +y+1/2,+z+1/2,-x
- -309 -y+1/2,+z+1/2,+x
- -310 +x+1/2,-y+1/2,+z
- -311 +z+1/2,+x+1/2,-y
- -312 -x+1/2,+y+1/2,+z
- -313 -y+1/2,-x+1/2,-z
- -314 -z+1/2,-y+1/2,-x
- -315 -x+1/2,-z+1/2,-y
- -316 -y+1/2,-x+1/2,+z
- -317 +z+1/2,-y+1/2,-x
- -318 -x+1/2,+z+1/2,-y
- -319 +z+1/2,-y+1/2,+x
- -320 +x+1/2,+z+1/2,-y
- -321 -x+1/2,+z+1/2,+y
- -322 +y+1/2,-x+1/2,+z
- -323 +z+1/2,+y+1/2,-x
- -324 -y+1/2,+x+1/2,+z
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x,+y+1/2,+z+1/2
+ 102 +z,+x+1/2,+y+1/2
+ 103 +y,+z+1/2,+x+1/2
+ 104 +x,+y+1/2,-z+1/2
+ 105 -z,+x+1/2,+y+1/2
+ 106 +y,-z+1/2,+x+1/2
+ 107 -z,+x+1/2,-y+1/2
+ 108 -y,-z+1/2,+x+1/2
+ 109 +y,-z+1/2,-x+1/2
+ 110 -x,+y+1/2,-z+1/2
+ 111 -z,-x+1/2,+y+1/2
+ 112 +x,-y+1/2,-z+1/2
+ 113 +y,+x+1/2,+z+1/2
+ 114 +z,+y+1/2,+x+1/2
+ 115 +x,+z+1/2,+y+1/2
+ 116 +y,+x+1/2,-z+1/2
+ 117 -z,+y+1/2,+x+1/2
+ 118 +x,-z+1/2,+y+1/2
+ 119 -z,+y+1/2,-x+1/2
+ 120 -x,-z+1/2,+y+1/2
+ 121 +x,-z+1/2,-y+1/2
+ 122 -y,+x+1/2,-z+1/2
+ 123 -z,-y+1/2,+x+1/2
+ 124 +y,-x+1/2,-z+1/2
+ -101 -x,-y+1/2,-z+1/2
+ -102 -z,-x+1/2,-y+1/2
+ -103 -y,-z+1/2,-x+1/2
+ -104 -x,-y+1/2,+z+1/2
+ -105 +z,-x+1/2,-y+1/2
+ -106 -y,+z+1/2,-x+1/2
+ -107 +z,-x+1/2,+y+1/2
+ -108 +y,+z+1/2,-x+1/2
+ -109 -y,+z+1/2,+x+1/2
+ -110 +x,-y+1/2,+z+1/2
+ -111 +z,+x+1/2,-y+1/2
+ -112 -x,+y+1/2,+z+1/2
+ -113 -y,-x+1/2,-z+1/2
+ -114 -z,-y+1/2,-x+1/2
+ -115 -x,-z+1/2,-y+1/2
+ -116 -y,-x+1/2,+z+1/2
+ -117 +z,-y+1/2,-x+1/2
+ -118 -x,+z+1/2,-y+1/2
+ -119 +z,-y+1/2,+x+1/2
+ -120 +x,+z+1/2,-y+1/2
+ -121 -x,+z+1/2,+y+1/2
+ -122 +y,-x+1/2,+z+1/2
+ -123 +z,+y+1/2,-x+1/2
+ -124 -y,+x+1/2,+z+1/2
+ 201 +x+1/2,+y,+z+1/2
+ 202 +z+1/2,+x,+y+1/2
+ 203 +y+1/2,+z,+x+1/2
+ 204 +x+1/2,+y,-z+1/2
+ 205 -z+1/2,+x,+y+1/2
+ 206 +y+1/2,-z,+x+1/2
+ 207 -z+1/2,+x,-y+1/2
+ 208 -y+1/2,-z,+x+1/2
+ 209 +y+1/2,-z,-x+1/2
+ 210 -x+1/2,+y,-z+1/2
+ 211 -z+1/2,-x,+y+1/2
+ 212 +x+1/2,-y,-z+1/2
+ 213 +y+1/2,+x,+z+1/2
+ 214 +z+1/2,+y,+x+1/2
+ 215 +x+1/2,+z,+y+1/2
+ 216 +y+1/2,+x,-z+1/2
+ 217 -z+1/2,+y,+x+1/2
+ 218 +x+1/2,-z,+y+1/2
+ 219 -z+1/2,+y,-x+1/2
+ 220 -x+1/2,-z,+y+1/2
+ 221 +x+1/2,-z,-y+1/2
+ 222 -y+1/2,+x,-z+1/2
+ 223 -z+1/2,-y,+x+1/2
+ 224 +y+1/2,-x,-z+1/2
+ -201 -x+1/2,-y,-z+1/2
+ -202 -z+1/2,-x,-y+1/2
+ -203 -y+1/2,-z,-x+1/2
+ -204 -x+1/2,-y,+z+1/2
+ -205 +z+1/2,-x,-y+1/2
+ -206 -y+1/2,+z,-x+1/2
+ -207 +z+1/2,-x,+y+1/2
+ -208 +y+1/2,+z,-x+1/2
+ -209 -y+1/2,+z,+x+1/2
+ -210 +x+1/2,-y,+z+1/2
+ -211 +z+1/2,+x,-y+1/2
+ -212 -x+1/2,+y,+z+1/2
+ -213 -y+1/2,-x,-z+1/2
+ -214 -z+1/2,-y,-x+1/2
+ -215 -x+1/2,-z,-y+1/2
+ -216 -y+1/2,-x,+z+1/2
+ -217 +z+1/2,-y,-x+1/2
+ -218 -x+1/2,+z,-y+1/2
+ -219 +z+1/2,-y,+x+1/2
+ -220 +x+1/2,+z,-y+1/2
+ -221 -x+1/2,+z,+y+1/2
+ -222 +y+1/2,-x,+z+1/2
+ -223 +z+1/2,+y,-x+1/2
+ -224 -y+1/2,+x,+z+1/2
+ 301 +x+1/2,+y+1/2,+z
+ 302 +z+1/2,+x+1/2,+y
+ 303 +y+1/2,+z+1/2,+x
+ 304 +x+1/2,+y+1/2,-z
+ 305 -z+1/2,+x+1/2,+y
+ 306 +y+1/2,-z+1/2,+x
+ 307 -z+1/2,+x+1/2,-y
+ 308 -y+1/2,-z+1/2,+x
+ 309 +y+1/2,-z+1/2,-x
+ 310 -x+1/2,+y+1/2,-z
+ 311 -z+1/2,-x+1/2,+y
+ 312 +x+1/2,-y+1/2,-z
+ 313 +y+1/2,+x+1/2,+z
+ 314 +z+1/2,+y+1/2,+x
+ 315 +x+1/2,+z+1/2,+y
+ 316 +y+1/2,+x+1/2,-z
+ 317 -z+1/2,+y+1/2,+x
+ 318 +x+1/2,-z+1/2,+y
+ 319 -z+1/2,+y+1/2,-x
+ 320 -x+1/2,-z+1/2,+y
+ 321 +x+1/2,-z+1/2,-y
+ 322 -y+1/2,+x+1/2,-z
+ 323 -z+1/2,-y+1/2,+x
+ 324 +y+1/2,-x+1/2,-z
+ -301 -x+1/2,-y+1/2,-z
+ -302 -z+1/2,-x+1/2,-y
+ -303 -y+1/2,-z+1/2,-x
+ -304 -x+1/2,-y+1/2,+z
+ -305 +z+1/2,-x+1/2,-y
+ -306 -y+1/2,+z+1/2,-x
+ -307 +z+1/2,-x+1/2,+y
+ -308 +y+1/2,+z+1/2,-x
+ -309 -y+1/2,+z+1/2,+x
+ -310 +x+1/2,-y+1/2,+z
+ -311 +z+1/2,+x+1/2,-y
+ -312 -x+1/2,+y+1/2,+z
+ -313 -y+1/2,-x+1/2,-z
+ -314 -z+1/2,-y+1/2,-x
+ -315 -x+1/2,-z+1/2,-y
+ -316 -y+1/2,-x+1/2,+z
+ -317 +z+1/2,-y+1/2,-x
+ -318 -x+1/2,+z+1/2,-y
+ -319 +z+1/2,-y+1/2,+x
+ -320 +x+1/2,+z+1/2,-y
+ -321 -x+1/2,+z+1/2,+y
+ -322 +y+1/2,-x+1/2,+z
+ -323 +z+1/2,+y+1/2,-x
+ -324 -y+1/2,+x+1/2,+z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -446,8 +446,8 @@ NI1 0.0 0.0 0.0 1.0 Uiso 0.025 4
loop_ _atom_type_symbol
_atom_type_number_in_cell
- Ni 4.0
-
+ Ni 4.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Ni
_chemical_formula_weight 58.71
diff --git a/scripts/Engineering/ENGINX/phase_info/U_ALPHA.cif b/scripts/Engineering/ENGINX/phase_info/U_ALPHA.cif
index 65329b57749dd337bb4d4161bf7aeb5f15fec830..a4ab3f793061b5c5107ce0fce6c0a2d3464556ca 100644
--- a/scripts/Engineering/ENGINX/phase_info/U_ALPHA.cif
+++ b/scripts/Engineering/ENGINX/phase_info/U_ALPHA.cif
@@ -235,22 +235,22 @@ _cell_volume 82.95989
_symmetry_cell_setting orthorhombic
_symmetry_space_group_name_H-M "C m c m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 -x,+y,+z
- 3 +x,-y,+z+1/2
- 4 -x,-y,+z+1/2
- -1 -x,-y,-z
- -2 +x,-y,-z
- -3 -x,+y,-z+1/2
- -4 +x,+y,-z+1/2
- 101 +x+1/2,+y+1/2,+z
- 102 -x+1/2,+y+1/2,+z
- 103 +x+1/2,-y+1/2,+z+1/2
- 104 -x+1/2,-y+1/2,+z+1/2
- -101 -x+1/2,-y+1/2,-z
- -102 +x+1/2,-y+1/2,-z
- -103 -x+1/2,+y+1/2,-z+1/2
- -104 +x+1/2,+y+1/2,-z+1/2
+ 1 +x,+y,+z
+ 2 -x,+y,+z
+ 3 +x,-y,+z+1/2
+ 4 -x,-y,+z+1/2
+ -1 -x,-y,-z
+ -2 +x,-y,-z
+ -3 -x,+y,-z+1/2
+ -4 +x,+y,-z+1/2
+ 101 +x+1/2,+y+1/2,+z
+ 102 -x+1/2,+y+1/2,+z
+ 103 +x+1/2,-y+1/2,+z+1/2
+ 104 -x+1/2,-y+1/2,+z+1/2
+ -101 -x+1/2,-y+1/2,-z
+ -102 +x+1/2,-y+1/2,-z
+ -103 -x+1/2,+y+1/2,-z+1/2
+ -104 +x+1/2,+y+1/2,-z+1/2
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -265,13 +265,13 @@ loop_
_atom_site_thermal_displace_type
_atom_site_U_iso_or_equiv
_atom_site_symmetry_multiplicity
-U
+U
U1 0.0 0.10274 0.25 1.0 Uiso 0.025 4
loop_ _atom_type_symbol
_atom_type_number_in_cell
- U 4.0
-
+ U 4.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum U
_chemical_formula_weight 238.07
diff --git a/scripts/Engineering/ENGINX/phase_info/W.cif b/scripts/Engineering/ENGINX/phase_info/W.cif
index 34dc667c89230fcaabbb0ce7ebb9837679f1702d..73a0ce56947d4dede294fb155eca44ae571e5f4b 100644
--- a/scripts/Engineering/ENGINX/phase_info/W.cif
+++ b/scripts/Engineering/ENGINX/phase_info/W.cif
@@ -235,102 +235,102 @@ _cell_volume 31.67747
_symmetry_cell_setting cubic
_symmetry_space_group_name_H-M "I m 3 m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 +z,+x,+y
- 3 +y,+z,+x
- 4 +x,+y,-z
- 5 -z,+x,+y
- 6 +y,-z,+x
- 7 -z,+x,-y
- 8 -y,-z,+x
- 9 +y,-z,-x
- 10 -x,+y,-z
- 11 -z,-x,+y
- 12 +x,-y,-z
- 13 +y,+x,+z
- 14 +z,+y,+x
- 15 +x,+z,+y
- 16 +y,+x,-z
- 17 -z,+y,+x
- 18 +x,-z,+y
- 19 -z,+y,-x
- 20 -x,-z,+y
- 21 +x,-z,-y
- 22 -y,+x,-z
- 23 -z,-y,+x
- 24 +y,-x,-z
- -1 -x,-y,-z
- -2 -z,-x,-y
- -3 -y,-z,-x
- -4 -x,-y,+z
- -5 +z,-x,-y
- -6 -y,+z,-x
- -7 +z,-x,+y
- -8 +y,+z,-x
- -9 -y,+z,+x
- -10 +x,-y,+z
- -11 +z,+x,-y
- -12 -x,+y,+z
- -13 -y,-x,-z
- -14 -z,-y,-x
- -15 -x,-z,-y
- -16 -y,-x,+z
- -17 +z,-y,-x
- -18 -x,+z,-y
- -19 +z,-y,+x
- -20 +x,+z,-y
- -21 -x,+z,+y
- -22 +y,-x,+z
- -23 +z,+y,-x
- -24 -y,+x,+z
- 101 +x+1/2,+y+1/2,+z+1/2
- 102 +z+1/2,+x+1/2,+y+1/2
- 103 +y+1/2,+z+1/2,+x+1/2
- 104 +x+1/2,+y+1/2,-z+1/2
- 105 -z+1/2,+x+1/2,+y+1/2
- 106 +y+1/2,-z+1/2,+x+1/2
- 107 -z+1/2,+x+1/2,-y+1/2
- 108 -y+1/2,-z+1/2,+x+1/2
- 109 +y+1/2,-z+1/2,-x+1/2
- 110 -x+1/2,+y+1/2,-z+1/2
- 111 -z+1/2,-x+1/2,+y+1/2
- 112 +x+1/2,-y+1/2,-z+1/2
- 113 +y+1/2,+x+1/2,+z+1/2
- 114 +z+1/2,+y+1/2,+x+1/2
- 115 +x+1/2,+z+1/2,+y+1/2
- 116 +y+1/2,+x+1/2,-z+1/2
- 117 -z+1/2,+y+1/2,+x+1/2
- 118 +x+1/2,-z+1/2,+y+1/2
- 119 -z+1/2,+y+1/2,-x+1/2
- 120 -x+1/2,-z+1/2,+y+1/2
- 121 +x+1/2,-z+1/2,-y+1/2
- 122 -y+1/2,+x+1/2,-z+1/2
- 123 -z+1/2,-y+1/2,+x+1/2
- 124 +y+1/2,-x+1/2,-z+1/2
- -101 -x+1/2,-y+1/2,-z+1/2
- -102 -z+1/2,-x+1/2,-y+1/2
- -103 -y+1/2,-z+1/2,-x+1/2
- -104 -x+1/2,-y+1/2,+z+1/2
- -105 +z+1/2,-x+1/2,-y+1/2
- -106 -y+1/2,+z+1/2,-x+1/2
- -107 +z+1/2,-x+1/2,+y+1/2
- -108 +y+1/2,+z+1/2,-x+1/2
- -109 -y+1/2,+z+1/2,+x+1/2
- -110 +x+1/2,-y+1/2,+z+1/2
- -111 +z+1/2,+x+1/2,-y+1/2
- -112 -x+1/2,+y+1/2,+z+1/2
- -113 -y+1/2,-x+1/2,-z+1/2
- -114 -z+1/2,-y+1/2,-x+1/2
- -115 -x+1/2,-z+1/2,-y+1/2
- -116 -y+1/2,-x+1/2,+z+1/2
- -117 +z+1/2,-y+1/2,-x+1/2
- -118 -x+1/2,+z+1/2,-y+1/2
- -119 +z+1/2,-y+1/2,+x+1/2
- -120 +x+1/2,+z+1/2,-y+1/2
- -121 -x+1/2,+z+1/2,+y+1/2
- -122 +y+1/2,-x+1/2,+z+1/2
- -123 +z+1/2,+y+1/2,-x+1/2
- -124 -y+1/2,+x+1/2,+z+1/2
+ 1 +x,+y,+z
+ 2 +z,+x,+y
+ 3 +y,+z,+x
+ 4 +x,+y,-z
+ 5 -z,+x,+y
+ 6 +y,-z,+x
+ 7 -z,+x,-y
+ 8 -y,-z,+x
+ 9 +y,-z,-x
+ 10 -x,+y,-z
+ 11 -z,-x,+y
+ 12 +x,-y,-z
+ 13 +y,+x,+z
+ 14 +z,+y,+x
+ 15 +x,+z,+y
+ 16 +y,+x,-z
+ 17 -z,+y,+x
+ 18 +x,-z,+y
+ 19 -z,+y,-x
+ 20 -x,-z,+y
+ 21 +x,-z,-y
+ 22 -y,+x,-z
+ 23 -z,-y,+x
+ 24 +y,-x,-z
+ -1 -x,-y,-z
+ -2 -z,-x,-y
+ -3 -y,-z,-x
+ -4 -x,-y,+z
+ -5 +z,-x,-y
+ -6 -y,+z,-x
+ -7 +z,-x,+y
+ -8 +y,+z,-x
+ -9 -y,+z,+x
+ -10 +x,-y,+z
+ -11 +z,+x,-y
+ -12 -x,+y,+z
+ -13 -y,-x,-z
+ -14 -z,-y,-x
+ -15 -x,-z,-y
+ -16 -y,-x,+z
+ -17 +z,-y,-x
+ -18 -x,+z,-y
+ -19 +z,-y,+x
+ -20 +x,+z,-y
+ -21 -x,+z,+y
+ -22 +y,-x,+z
+ -23 +z,+y,-x
+ -24 -y,+x,+z
+ 101 +x+1/2,+y+1/2,+z+1/2
+ 102 +z+1/2,+x+1/2,+y+1/2
+ 103 +y+1/2,+z+1/2,+x+1/2
+ 104 +x+1/2,+y+1/2,-z+1/2
+ 105 -z+1/2,+x+1/2,+y+1/2
+ 106 +y+1/2,-z+1/2,+x+1/2
+ 107 -z+1/2,+x+1/2,-y+1/2
+ 108 -y+1/2,-z+1/2,+x+1/2
+ 109 +y+1/2,-z+1/2,-x+1/2
+ 110 -x+1/2,+y+1/2,-z+1/2
+ 111 -z+1/2,-x+1/2,+y+1/2
+ 112 +x+1/2,-y+1/2,-z+1/2
+ 113 +y+1/2,+x+1/2,+z+1/2
+ 114 +z+1/2,+y+1/2,+x+1/2
+ 115 +x+1/2,+z+1/2,+y+1/2
+ 116 +y+1/2,+x+1/2,-z+1/2
+ 117 -z+1/2,+y+1/2,+x+1/2
+ 118 +x+1/2,-z+1/2,+y+1/2
+ 119 -z+1/2,+y+1/2,-x+1/2
+ 120 -x+1/2,-z+1/2,+y+1/2
+ 121 +x+1/2,-z+1/2,-y+1/2
+ 122 -y+1/2,+x+1/2,-z+1/2
+ 123 -z+1/2,-y+1/2,+x+1/2
+ 124 +y+1/2,-x+1/2,-z+1/2
+ -101 -x+1/2,-y+1/2,-z+1/2
+ -102 -z+1/2,-x+1/2,-y+1/2
+ -103 -y+1/2,-z+1/2,-x+1/2
+ -104 -x+1/2,-y+1/2,+z+1/2
+ -105 +z+1/2,-x+1/2,-y+1/2
+ -106 -y+1/2,+z+1/2,-x+1/2
+ -107 +z+1/2,-x+1/2,+y+1/2
+ -108 +y+1/2,+z+1/2,-x+1/2
+ -109 -y+1/2,+z+1/2,+x+1/2
+ -110 +x+1/2,-y+1/2,+z+1/2
+ -111 +z+1/2,+x+1/2,-y+1/2
+ -112 -x+1/2,+y+1/2,+z+1/2
+ -113 -y+1/2,-x+1/2,-z+1/2
+ -114 -z+1/2,-y+1/2,-x+1/2
+ -115 -x+1/2,-z+1/2,-y+1/2
+ -116 -y+1/2,-x+1/2,+z+1/2
+ -117 +z+1/2,-y+1/2,-x+1/2
+ -118 -x+1/2,+z+1/2,-y+1/2
+ -119 +z+1/2,-y+1/2,+x+1/2
+ -120 +x+1/2,+z+1/2,-y+1/2
+ -121 -x+1/2,+z+1/2,+y+1/2
+ -122 +y+1/2,-x+1/2,+z+1/2
+ -123 +z+1/2,+y+1/2,-x+1/2
+ -124 -y+1/2,+x+1/2,+z+1/2
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -345,13 +345,13 @@ loop_
_atom_site_thermal_displace_type
_atom_site_U_iso_or_equiv
_atom_site_symmetry_multiplicity
-W
+W
W1 0.0 0.0 0.0 1.0 Uiso 0.025 2
loop_ _atom_type_symbol
_atom_type_number_in_cell
- W 2.0
-
+ W 2.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum W
_chemical_formula_weight 183.85
diff --git a/scripts/Engineering/ENGINX/phase_info/W2C.cif b/scripts/Engineering/ENGINX/phase_info/W2C.cif
index 839f41745b4ab35576b6ce8a6891a44488ffa19a..d0b205cf2c181fca80d571adcfe1090cfa5b6888 100644
--- a/scripts/Engineering/ENGINX/phase_info/W2C.cif
+++ b/scripts/Engineering/ENGINX/phase_info/W2C.cif
@@ -235,18 +235,18 @@ _cell_volume 36.46649
_symmetry_cell_setting hexagonal
_symmetry_space_group_name_H-M "P 63 / m m c"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 x-y,+x,+z+1/2
- 3 -y,x-y,+z
- 4 -x,-y,+z+1/2
- 5 y-x,-x,+z
- 6 +y,y-x,+z+1/2
- 7 +y,+x,+z
- 8 y-x,+y,+z+1/2
- 9 -x,y-x,+z
- 10 -y,-x,+z+1/2
- 11 x-y,-y,+z
- 12 +x,x-y,+z+1/2
+ 1 +x,+y,+z
+ 2 x-y,+x,+z+1/2
+ 3 -y,x-y,+z
+ 4 -x,-y,+z+1/2
+ 5 y-x,-x,+z
+ 6 +y,y-x,+z+1/2
+ 7 +y,+x,+z
+ 8 y-x,+y,+z+1/2
+ 9 -x,y-x,+z
+ 10 -y,-x,+z+1/2
+ 11 x-y,-y,+z
+ 12 +x,x-y,+z+1/2
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -261,15 +261,15 @@ loop_
_atom_site_thermal_displace_type
_atom_site_U_iso_or_equiv
_atom_site_symmetry_multiplicity
-W
+W
0.66667 0.33333 0.0 1.0 Uiso 0.025 4
-W
+W
i 0.33333 0.66667 0.5 1.0 Uiso 3.0 4
loop_ _atom_type_symbol
_atom_type_number_in_cell
- W 8.0
-
+ W 8.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum W
_chemical_formula_weight 183.85
diff --git a/scripts/Engineering/ENGINX/phase_info/WC.cif b/scripts/Engineering/ENGINX/phase_info/WC.cif
index ed4cb462e1c002d0529443bab43532efcbe1fdbb..4ab820dda4ad36aeb648a896edbb24f2fc6d0b01 100644
--- a/scripts/Engineering/ENGINX/phase_info/WC.cif
+++ b/scripts/Engineering/ENGINX/phase_info/WC.cif
@@ -235,18 +235,18 @@ _cell_volume 20.82739
_symmetry_cell_setting hexagonal
_symmetry_space_group_name_H-M "P 6 m m m"
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 x-y,+x,+z
- 3 -y,x-y,+z
- 4 -x,-y,+z
- 5 y-x,-x,+z
- 6 +y,y-x,+z
- 7 y-x,+y,+z
- 8 -x,y-x,+z
- 9 -y,-x,+z
- 10 x-y,-y,+z
- 11 +x,x-y,+z
- 12 +y,+x,+z
+ 1 +x,+y,+z
+ 2 x-y,+x,+z
+ 3 -y,x-y,+z
+ 4 -x,-y,+z
+ 5 y-x,-x,+z
+ 6 +y,y-x,+z
+ 7 y-x,+y,+z
+ 8 -x,y-x,+z
+ 9 -y,-x,+z
+ 10 x-y,-y,+z
+ 11 +x,x-y,+z
+ 12 +y,+x,+z
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -261,16 +261,16 @@ loop_
_atom_site_thermal_displace_type
_atom_site_U_iso_or_equiv
_atom_site_symmetry_multiplicity
-W
+W
W1 0.0 0.0 0.0 1.0 Uiso 0.025 1
-C
+C
C2 0.33333 0.66667 0.5 1.0 Uiso 0.025 2
loop_ _atom_type_symbol
_atom_type_number_in_cell
- W 1.0
- C 2.0
-
+ W 1.0
+ C 2.0
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum "C2 W"
_chemical_formula_weight 207.87
diff --git a/scripts/Engineering/ENGINX/phase_info/ZR_ALPHA.cif b/scripts/Engineering/ENGINX/phase_info/ZR_ALPHA.cif
index 027617031dc6fe6be6266f4adc3ee6ea9f5b965d..b131cb218da76caf0ca019af5aabda9e5a069bdc 100644
--- a/scripts/Engineering/ENGINX/phase_info/ZR_ALPHA.cif
+++ b/scripts/Engineering/ENGINX/phase_info/ZR_ALPHA.cif
@@ -219,30 +219,30 @@ _cell_volume 46.57077
_symmetry_cell_setting hexagonal
_symmetry_space_group_name_H-M P63/mmc
loop_ _symmetry_equiv_pos_site_id _symmetry_equiv_pos_as_xyz
- 1 +x,+y,+z
- 2 x-y,+x,+z+1/2
- 3 -y,x-y,+z
- 4 -x,-y,+z+1/2
- 5 y-x,-x,+z
- 6 +y,y-x,+z+1/2
- 7 y-x,+y,+z
- 8 -x,y-x,+z+1/2
- 9 -y,-x,+z
- 10 x-y,-y,+z+1/2
- 11 +x,x-y,+z
- 12 +y,+x,+z+1/2
- -1 -x,-y,-z
- -2 y-x,-x,-z+1/2
- -3 +y,y-x,-z
- -4 +x,+y,-z+1/2
- -5 x-y,+x,-z
- -6 -y,x-y,-z+1/2
- -7 x-y,-y,-z
- -8 +x,x-y,-z+1/2
- -9 +y,+x,-z
- -10 y-x,+y,-z+1/2
- -11 -x,y-x,-z
- -12 -y,-x,-z+1/2
+ 1 +x,+y,+z
+ 2 x-y,+x,+z+1/2
+ 3 -y,x-y,+z
+ 4 -x,-y,+z+1/2
+ 5 y-x,-x,+z
+ 6 +y,y-x,+z+1/2
+ 7 y-x,+y,+z
+ 8 -x,y-x,+z+1/2
+ 9 -y,-x,+z
+ 10 x-y,-y,+z+1/2
+ 11 +x,x-y,+z
+ 12 +y,+x,+z+1/2
+ -1 -x,-y,-z
+ -2 y-x,-x,-z+1/2
+ -3 +y,y-x,-z
+ -4 +x,+y,-z+1/2
+ -5 x-y,+x,-z
+ -6 -y,x-y,-z+1/2
+ -7 x-y,-y,-z
+ -8 +x,x-y,-z+1/2
+ -9 +y,+x,-z
+ -10 y-x,+y,-z+1/2
+ -11 -x,y-x,-z
+ -12 -y,-x,-z+1/2
# ATOMIC COORDINATES AND DISPLACEMENT PARAMETERS
@@ -259,7 +259,7 @@ loop_
_atom_site_symmetry_multiplicity
Zr
ZR1 0.33333 0.66667 0.25 1.0 Uiso 0.025 2
-
+
# If you change Z, be sure to change all 3 of the following
_chemical_formula_sum Zr
_chemical_formula_weight 91.22
@@ -394,7 +394,7 @@ _refine_ls_R_Fsqd_factor ""
_pd_proc_ls_background_function
; GSAS Background function number 4 with 4 terms.
Power series in Q**2n/n!
- 1: 1.00000 2: 0.00000 3: 0.00000 4: 0.00000
+ 1: 1.00000 2: 0.00000 3: 0.00000 4: 0.00000
;
_exptl_absorpt_process_details
diff --git a/scripts/Engineering/template_ENGINX_241391_236516_North_and_South_banks.prm b/scripts/Engineering/template_ENGINX_241391_236516_North_and_South_banks.prm
index f755e9a2e75c26f29e2f3012338060041479e9e9..b350e2932bd793628ad4c5fb6630096ef901870d 100644
--- a/scripts/Engineering/template_ENGINX_241391_236516_North_and_South_banks.prm
+++ b/scripts/Engineering/template_ENGINX_241391_236516_North_and_South_banks.prm
@@ -1,36 +1,36 @@
-ID ENGIN-X CALIBRATION WITH CeO2 and V-Nb
-INS BANK 2
+ID ENGIN-X CALIBRATION WITH CeO2 and V-Nb
+INS BANK 2
INS FPATH1 50
-INS HTYPE PNTR
-INS NAME North_bank and South_bank
-INS NDET 1200 5 240 1
-INS TYPE 1
-INS TOFLIM 10.00 80.00 0.0004
-INS MONITR 2402 16.0000 43.0000
-INS DEADTI 0.00
-INS OGPK1 0.183305E+05 -0.387262E+02
-INS OGPK2 0.839000E+00 0.700000E+00 0.320000E+02 0.149000E+01
-INS OGPK3 -0.686285E+01 0.220000E+01 0.108719E+01
-INS CALIB 241391 236516 ceo2
-INS INCBM ob+mon_236516_North_and_South_banks.his
-INS FCSTBL det_pars_93875_93874_North_and_South_banks.hdf
-INS 1I ITYP 0 1.0000 80.0000 0
-INS 1BNKPAR 1.502 89.341 0.720 0.000 0.000 0 0
-INS 1 ICONS 18306.98 2.99 14.44
-INS 1PRCF1 3 21 0.00050
-INS 1PRCF11 0.274872E+00 0.179289E-01 0.379667E-01 0.388241E+03
-INS 1PRCF12 0.768656E+02 0.432991E+02 0.000000E+00 0.514723E+01
-INS 1PRCF13 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
-INS 1PRCF14 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
-INS 1PRCF15 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
-INS 1PRCF16 0.000000E+00
-INS 2I ITYP 0 1.0000 80.0000 0
-INS 2BNKPAR 1.479 -90.157 -0.216 0.000 0.000 0 0
-INS 2 ICONS 18497.75 -29.68 -26.50
-INS 2PRCF1 3 21 0.00050
-INS 2PRCF11 0.804794E+00 0.336823E-02 0.460981E+00 0.000000E+00
-INS 2PRCF12 0.107075E+04 0.432991E+02 0.000000E+00 0.652544E+01
-INS 2PRCF13 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
-INS 2PRCF14 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
-INS 2PRCF15 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
-INS 2PRCF16 0.000000E+00
+INS HTYPE PNTR
+INS NAME North_bank and South_bank
+INS NDET 1200 5 240 1
+INS TYPE 1
+INS TOFLIM 10.00 80.00 0.0004
+INS MONITR 2402 16.0000 43.0000
+INS DEADTI 0.00
+INS OGPK1 0.183305E+05 -0.387262E+02
+INS OGPK2 0.839000E+00 0.700000E+00 0.320000E+02 0.149000E+01
+INS OGPK3 -0.686285E+01 0.220000E+01 0.108719E+01
+INS CALIB 241391 236516 ceo2
+INS INCBM ob+mon_236516_North_and_South_banks.his
+INS FCSTBL det_pars_93875_93874_North_and_South_banks.hdf
+INS 1I ITYP 0 1.0000 80.0000 0
+INS 1BNKPAR 1.502 89.341 0.720 0.000 0.000 0 0
+INS 1 ICONS 18306.98 2.99 14.44
+INS 1PRCF1 3 21 0.00050
+INS 1PRCF11 0.274872E+00 0.179289E-01 0.379667E-01 0.388241E+03
+INS 1PRCF12 0.768656E+02 0.432991E+02 0.000000E+00 0.514723E+01
+INS 1PRCF13 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
+INS 1PRCF14 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
+INS 1PRCF15 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
+INS 1PRCF16 0.000000E+00
+INS 2I ITYP 0 1.0000 80.0000 0
+INS 2BNKPAR 1.479 -90.157 -0.216 0.000 0.000 0 0
+INS 2 ICONS 18497.75 -29.68 -26.50
+INS 2PRCF1 3 21 0.00050
+INS 2PRCF11 0.804794E+00 0.336823E-02 0.460981E+00 0.000000E+00
+INS 2PRCF12 0.107075E+04 0.432991E+02 0.000000E+00 0.652544E+01
+INS 2PRCF13 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
+INS 2PRCF14 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
+INS 2PRCF15 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
+INS 2PRCF16 0.000000E+00
diff --git a/scripts/Engineering/template_ENGINX_241391_236516_North_bank.prm b/scripts/Engineering/template_ENGINX_241391_236516_North_bank.prm
index 3615abbca232e1604c633b16f280b8c91cc3e722..36f9c944d99eaeb5048ec9043f4a3907ffdfbfc1 100644
--- a/scripts/Engineering/template_ENGINX_241391_236516_North_bank.prm
+++ b/scripts/Engineering/template_ENGINX_241391_236516_North_bank.prm
@@ -1,25 +1,25 @@
-INS BANK 1
-INS FPATH1 50
-INS HTYPE PNTR
-INS NAME North_bank
-INS NDET 1200 5 240 1
-INS TYPE 1
-INS TOFLIM 12.00 80.00 0.0004
-INS MONITR 2402 16.0000 43.0000
-INS DEADTI 0.00
-INS OGPK1 0.183305E+05 -0.387262E+02
-INS OGPK2 0.839000E+00 0.700000E+00 0.320000E+02 0.149000E+01
-INS OGPK3 -0.686285E+01 0.220000E+01 0.108719E+01
-INS CALIB 241391 236516 ceo2
-INS INCBM ob+mon_236516_North_bank.his
-INS FCSTBL det_pars_93875_93874_North_bank.hdf
-INS 1I ITYP 0 1.0000 80.0000 0
-INS 1BNKPAR 1.502 89.341 0.720 0.000 0.000 0 0
-INS 1 ICONS 18306.98 2.99 14.44
-INS 1PRCF1 3 21 0.00050
-INS 1PRCF11 0.274872E+00 0.179289E-01 0.379667E-01 0.388241E+03
-INS 1PRCF12 0.768656E+02 0.432991E+02 0.000000E+00 0.514723E+01
-INS 1PRCF13 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
-INS 1PRCF14 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
-INS 1PRCF15 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
-INS 1PRCF16 0.000000E+00
+INS BANK 1
+INS FPATH1 50
+INS HTYPE PNTR
+INS NAME North_bank
+INS NDET 1200 5 240 1
+INS TYPE 1
+INS TOFLIM 12.00 80.00 0.0004
+INS MONITR 2402 16.0000 43.0000
+INS DEADTI 0.00
+INS OGPK1 0.183305E+05 -0.387262E+02
+INS OGPK2 0.839000E+00 0.700000E+00 0.320000E+02 0.149000E+01
+INS OGPK3 -0.686285E+01 0.220000E+01 0.108719E+01
+INS CALIB 241391 236516 ceo2
+INS INCBM ob+mon_236516_North_bank.his
+INS FCSTBL det_pars_93875_93874_North_bank.hdf
+INS 1I ITYP 0 1.0000 80.0000 0
+INS 1BNKPAR 1.502 89.341 0.720 0.000 0.000 0 0
+INS 1 ICONS 18306.98 2.99 14.44
+INS 1PRCF1 3 21 0.00050
+INS 1PRCF11 0.274872E+00 0.179289E-01 0.379667E-01 0.388241E+03
+INS 1PRCF12 0.768656E+02 0.432991E+02 0.000000E+00 0.514723E+01
+INS 1PRCF13 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
+INS 1PRCF14 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
+INS 1PRCF15 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
+INS 1PRCF16 0.000000E+00
diff --git a/scripts/Engineering/template_ENGINX_241391_236516_South_bank.prm b/scripts/Engineering/template_ENGINX_241391_236516_South_bank.prm
index 7319125f27556030630bee89a87d39ed98c3c5d7..8be522515eef517b6d40d6702e821812685b0829 100644
--- a/scripts/Engineering/template_ENGINX_241391_236516_South_bank.prm
+++ b/scripts/Engineering/template_ENGINX_241391_236516_South_bank.prm
@@ -1,25 +1,25 @@
-INS BANK 1
+INS BANK 1
INS FPATH1 50
-INS HTYPE PNTR
-INS NAME South_bank
-INS NDET 1200 5 240 1
-INS TYPE 1
-INS TOFLIM 10.00 80.00 0.0004
-INS MONITR 2402 16.0000 43.0000
-INS DEADTI 0.00
-INS OGPK1 0.184332E+05 -0.460669E+02
-INS OGPK2 0.839000E+00 0.700000E+00 0.320000E+02 0.149000E+01
-INS OGPK3 -0.686285E+01 0.220000E+01 0.108719E+01
-INS CALIB 241391 236516 36516 ceo2
-INS INCBM ob+mon_236516_South_bank.his
-INS FCSTBL det_pars_93875_93874_South_bank.hdf
-INS 1I ITYP 0 1.0000 80.0000 0
-INS 1BNKPAR 1.479 -90.157 -0.216 0.000 0.000 0 0
-INS 1 ICONS 18497.75 -29.68 -26.50
-INS 1PRCF1 3 21 0.00050
-INS 1PRCF11 0.804794E+00 0.336823E-02 0.460981E+00 0.000000E+00
-INS 1PRCF12 0.107075E+04 0.432991E+02 0.000000E+00 0.652544E+01
-INS 1PRCF13 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
-INS 1PRCF14 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
-INS 1PRCF15 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
-INS 1PRCF16 0.000000E+00
+INS HTYPE PNTR
+INS NAME South_bank
+INS NDET 1200 5 240 1
+INS TYPE 1
+INS TOFLIM 10.00 80.00 0.0004
+INS MONITR 2402 16.0000 43.0000
+INS DEADTI 0.00
+INS OGPK1 0.184332E+05 -0.460669E+02
+INS OGPK2 0.839000E+00 0.700000E+00 0.320000E+02 0.149000E+01
+INS OGPK3 -0.686285E+01 0.220000E+01 0.108719E+01
+INS CALIB 241391 236516 36516 ceo2
+INS INCBM ob+mon_236516_South_bank.his
+INS FCSTBL det_pars_93875_93874_South_bank.hdf
+INS 1I ITYP 0 1.0000 80.0000 0
+INS 1BNKPAR 1.479 -90.157 -0.216 0.000 0.000 0 0
+INS 1 ICONS 18497.75 -29.68 -26.50
+INS 1PRCF1 3 21 0.00050
+INS 1PRCF11 0.804794E+00 0.336823E-02 0.460981E+00 0.000000E+00
+INS 1PRCF12 0.107075E+04 0.432991E+02 0.000000E+00 0.652544E+01
+INS 1PRCF13 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
+INS 1PRCF14 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
+INS 1PRCF15 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
+INS 1PRCF16 0.000000E+00
diff --git a/scripts/GSAS-II/install_gsas_common.bat b/scripts/GSAS-II/install_gsas_common.bat
index 45dab1c54ecdc021c460cc58d9fbde3593c77bd5..757570279dd159e543237ea3d87945fd675d5d16 100755
--- a/scripts/GSAS-II/install_gsas_common.bat
+++ b/scripts/GSAS-II/install_gsas_common.bat
@@ -23,7 +23,7 @@ if not "!PATH_PYTHON_EXE!" == "" (
@echo Cannot find python executable
exit /b 1
)
-)
+)
@echo Using '!PYTHON_EXE!' to install GSAS
!PYTHON_EXE! %~dp0install_gsas_proxy.py %*
diff --git a/scripts/Inelastic/Direct/DirectEnergyConversion.py b/scripts/Inelastic/Direct/DirectEnergyConversion.py
index 583b387de971c6c02241b5367c77a515c5448842..3f7042062bf64a135bd8e40d572dda5e267814f4 100644
--- a/scripts/Inelastic/Direct/DirectEnergyConversion.py
+++ b/scripts/Inelastic/Direct/DirectEnergyConversion.py
@@ -357,7 +357,7 @@ class DirectEnergyConversion(object):
#pylint: disable=too-many-branches
#pylint: disable=too-many-locals
#pylint: disable=W0621
-# flake8: noqa
+# flake8: noqa
def convert_to_energy(self,wb_run=None,sample_run=None,ei_guess=None,rebin=None,map_file=None,
monovan_run=None,wb_for_monovan_run=None,**kwargs):
""" One step conversion of run into workspace containing information about energy transfer
diff --git a/scripts/Interface/README b/scripts/Interface/README
index 7bae2613f806977ed590fe8a95a8a2af6e432bc1..ab0c9160dfe9b5098a06433cd06e88980930883f 100644
--- a/scripts/Interface/README
+++ b/scripts/Interface/README
@@ -6,16 +6,16 @@ More information about the application design can be found here:
reduction_gui/instruments/
example_interface.py
instrument_factory.py <----- register your interface here
-
+
reduction_gui/reduction/
- example_state.py
-
+ example_state.py
+
reduction_gui/widgets/
example_widget.py
-
+
ui/
example.ui
ui_example.iu <----- generate by pyuic4
-
+
Generating python code from the .ui file
pyuic4 -o ui/ui_example.py ui/example.ui
\ No newline at end of file
diff --git a/scripts/Interface/ui/diffraction/diffraction_info.ui b/scripts/Interface/ui/diffraction/diffraction_info.ui
index 0fbd390bfaf1104972c0e17cee0b9fde5c348c30..3d9aeb969ccd045198e9dfcd0afb5cf474af4303 100644
--- a/scripts/Interface/ui/diffraction/diffraction_info.ui
+++ b/scripts/Interface/ui/diffraction/diffraction_info.ui
@@ -63,9 +63,9 @@
<string>To use this application, you will need:
- Your Nexus event files (.nxs)
-- The corresponding SNS powder diffratomer calibration file for time focussing.
+- The corresponding SNS powder diffratomer calibration file for time focussing.
-If you do not have write access to the directory containing your data, make sure to provide an output directory.
+If you do not have write access to the directory containing your data, make sure to provide an output directory.
If you do not have access to the /SNS mount, make sure that each data file and its corresponding configuration file are always in the same directory. You can use file links as needed. Data files need not be in only one directory.
diff --git a/scripts/Interface/ui/diffraction/diffraction_run_setup.ui b/scripts/Interface/ui/diffraction/diffraction_run_setup.ui
index 4ce255bd7bad71bc5fac44de9994f0f18149ccb1..4f953ba7f22d10f887fd8109ed58b4585bbe59a8 100644
--- a/scripts/Interface/ui/diffraction/diffraction_run_setup.ui
+++ b/scripts/Interface/ui/diffraction/diffraction_run_setup.ui
@@ -725,7 +725,7 @@
<string notr="true">font: italic 10pt "Bitstream Charter";</string>
</property>
<property name="text">
- <string>If characterization file is given, the correction run numbers are given by the file.
+ <string>If characterization file is given, the correction run numbers are given by the file.
The corrections can be overridden and disabled though.</string>
</property>
</widget>
diff --git a/scripts/Interface/ui/diffraction/filter_info.ui b/scripts/Interface/ui/diffraction/filter_info.ui
index 7635c9aece0b3c9c2f0f05b18cf4d2a2441f8ec1..d73f18c6c75220bb0e069b073bb70a1a027e80dc 100644
--- a/scripts/Interface/ui/diffraction/filter_info.ui
+++ b/scripts/Interface/ui/diffraction/filter_info.ui
@@ -65,7 +65,7 @@
- Your Nexus event files ( _event.nxs)
- The Nexus event file used in this filter setup page must be same to the data reduction page.
-If you do not have write access to the directory containing your data, make sure to provide an output directory.
+If you do not have write access to the directory containing your data, make sure to provide an output directory.
If you do not have access to the /SNS mount, make sure that each data file and its corresponding configuration file are always in the same directory. You can use file links as needed. Data files need not be in only one directory.
diff --git a/scripts/Interface/ui/sans/eqsans_info.ui b/scripts/Interface/ui/sans/eqsans_info.ui
index 307cf28b98fc4d3445bddec6a2947701810496fa..fa7c6cd9c84f883a8b98a18413404ec9c2c67595 100644
--- a/scripts/Interface/ui/sans/eqsans_info.ui
+++ b/scripts/Interface/ui/sans/eqsans_info.ui
@@ -65,7 +65,7 @@
- Your Nexus event files (.nxs)
- The corresponding eqsans_configuration.xxxx files [optional]
-If you do not have write access to the directory containing your data, make sure to provide an output directory.
+If you do not have write access to the directory containing your data, make sure to provide an output directory.
If you do not have access to the /SNS mount, make sure that each data file and its corresponding configuration file are always in the same directory. You can use file links as needed. Data files need not be in only one directory.
diff --git a/scripts/Muon/GUI/ElementalAnalysis/peak_data.json b/scripts/Muon/GUI/ElementalAnalysis/peak_data.json
index ac071113601aacadd4b1ad36e9e7007ffd501d43..caeff4353c54b6e7f236d82cd780817bb657b67b 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/peak_data.json
+++ b/scripts/Muon/GUI/ElementalAnalysis/peak_data.json
@@ -12,7 +12,7 @@
"M(4f7/2->3d5/2)": 304.7,
"M(4f5/2->3d3/2)": 308.3,
"5g->4f7/2": 141.1,
- "6->5": 76.0
+ "6->5": 76.0
},
"Secondary": {
"K(3p->1s)": 4050.9,
@@ -79,7 +79,7 @@
"Primary": {
"K(2p->1s)": 643.7,
"L(3p->2s)": 127.6,
- "M(4f->3d)": 44.2
+ "M(4f->3d)": 44.2
},
"Secondary": {
"K(3p->1s)": 770.7,
@@ -144,7 +144,7 @@
"M(5->3)": 1268.5,
"M(5f->3d)": 1301.4,
"M(6->3)": 1485.7,
- "M(6f->3d)": 1519.8,
+ "M(6f->3d)": 1519.8,
"N(6g->4f)": 615.5,
"N(6->4)": 622.0,
"N(7g->4f)": 744.8,
@@ -442,7 +442,7 @@
"L(3d->2p)": 226.0,
"L(3->2)": 228.8,
"M(4f->3d)": 78.3,
- "N(5g->4f)": 35.4
+ "N(5g->4f)": 35.4
},
"Secondary": {
"K(3p->1s)": 1317.8,
@@ -565,8 +565,8 @@
"L(3d->2p) ": 1622.6,
"L(3d->2p) ": 1659.9,
"L(3d->2p) ": 1674.7,
- "L(3d->2p) ": 1703.9,
- "L(3d->2p) ": 1743.7,
+ "L(3d->2p) ": 1703.9,
+ "L(3d->2p) ": 1743.7,
"L(3d->2p) ": 1761.8,
"L(3d->2p) ": 1767.2,
"M(5f->3d)": 882,
@@ -1252,7 +1252,7 @@
"A": 14.01,
"Primary": {
"K(2p->1s)": 101.9,
- "L(3d->2p)": 19.2
+ "L(3d->2p)": 19.2
},
"Secondary": {
"K(3p->1s)": 121.1,
@@ -1290,7 +1290,7 @@
"L(3d3/2->2p1/2)": 683.7,
"M(4f->3d)": 231.4,
"M(4f->3d) ": 235.5,
- "N(5g->4f)": 106.5
+ "N(5g->4f)": 106.5
},
"Secondary": {
"K(4p->1s)": 3288.7,
@@ -1411,7 +1411,7 @@
"M(9f->3d)": 218.5,
"M(10f->3d)": 223.5,
"N(6g->4f)": 76.6,
- "N(7g->4f)": 93.1
+ "N(7g->4f)": 93.1
}
},
"O": {
@@ -1971,7 +1971,7 @@
"M(7f->3d)": 642.0,
"M(7f->3d) ": 647.9,
"M(8f->3d)": 676.1,
- "M(9f->3d)": 682.6,
+ "M(9f->3d)": 682.6,
"N(6g->4f)": 245.8,
"N(7g->4f)": 297.6,
"N(8g->4f)": 331.2
@@ -2047,7 +2047,7 @@
},
"Gammas":{
"179Ta->179Hf*": 215,
- "179Ta->179Hf* ": 267
+ "179Ta->179Hf* ": 267
}
},
"Tb": {
@@ -2086,7 +2086,7 @@
"N(8g->4f)": 503.2,
"N(8g->4f) ": 506.6,
"N(9g->4f)": 561.0,
- "N(9g->4f) ": 563.5,
+ "N(9g->4f) ": 563.5,
"O(7h->5g)": 234.4,
"O(8h->5g)": 290.9
}
diff --git a/scripts/PyChop/maps.yaml b/scripts/PyChop/maps.yaml
index 715e780742ed83d22a527d93623028b3d0933860..6e9be874522bbd6bb7e0d8cbda5cafd6b822de5d 100644
--- a/scripts/PyChop/maps.yaml
+++ b/scripts/PyChop/maps.yaml
@@ -72,10 +72,10 @@ chopper_system:
overlap_ei_frac: 0.9 # Fraction of energy loss Ei to plot ToF lines in time-distance plots
ei_limits: [0, 2000] # Limits on ei for multirep calculations (reps outside range ignored)
-sample:
+sample:
name: MAPS Sample Can
isam: 0 # Sample type: 0==flat plate, 1==ellipse, 2==annulus, 3==sphere, 4==solid cylinder
- sx: 2.0 # Thickness (mm)
+ sx: 2.0 # Thickness (mm)
sy: 48.0 # Width (mm)
sz: 48.0 # Height (mm)
gamma: 0.0 # Angle of x-axis to ki (degrees)
@@ -102,40 +102,40 @@ moderator:
wavelength: [3.81593, 5.39537, 2.2052, 2.70006, 3.25499, 1.70813, 3.11649, 1.44378, 2.41516, 1.91018, 2.47745, 1.27303, 2.07872, 1.05928, 1.55951]
width: [54, 62, 40, 44, 48, 35, 47, 30, 41, 37, 40, 25, 38, 20, 31]
measured_flux: # Table of measured flux vs wavelength. Wavelength in Angstrom. Flux in n/cm^2/s/uA/Angstrom
- wavelength: [0.0181, 0.0511, 0.0841, 0.1170, 0.1500, 0.1829, 0.2159, 0.2489, 0.2818, 0.3148, 0.3477, 0.3807, 0.4137, 0.4466, 0.4796,
- 0.5126, 0.5455, 0.5785, 0.6114, 0.6444, 0.6774, 0.7103, 0.7433, 0.7762, 0.8092, 0.8422, 0.8751, 0.9081, 0.9411, 0.9740,
- 1.0070, 1.0399, 1.0729, 1.1059, 1.1388, 1.1718, 1.2047, 1.2377, 1.2707, 1.3036, 1.3366, 1.3696, 1.4025, 1.4355, 1.4684,
- 1.5014, 1.5344, 1.5673, 1.6003, 1.6332, 1.6662, 1.6992, 1.7321, 1.7651, 1.7980, 1.8310, 1.8640, 1.8969, 1.9299, 1.9629,
- 1.9958, 2.0288, 2.0617, 2.0947, 2.1277, 2.1606, 2.1936, 2.2266, 2.2595, 2.2925, 2.3254, 2.3584, 2.3914, 2.4243, 2.4573,
- 2.4902, 2.5232, 2.5562, 2.5891, 2.6221, 2.6551, 2.6880, 2.7210, 2.7539, 2.7869, 2.8199, 2.8528, 2.8858, 2.9187, 2.9517,
- 2.9847, 3.0176, 3.0506, 3.0835, 3.1165, 3.1495, 3.1824, 3.2154, 3.2484, 3.2813, 3.3143, 3.3472, 3.3802, 3.4132, 3.4461,
- 3.4791, 3.5120, 3.5450, 3.5780, 3.6109, 3.6439, 3.6769, 3.7098, 3.7428, 3.7757, 3.8087, 3.8417, 3.8746, 3.9076, 3.9406,
- 3.9735, 4.0065, 4.0394, 4.0724, 4.1054, 4.1383, 4.1713, 4.2042, 4.2372, 4.2702, 4.3031, 4.3361, 4.3690, 4.4020, 4.4350,
- 4.4679, 4.5009, 4.5339, 4.5668, 4.5998, 4.6327, 4.6657, 4.6987, 4.7316, 4.7646, 4.7976, 4.8305, 4.8635, 4.8964, 4.9294,
- 4.9624, 4.9953, 5.0283, 5.0612, 5.0942, 5.1272, 5.1601, 5.1931, 5.2260, 5.2590, 5.2920, 5.3249, 5.3579, 5.3909, 5.4238,
- 5.4568, 5.4897, 5.5227, 5.5557, 5.5886, 5.6216, 5.6546, 5.6875, 5.7205, 5.7534, 5.7864, 5.8194, 5.8523, 5.8853, 5.9182,
- 5.9512, 5.9842, 6.0171, 6.0501, 6.0831, 6.1160, 6.1490, 6.1819, 6.2149, 6.2479, 6.2808, 6.3138, 6.3467, 6.3797, 6.4127,
+ wavelength: [0.0181, 0.0511, 0.0841, 0.1170, 0.1500, 0.1829, 0.2159, 0.2489, 0.2818, 0.3148, 0.3477, 0.3807, 0.4137, 0.4466, 0.4796,
+ 0.5126, 0.5455, 0.5785, 0.6114, 0.6444, 0.6774, 0.7103, 0.7433, 0.7762, 0.8092, 0.8422, 0.8751, 0.9081, 0.9411, 0.9740,
+ 1.0070, 1.0399, 1.0729, 1.1059, 1.1388, 1.1718, 1.2047, 1.2377, 1.2707, 1.3036, 1.3366, 1.3696, 1.4025, 1.4355, 1.4684,
+ 1.5014, 1.5344, 1.5673, 1.6003, 1.6332, 1.6662, 1.6992, 1.7321, 1.7651, 1.7980, 1.8310, 1.8640, 1.8969, 1.9299, 1.9629,
+ 1.9958, 2.0288, 2.0617, 2.0947, 2.1277, 2.1606, 2.1936, 2.2266, 2.2595, 2.2925, 2.3254, 2.3584, 2.3914, 2.4243, 2.4573,
+ 2.4902, 2.5232, 2.5562, 2.5891, 2.6221, 2.6551, 2.6880, 2.7210, 2.7539, 2.7869, 2.8199, 2.8528, 2.8858, 2.9187, 2.9517,
+ 2.9847, 3.0176, 3.0506, 3.0835, 3.1165, 3.1495, 3.1824, 3.2154, 3.2484, 3.2813, 3.3143, 3.3472, 3.3802, 3.4132, 3.4461,
+ 3.4791, 3.5120, 3.5450, 3.5780, 3.6109, 3.6439, 3.6769, 3.7098, 3.7428, 3.7757, 3.8087, 3.8417, 3.8746, 3.9076, 3.9406,
+ 3.9735, 4.0065, 4.0394, 4.0724, 4.1054, 4.1383, 4.1713, 4.2042, 4.2372, 4.2702, 4.3031, 4.3361, 4.3690, 4.4020, 4.4350,
+ 4.4679, 4.5009, 4.5339, 4.5668, 4.5998, 4.6327, 4.6657, 4.6987, 4.7316, 4.7646, 4.7976, 4.8305, 4.8635, 4.8964, 4.9294,
+ 4.9624, 4.9953, 5.0283, 5.0612, 5.0942, 5.1272, 5.1601, 5.1931, 5.2260, 5.2590, 5.2920, 5.3249, 5.3579, 5.3909, 5.4238,
+ 5.4568, 5.4897, 5.5227, 5.5557, 5.5886, 5.6216, 5.6546, 5.6875, 5.7205, 5.7534, 5.7864, 5.8194, 5.8523, 5.8853, 5.9182,
+ 5.9512, 5.9842, 6.0171, 6.0501, 6.0831, 6.1160, 6.1490, 6.1819, 6.2149, 6.2479, 6.2808, 6.3138, 6.3467, 6.3797, 6.4127,
6.4456, 6.4786, 6.5115, 6.5445, 6.5750]
- flux: [2.60775e+08, 8.08616e+07, 4.59455e+07, 3.16183e+07, 2.37830e+07, 1.91458e+07, 1.58204e+07, 1.36088e+07, 1.19225e+07,
- 1.06105e+07, 9.55533e+06, 8.77411e+06, 8.21901e+06, 7.67656e+06, 7.15055e+06, 6.70757e+06, 6.39276e+06, 6.22826e+06,
- 6.19798e+06, 6.27731e+06, 6.47994e+06, 6.91604e+06, 7.50573e+06, 8.09035e+06, 8.76875e+06, 9.49975e+06, 1.01658e+07,
- 1.07548e+07, 1.13597e+07, 1.19941e+07, 1.25374e+07, 1.28821e+07, 1.31248e+07, 1.32727e+07, 1.32305e+07, 1.30834e+07,
- 1.27595e+07, 1.24351e+07, 1.20115e+07, 1.15789e+07, 1.11218e+07, 1.07191e+07, 1.03272e+07, 9.93856e+06, 9.59376e+06,
- 9.19836e+06, 8.81571e+06, 8.50457e+06, 8.29274e+06, 8.05058e+06, 7.88437e+06, 7.63907e+06, 7.32047e+06, 6.99681e+06,
- 6.68968e+06, 6.45270e+06, 6.24161e+06, 6.01323e+06, 5.74713e+06, 5.48816e+06, 5.27153e+06, 5.01780e+06, 4.76127e+06,
- 4.48172e+06, 4.21345e+06, 3.97093e+06, 3.74819e+06, 3.53683e+06, 3.32935e+06, 3.12404e+06, 2.92801e+06, 2.74479e+06,
- 2.61634e+06, 2.48606e+06, 2.38826e+06, 2.29410e+06, 2.17636e+06, 2.07461e+06, 1.97063e+06, 1.87220e+06, 1.77780e+06,
- 1.70202e+06, 1.62584e+06, 1.55763e+06, 1.48989e+06, 1.42924e+06, 1.37959e+06, 1.34056e+06, 1.31926e+06, 1.28573e+06,
- 1.25559e+06, 1.22426e+06, 1.18988e+06, 1.15714e+06, 1.13032e+06, 1.09423e+06, 1.06161e+06, 1.02650e+06, 9.95519e+05,
- 9.56437e+05, 9.24815e+05, 8.90446e+05, 8.56656e+05, 8.28196e+05, 8.01094e+05, 7.79358e+05, 7.56306e+05, 7.35949e+05,
- 7.24375e+05, 7.02174e+05, 6.86458e+05, 6.65894e+05, 6.43176e+05, 6.24539e+05, 6.01304e+05, 5.82505e+05, 5.61653e+05,
- 5.41996e+05, 5.25903e+05, 5.10613e+05, 4.96677e+05, 4.82118e+05, 4.64661e+05, 4.65809e+05, 4.68617e+05, 4.56137e+05,
- 4.42141e+05, 4.27460e+05, 4.10041e+05, 3.98628e+05, 3.84161e+05, 3.71166e+05, 3.57501e+05, 3.45980e+05, 3.35925e+05,
- 3.23733e+05, 3.13815e+05, 3.03413e+05, 2.91757e+05, 2.82348e+05, 2.72917e+05, 2.57271e+05, 2.41863e+05, 2.58619e+05,
- 2.53316e+05, 2.43464e+05, 2.35779e+05, 2.29787e+05, 2.22481e+05, 2.14144e+05, 2.08181e+05, 2.01866e+05, 1.95864e+05,
- 1.89808e+05, 1.84740e+05, 1.78016e+05, 1.73397e+05, 1.68777e+05, 1.65549e+05, 1.61071e+05, 1.56594e+05, 1.52364e+05,
- 1.49546e+05, 1.46162e+05, 1.43155e+05, 1.40167e+05, 1.37583e+05, 1.35294e+05, 1.32192e+05, 1.30639e+05, 1.27633e+05,
- 1.25179e+05, 1.23187e+05, 1.21203e+05, 1.18074e+05, 1.15095e+05, 1.12187e+05, 1.10561e+05, 1.08411e+05, 1.05109e+05,
- 1.03695e+05, 1.01165e+05, 9.87797e+04, 9.77841e+04, 9.40768e+04, 9.27353e+04, 9.14937e+04, 8.88289e+04, 8.74353e+04,
- 8.53251e+04, 8.30339e+04, 8.22249e+04, 7.94099e+04, 7.79037e+04, 7.62865e+04, 7.47047e+04, 7.38535e+04, 7.17228e+04,
+ flux: [2.60775e+08, 8.08616e+07, 4.59455e+07, 3.16183e+07, 2.37830e+07, 1.91458e+07, 1.58204e+07, 1.36088e+07, 1.19225e+07,
+ 1.06105e+07, 9.55533e+06, 8.77411e+06, 8.21901e+06, 7.67656e+06, 7.15055e+06, 6.70757e+06, 6.39276e+06, 6.22826e+06,
+ 6.19798e+06, 6.27731e+06, 6.47994e+06, 6.91604e+06, 7.50573e+06, 8.09035e+06, 8.76875e+06, 9.49975e+06, 1.01658e+07,
+ 1.07548e+07, 1.13597e+07, 1.19941e+07, 1.25374e+07, 1.28821e+07, 1.31248e+07, 1.32727e+07, 1.32305e+07, 1.30834e+07,
+ 1.27595e+07, 1.24351e+07, 1.20115e+07, 1.15789e+07, 1.11218e+07, 1.07191e+07, 1.03272e+07, 9.93856e+06, 9.59376e+06,
+ 9.19836e+06, 8.81571e+06, 8.50457e+06, 8.29274e+06, 8.05058e+06, 7.88437e+06, 7.63907e+06, 7.32047e+06, 6.99681e+06,
+ 6.68968e+06, 6.45270e+06, 6.24161e+06, 6.01323e+06, 5.74713e+06, 5.48816e+06, 5.27153e+06, 5.01780e+06, 4.76127e+06,
+ 4.48172e+06, 4.21345e+06, 3.97093e+06, 3.74819e+06, 3.53683e+06, 3.32935e+06, 3.12404e+06, 2.92801e+06, 2.74479e+06,
+ 2.61634e+06, 2.48606e+06, 2.38826e+06, 2.29410e+06, 2.17636e+06, 2.07461e+06, 1.97063e+06, 1.87220e+06, 1.77780e+06,
+ 1.70202e+06, 1.62584e+06, 1.55763e+06, 1.48989e+06, 1.42924e+06, 1.37959e+06, 1.34056e+06, 1.31926e+06, 1.28573e+06,
+ 1.25559e+06, 1.22426e+06, 1.18988e+06, 1.15714e+06, 1.13032e+06, 1.09423e+06, 1.06161e+06, 1.02650e+06, 9.95519e+05,
+ 9.56437e+05, 9.24815e+05, 8.90446e+05, 8.56656e+05, 8.28196e+05, 8.01094e+05, 7.79358e+05, 7.56306e+05, 7.35949e+05,
+ 7.24375e+05, 7.02174e+05, 6.86458e+05, 6.65894e+05, 6.43176e+05, 6.24539e+05, 6.01304e+05, 5.82505e+05, 5.61653e+05,
+ 5.41996e+05, 5.25903e+05, 5.10613e+05, 4.96677e+05, 4.82118e+05, 4.64661e+05, 4.65809e+05, 4.68617e+05, 4.56137e+05,
+ 4.42141e+05, 4.27460e+05, 4.10041e+05, 3.98628e+05, 3.84161e+05, 3.71166e+05, 3.57501e+05, 3.45980e+05, 3.35925e+05,
+ 3.23733e+05, 3.13815e+05, 3.03413e+05, 2.91757e+05, 2.82348e+05, 2.72917e+05, 2.57271e+05, 2.41863e+05, 2.58619e+05,
+ 2.53316e+05, 2.43464e+05, 2.35779e+05, 2.29787e+05, 2.22481e+05, 2.14144e+05, 2.08181e+05, 2.01866e+05, 1.95864e+05,
+ 1.89808e+05, 1.84740e+05, 1.78016e+05, 1.73397e+05, 1.68777e+05, 1.65549e+05, 1.61071e+05, 1.56594e+05, 1.52364e+05,
+ 1.49546e+05, 1.46162e+05, 1.43155e+05, 1.40167e+05, 1.37583e+05, 1.35294e+05, 1.32192e+05, 1.30639e+05, 1.27633e+05,
+ 1.25179e+05, 1.23187e+05, 1.21203e+05, 1.18074e+05, 1.15095e+05, 1.12187e+05, 1.10561e+05, 1.08411e+05, 1.05109e+05,
+ 1.03695e+05, 1.01165e+05, 9.87797e+04, 9.77841e+04, 9.40768e+04, 9.27353e+04, 9.14937e+04, 8.88289e+04, 8.74353e+04,
+ 8.53251e+04, 8.30339e+04, 8.22249e+04, 7.94099e+04, 7.79037e+04, 7.62865e+04, 7.47047e+04, 7.38535e+04, 7.17228e+04,
6.98927e+04, 6.89509e+04]
diff --git a/scripts/PyChop/mari.yaml b/scripts/PyChop/mari.yaml
index 2954406dccbaff3bc0f7e73a5b391e0ed9233c31..00f1000a015fe8c56a3dd41667277234c59c5dfc 100644
--- a/scripts/PyChop/mari.yaml
+++ b/scripts/PyChop/mari.yaml
@@ -98,10 +98,10 @@ chopper_system:
overlap_ei_frac: 0.9 # Fraction of energy loss Ei to plot ToF lines in time-distance plots
ei_limits: [0, 2000] # Limits on ei for multirep calculations (reps outside range ignored)
-sample:
+sample:
name: MARI Sample Can
isam: 2 # Sample type: 0==flat plate, 1==ellipse, 2==annulus, 3==sphere, 4==solid cylinder
- sx: 20.0 # Thickness (mm)
+ sx: 20.0 # Thickness (mm)
sy: 19.0 # Width (mm)
sz: 50.0 # Height (mm)
gamma: 0.0 # Angle of x-axis to ki (degrees)
diff --git a/scripts/PyChop/merlin.yaml b/scripts/PyChop/merlin.yaml
index 9492eeefd59722b4a4302c611cb0321fd41e4b33..67907f1ead3f80ac3b68f344f1a71d1b584d38ab 100644
--- a/scripts/PyChop/merlin.yaml
+++ b/scripts/PyChop/merlin.yaml
@@ -61,10 +61,10 @@ chopper_system:
overlap_ei_frac: 0.9 # Fraction of energy loss Ei to plot ToF lines in time-distance plots
ei_limits: [7, 2000] # Limits on ei for multirep calculations (reps outside range ignored)
-sample:
+sample:
name: MERLIN Sample Can
isam: 0 # Sample type: 0==flat plate, 1==ellipse, 2==annulus, 3==sphere, 4==solid cylinder
- sx: 2.0 # Thickness (mm)
+ sx: 2.0 # Thickness (mm)
sy: 40.0 # Width (mm)
sz: 40.0 # Height (mm)
gamma: 0.0 # Angle of x-axis to ki (degrees)
diff --git a/scripts/reduction_workflow/README.md b/scripts/reduction_workflow/README.md
index 71a5e94e6bac55e757b37fc5b21654f56a80e03d..d65b4e2fecfe9d4db00fed72a619c4ae618adb4f 100644
--- a/scripts/reduction_workflow/README.md
+++ b/scripts/reduction_workflow/README.md
@@ -2,5 +2,5 @@ Reduction Workflow
==================
This is the new reduction scripting interface. It uses the new python API
-and is built on the DataProcessor algorithms and the property manager
+and is built on the DataProcessor algorithms and the property manager
data service.
diff --git a/scripts/test/User_files_description_test.xml b/scripts/test/User_files_description_test.xml
index 53ef32ee0d9ad8b6e829a794d2b0d6fad0dfe11a..58f58b88066a146290eb4553714fdfaac0f772f0 100644
--- a/scripts/test/User_files_description_test.xml
+++ b/scripts/test/User_files_description_test.xml
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--The file describes list of files to copy to a user's RB folder from Mantid users script repository
+<!--The file describes list of files to copy to a user's RB folder from Mantid users script repository
and operations to perform with these files during copying.
-
+
At the moment, supported operations are:
Copy file(s) with specified name into RB folder with name which may depend on cycle ID, instrument or other variables below.
On request, replace any instances of variable specified by its value.
-->
<user_files_description>
- <!-- the file descriptions support the following variables defined and parsed by
+ <!-- the file descriptions support the following variables defined and parsed by
ISISDirectInelasticConfig.py module. $instrument$, $cycleID$ $start_date$, $rb_folder$
- $rb_folder$ value is short rb folder path (e.g. RB1501020)
- not full rb folder path (/home/wkc26243/RB1501020),
+ $rb_folder$ value is short rb folder path (e.g. RB1501020)
+ not full rb folder path (/home/wkc26243/RB1501020),
The values of these variables are taken from archive for current cycle and user
-->
- <!--Simple file copying -->
+ <!--Simple file copying -->
<file_to_copy file_name="Test_reduction_file1.py" copy_as="Test_reduction_file2.py"/>
- <!--Advanced file copying
+ <!--Advanced file copying
Variables have to be either strings or strings with variables, described above
-->
<file_to_copy file_name="Test_reduction_file.py" copy_as="Test_reduction_file_$cycleID$.py">
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Scintillator_90deg.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Scintillator_90deg.dat
index 564ae9e74b4d0884bef7a9aa662fa0f77ee954a7..d611fcf620ea91668b2328125a8917d2b9da1435 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Scintillator_90deg.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Scintillator_90deg.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.15 -0.0010
- -0.15 0.0010
- 0.15 0.0010
+ -0.15 0.0010
+ 0.15 0.0010
0.15 -0.0010
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Scintillator_brick.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Scintillator_brick.dat
index 7225b0e595b83730b0262ce59800bfd55ce9080f..322c5a17422e7943be76059672acdb5b53eb4346 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Scintillator_brick.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Scintillator_brick.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.085 -0.0010
- -0.085 0.0010
- 0.085 0.0010
+ -0.085 0.0010
+ 0.085 0.0010
0.085 -0.0010
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Scintillator_verylow.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Scintillator_verylow.dat
index 7225b0e595b83730b0262ce59800bfd55ce9080f..322c5a17422e7943be76059672acdb5b53eb4346 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Scintillator_verylow.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Scintillator_verylow.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.085 -0.0010
- -0.085 0.0010
- 0.085 0.0010
+ -0.085 0.0010
+ 0.085 0.0010
0.085 -0.0010
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_140.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_140.dat
index c6d0222c208c4009d9011cca31af57a1277dfc92..7cdb668874181e2b6cc71389c2c9997e5eb79a62 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_140.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_140.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.0703 -0.00525
- -0.0703 0.00525
- 0.0703 0.00525
+ -0.0703 0.00525
+ 0.0703 0.00525
0.0703 -0.00525
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_149.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_149.dat
index b885043b16ee6b4c095cf05659fd17bad8e517ba..f8444e98ecebf7bdd26643d20a8302e7c29c8ade 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_149.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_149.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.0747 -0.00525
- -0.0747 0.00525
- 0.0747 0.00525
+ -0.0747 0.00525
+ 0.0747 0.00525
0.0747 -0.00525
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_158.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_158.dat
index 183a7568c2828d4ba75e7c52eaa0d637c52435e4..1a9f378c42b0b7def337af79054af06e838d5852 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_158.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_158.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.0791 -0.00525
- -0.0791 0.00525
- 0.0791 0.00525
+ -0.0791 0.00525
+ 0.0791 0.00525
0.0791 -0.00525
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_167.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_167.dat
index 6955b98ea9dd347bf9d084f08b0911c672603f90..42b40f2f7e3e19cd7622c1699264ed8c733edacc 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_167.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_167.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.0836 -0.00525
- -0.0836 0.00525
- 0.0836 0.00525
+ -0.0836 0.00525
+ 0.0836 0.00525
0.0836 -0.00525
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_175.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_175.dat
index e8e37760596151669da88cbec1eae237cb691b70..045f77c1c6a53490e8b8cac913f35d83ad1129f0 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_175.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_175.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.0880 -0.00525
- -0.0880 0.00525
- 0.0880 0.00525
+ -0.0880 0.00525
+ 0.0880 0.00525
0.0880 -0.00525
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_184.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_184.dat
index aea9d95a466d0c03b9823d4ded448520de971349..f92b0ab1de67796470a079bbd1f2f3f56ba0dd94 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_184.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_184.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.0924 -0.00525
- -0.0924 0.00525
- 0.0924 0.00525
+ -0.0924 0.00525
+ 0.0924 0.00525
0.0924 -0.00525
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_193.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_193.dat
index a50b141039e58caff9fbc937916280b0f8a294e1..f483a71d52348234a8405ab0a6f7ad2c77e0d6ae 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_193.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_193.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.0968 -0.00525
- -0.0968 0.00525
- 0.0968 0.00525
+ -0.0968 0.00525
+ 0.0968 0.00525
0.0968 -0.00525
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_202.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_202.dat
index 7a114e027491006db5a187da4f0d3188831c8080..38b2303ec74a40fdbb520ad0d67424399c73ae8b 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_202.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_202.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.1013 -0.00525
- -0.1013 0.00525
- 0.1013 0.00525
+ -0.1013 0.00525
+ 0.1013 0.00525
0.1013 -0.00525
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_211.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_211.dat
index 008fa8cae80abf983aab515448bd5e3a2a6ab948..572755a30d63707df93a9fbe418fe588794980e4 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_211.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_211.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.1057 -0.00525
- -0.1057 0.00525
- 0.1057 0.00525
+ -0.1057 0.00525
+ 0.1057 0.00525
0.1057 -0.00525
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_220.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_220.dat
index fa091014caab68b19cb10d5246891e0dd063b1f1..88834168e95ef30c85721cd775c92cdbb64c51b8 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_220.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_220.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.1101 -0.00525
- -0.1101 0.00525
- 0.1101 0.00525
+ -0.1101 0.00525
+ 0.1101 0.00525
0.1101 -0.00525
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_229.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_229.dat
index f46ed15d4a33f7d5de158460b8579c916422d540..ef64c58f5bee049902b6c44aa08d3f657e2188cc 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_229.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_229.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.1146 -0.00525
- -0.1146 0.00525
- 0.1146 0.00525
+ -0.1146 0.00525
+ 0.1146 0.00525
0.1146 -0.00525
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_237.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_237.dat
index b90377cedae1bc5b8933ca555aab04567ee2cc15..19769d54a74555a31846c5d70d9c4bbf27dddc28 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_237.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_237.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.1190 -0.00525
- -0.1190 0.00525
- 0.1190 0.00525
+ -0.1190 0.00525
+ 0.1190 0.00525
0.1190 -0.00525
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_246.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_246.dat
index b196ef04b89917354f683d64ae715dee047f9c7f..d31bfdab173865b660bd6d17f222d4ac385ccec9 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_246.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_246.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.1234 -0.00525
- -0.1234 0.00525
- 0.1234 0.00525
+ -0.1234 0.00525
+ 0.1234 0.00525
0.1234 -0.00525
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_255.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_255.dat
index dc96648ea77da6236c0c0b0e59855f7adf5b4eb1..ad24c8000433e7a53ba0eb8e342beb340b0bbe79 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_255.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_255.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.1279 -0.00525
- -0.1279 0.00525
- 0.1279 0.00525
+ -0.1279 0.00525
+ 0.1279 0.00525
0.1279 -0.00525
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_264.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_264.dat
index f26483bb187c3877af7e46b06cfbb33076f838e7..6b7c27894df3e53dbfa973d8c718f24470dcb389 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_264.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_264.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.1323 -0.00525
- -0.1323 0.00525
- 0.1323 0.00525
+ -0.1323 0.00525
+ 0.1323 0.00525
0.1323 -0.00525
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_273.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_273.dat
index a3778eb530987b656bb2334e18cdb862fdf7ec6d..5de0185ba9b55ff258f2fdcacd29130ed08d6cb5 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_273.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_273.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.1367 -0.00525
- -0.1367 0.00525
- 0.1367 0.00525
+ -0.1367 0.00525
+ 0.1367 0.00525
0.1367 -0.00525
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_282.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_282.dat
index 18dc606fd068e786de3e6091eda6e339f7035cad..6edfdfdad829a653041559428e67103db6b8a1b0 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_282.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_282.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.1411 -0.00525
- -0.1411 0.00525
- 0.1411 0.00525
+ -0.1411 0.00525
+ 0.1411 0.00525
0.1411 -0.00525
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_291.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_291.dat
index 7fbb50ce14f696db52fc358c8e7a414ded89e1d4..bbf463688ec157b9e9f75f27089f47f14cf8d211 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_291.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_291.dat
@@ -25,6 +25,6 @@ type:: real
rank:: 2
dimensions:: 2 4
values:: -0.1456 -0.00525
- -0.1456 0.00525
- 0.1456 0.00525
+ -0.1456 0.00525
+ 0.1456 0.00525
0.1456 -0.00525
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_300.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_300.dat
index 594307f69cc0a6d952a853727c10762c50341fad..308d64af7d301f608070fce534191b8a06ad9054 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_300.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_300.dat
@@ -24,7 +24,7 @@ name:: box
type:: real
rank:: 2
dimensions:: 2 4
-values:: -0.15 -0.00525
- -0.15 0.00525
- 0.15 0.00525
- 0.15 -0.00525
+values:: -0.15 -0.00525
+ -0.15 0.00525
+ 0.15 0.00525
+ 0.15 -0.00525
diff --git a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_lowang.dat b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_lowang.dat
index 7b3d74679ab62fb376ef8b6fb33bc215b12b0a0c..4dc3c75cd888c793cf4c2854d83b7e2b3bf289dc 100644
--- a/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_lowang.dat
+++ b/tools/ArielToMantidXML/ARIEL/POLARIS/Tube_lowang.dat
@@ -24,7 +24,7 @@ name:: box
type:: real
rank:: 2
dimensions:: 2 4
-values:: -0.10 -0.003
- -0.10 0.003
- 0.10 0.003
- 0.10 -0.003
+values:: -0.10 -0.003
+ -0.10 0.003
+ 0.10 0.003
+ 0.10 -0.003
diff --git a/tools/ArielToMantidXML/ARIEL/Rotax/rotax.ass b/tools/ArielToMantidXML/ARIEL/Rotax/rotax.ass
index 2557ecd29aa7c9f443704eff0939d541696dfec3..9702fcde7fb142b98047ac45cdd782a5c229f82d 100644
--- a/tools/ArielToMantidXML/ARIEL/Rotax/rotax.ass
+++ b/tools/ArielToMantidXML/ARIEL/Rotax/rotax.ass
@@ -9,9 +9,9 @@ module_type2
**********************
module2
module_type2
- 0.000000 72.0 0.
+ 0.000000 72.0 0.
**********************
module3
module_type1
- 0.000000 122.02 0.
+ 0.000000 122.02 0.
diff --git a/tools/ArielToMantidXML/ARIEL/exed/el_tube.dat b/tools/ArielToMantidXML/ARIEL/exed/el_tube.dat
index 98857247c31ca34a4c23a9e4e335be692e2a2b51..3a784a6846d8829bb27f1836c0b78cbfd7743c1f 100644
--- a/tools/ArielToMantidXML/ARIEL/exed/el_tube.dat
+++ b/tools/ArielToMantidXML/ARIEL/exed/el_tube.dat
@@ -24,7 +24,7 @@ name:: box
type:: real
rank:: 2
dimensions:: 2 4
-values:: -0.00630 -0.00450
- -0.00630 0.00450
- 0.00630 0.00450
- 0.00630 -0.00450
+values:: -0.00630 -0.00450
+ -0.00630 0.00450
+ 0.00630 0.00450
+ 0.00630 -0.00450
diff --git a/tools/ArielToMantidXML/ARIEL/gem/gem.ass b/tools/ArielToMantidXML/ARIEL/gem/gem.ass
index b6c4b5b8bb2421e8def5c4b9e0f997bc50b83fe4..bbf706f5e50ce1dd9be1999855978b4ba7987170 100644
--- a/tools/ArielToMantidXML/ARIEL/gem/gem.ass
+++ b/tools/ArielToMantidXML/ARIEL/gem/gem.ass
@@ -77,7 +77,7 @@ monitor
**********************
bank1
bank1
- 0.000000 5.5 2.3735
+ 0.000000 5.5 2.3735
**********************
bank2
bank2
@@ -97,5 +97,5 @@ bank5
**********************
bank6
bank6
- 0.000000 167.578 1.039
+ 0.000000 167.578 1.039
diff --git a/tools/ArielToMantidXML/ARIEL/gem/gem_old.ass b/tools/ArielToMantidXML/ARIEL/gem/gem_old.ass
index 5e7104b932022755802b521c031976ff81a317a9..a7d433833d93b23d3e9e8c2ec64e1fb8a6469a9d 100644
--- a/tools/ArielToMantidXML/ARIEL/gem/gem_old.ass
+++ b/tools/ArielToMantidXML/ARIEL/gem/gem_old.ass
@@ -45,7 +45,7 @@ bank4
**********************
bank6
bank6
- 0.000000 167.578 1.039
+ 0.000000 167.578 1.039
**********************
downstream_monitor3_det
monitor
@@ -65,6 +65,6 @@ monitor
**********************
bank1
bank1
- 0.000000 5.5 2.3735
+ 0.000000 5.5 2.3735
diff --git a/tools/ArielToMantidXML/ARIEL/hrpd_new/bank_bsk.ass b/tools/ArielToMantidXML/ARIEL/hrpd_new/bank_bsk.ass
index 3fa9a9f01e5c8a6920e7c5924530292229df555d..685de51f35f76de875d0ad4b0ee1d96bff18c8d8 100644
--- a/tools/ArielToMantidXML/ARIEL/hrpd_new/bank_bsk.ass
+++ b/tools/ArielToMantidXML/ARIEL/hrpd_new/bank_bsk.ass
@@ -30,4 +30,4 @@ module_bsk
mod7
module_bsk
135.000000 0.000000 0.000000
-
+
diff --git a/tools/ArielToMantidXML/ARIEL/pearl/module_90.ass b/tools/ArielToMantidXML/ARIEL/pearl/module_90.ass
index 202930116d1ddde888bf199963b7c330d87ee5cf..748990ea7e6aa45d3e71ae22ca56778dabb934e8 100644
--- a/tools/ArielToMantidXML/ARIEL/pearl/module_90.ass
+++ b/tools/ArielToMantidXML/ARIEL/pearl/module_90.ass
@@ -1,480 +1,480 @@
-**********************
-Det1
-scintillator_pearl
+**********************
+Det1
+scintillator_pearl
-7.5 -7.25 0.0038535
-**********************
-Det2
-scintillator_pearl
+**********************
+Det2
+scintillator_pearl
-2.5 -7.25 -0.0038535
-**********************
-Det3
-scintillator_pearl
+**********************
+Det3
+scintillator_pearl
2.5 -7.25 0.0038535
-**********************
-Det4
-scintillator_pearl
+**********************
+Det4
+scintillator_pearl
7.5 -7.25 -0.0038535
-**********************
-Det5
-scintillator_pearl
+**********************
+Det5
+scintillator_pearl
-7.5 -6.75 0.0038535
-**********************
-Det6
-scintillator_pearl
+**********************
+Det6
+scintillator_pearl
-2.5 -6.75 -0.0038535
-**********************
-Det7
-scintillator_pearl
+**********************
+Det7
+scintillator_pearl
2.5 -6.75 0.0038535
-**********************
-Det8
-scintillator_pearl
+**********************
+Det8
+scintillator_pearl
7.5 -6.75 -0.0038535
-**********************
-Det9
-scintillator_pearl
+**********************
+Det9
+scintillator_pearl
-7.5 -6.25 0.0038535
-**********************
-Det10
-scintillator_pearl
+**********************
+Det10
+scintillator_pearl
-2.5 -6.25 -0.0038535
-**********************
-Det11
-scintillator_pearl
+**********************
+Det11
+scintillator_pearl
2.5 -6.25 0.0038535
-**********************
-Det12
-scintillator_pearl
+**********************
+Det12
+scintillator_pearl
7.5 -6.25 -0.0038535
-**********************
-Det13
-scintillator_pearl
+**********************
+Det13
+scintillator_pearl
-7.5 -5.75 0.0038535
-**********************
-Det14
-scintillator_pearl
+**********************
+Det14
+scintillator_pearl
-2.5 -5.75 -0.0038535
-**********************
-Det15
-scintillator_pearl
+**********************
+Det15
+scintillator_pearl
2.5 -5.75 0.0038535
-**********************
-Det16
-scintillator_pearl
+**********************
+Det16
+scintillator_pearl
7.5 -5.75 -0.0038535
-**********************
-Det17
-scintillator_pearl
+**********************
+Det17
+scintillator_pearl
-7.5 -5.25 0.0038535
-**********************
-Det18
-scintillator_pearl
+**********************
+Det18
+scintillator_pearl
-2.5 -5.25 -0.0038535
-**********************
-Det19
-scintillator_pearl
+**********************
+Det19
+scintillator_pearl
2.5 -5.25 0.0038535
-**********************
-Det20
-scintillator_pearl
+**********************
+Det20
+scintillator_pearl
7.5 -5.25 -0.0038535
-**********************
-Det21
-scintillator_pearl
+**********************
+Det21
+scintillator_pearl
-7.5 -4.75 0.0038535
-**********************
-Det22
-scintillator_pearl
+**********************
+Det22
+scintillator_pearl
-2.5 -4.75 -0.0038535
-**********************
-Det23
-scintillator_pearl
+**********************
+Det23
+scintillator_pearl
2.5 -4.75 0.0038535
-**********************
-Det24
-scintillator_pearl
+**********************
+Det24
+scintillator_pearl
7.5 -4.75 -0.0038535
-**********************
-Det25
-scintillator_pearl
+**********************
+Det25
+scintillator_pearl
-7.5 -4.25 0.0038535
-**********************
-Det26
-scintillator_pearl
+**********************
+Det26
+scintillator_pearl
-2.5 -4.25 -0.0038535
-**********************
-Det27
-scintillator_pearl
+**********************
+Det27
+scintillator_pearl
2.5 -4.25 0.0038535
-**********************
-Det28
-scintillator_pearl
+**********************
+Det28
+scintillator_pearl
7.5 -4.25 -0.0038535
-**********************
-Det29
-scintillator_pearl
+**********************
+Det29
+scintillator_pearl
-7.5 -3.75 0.0038535
-**********************
-Det30
-scintillator_pearl
+**********************
+Det30
+scintillator_pearl
-2.5 -3.75 -0.0038535
-**********************
-Det31
-scintillator_pearl
+**********************
+Det31
+scintillator_pearl
2.5 -3.75 0.0038535
-**********************
-Det32
-scintillator_pearl
+**********************
+Det32
+scintillator_pearl
7.5 -3.75 -0.0038535
-**********************
-Det33
-scintillator_pearl
+**********************
+Det33
+scintillator_pearl
-7.5 -3.25 0.0038535
-**********************
-Det34
-scintillator_pearl
+**********************
+Det34
+scintillator_pearl
-2.5 -3.25 -0.0038535
-**********************
-Det35
-scintillator_pearl
+**********************
+Det35
+scintillator_pearl
2.5 -3.25 0.0038535
-**********************
-Det36
-scintillator_pearl
+**********************
+Det36
+scintillator_pearl
7.5 -3.25 -0.0038535
-**********************
-Det37
-scintillator_pearl
+**********************
+Det37
+scintillator_pearl
-7.5 -2.75 0.0038535
-**********************
-Det38
-scintillator_pearl
+**********************
+Det38
+scintillator_pearl
-2.5 -2.75 -0.0038535
-**********************
-Det39
-scintillator_pearl
+**********************
+Det39
+scintillator_pearl
2.5 -2.75 0.0038535
-**********************
-Det40
-scintillator_pearl
+**********************
+Det40
+scintillator_pearl
7.5 -2.75 -0.0038535
-**********************
-Det41
-scintillator_pearl
+**********************
+Det41
+scintillator_pearl
-7.5 -2.25 0.0038535
-**********************
-Det42
-scintillator_pearl
+**********************
+Det42
+scintillator_pearl
-2.5 -2.25 -0.0038535
-**********************
-Det43
-scintillator_pearl
+**********************
+Det43
+scintillator_pearl
2.5 -2.25 0.0038535
-**********************
-Det44
-scintillator_pearl
+**********************
+Det44
+scintillator_pearl
7.5 -2.25 -0.0038535
-**********************
-Det45
-scintillator_pearl
+**********************
+Det45
+scintillator_pearl
-7.5 -1.75 0.0038535
-**********************
-Det46
-scintillator_pearl
+**********************
+Det46
+scintillator_pearl
-2.5 -1.75 -0.0038535
-**********************
-Det47
-scintillator_pearl
+**********************
+Det47
+scintillator_pearl
2.5 -1.75 0.0038535
-**********************
-Det48
-scintillator_pearl
+**********************
+Det48
+scintillator_pearl
7.5 -1.75 -0.0038535
-**********************
-Det49
-scintillator_pearl
+**********************
+Det49
+scintillator_pearl
-7.5 -1.25 0.0038535
-**********************
-Det50
-scintillator_pearl
+**********************
+Det50
+scintillator_pearl
-2.5 -1.25 -0.0038535
-**********************
-Det51
-scintillator_pearl
+**********************
+Det51
+scintillator_pearl
2.5 -1.25 0.0038535
-**********************
-Det52
-scintillator_pearl
+**********************
+Det52
+scintillator_pearl
7.5 -1.25 -0.0038535
-**********************
-Det53
-scintillator_pearl
+**********************
+Det53
+scintillator_pearl
-7.5 -0.75 0.0038535
-**********************
-Det54
-scintillator_pearl
+**********************
+Det54
+scintillator_pearl
-2.5 -0.75 -0.0038535
-**********************
-Det55
-scintillator_pearl
+**********************
+Det55
+scintillator_pearl
2.5 -0.75 0.0038535
-**********************
-Det56
-scintillator_pearl
+**********************
+Det56
+scintillator_pearl
7.5 -0.75 -0.0038535
-**********************
-Det57
-scintillator_pearl
+**********************
+Det57
+scintillator_pearl
-7.5 -0.25 0.0038535
-**********************
-Det58
-scintillator_pearl
+**********************
+Det58
+scintillator_pearl
-2.5 -0.25 -0.0038535
-**********************
-Det59
-scintillator_pearl
+**********************
+Det59
+scintillator_pearl
2.5 -0.25 0.0038535
-**********************
-Det60
-scintillator_pearl
+**********************
+Det60
+scintillator_pearl
7.5 -0.25 -0.0038535
-**********************
-Det61
-scintillator_pearl
+**********************
+Det61
+scintillator_pearl
-7.5 0.25 0.0038535
-**********************
-Det62
-scintillator_pearl
+**********************
+Det62
+scintillator_pearl
-2.5 0.25 -0.0038535
-**********************
-Det63
-scintillator_pearl
+**********************
+Det63
+scintillator_pearl
2.5 0.25 0.0038535
-**********************
-Det64
-scintillator_pearl
+**********************
+Det64
+scintillator_pearl
7.5 0.25 -0.0038535
-**********************
-Det65
-scintillator_pearl
+**********************
+Det65
+scintillator_pearl
-7.5 0.75 0.0038535
-**********************
-Det66
-scintillator_pearl
+**********************
+Det66
+scintillator_pearl
-2.5 0.75 -0.0038535
-**********************
-Det67
-scintillator_pearl
+**********************
+Det67
+scintillator_pearl
2.5 0.75 0.0038535
-**********************
-Det68
-scintillator_pearl
+**********************
+Det68
+scintillator_pearl
7.5 0.75 -0.0038535
-**********************
-Det69
-scintillator_pearl
+**********************
+Det69
+scintillator_pearl
-7.5 1.25 0.0038535
-**********************
-Det70
-scintillator_pearl
+**********************
+Det70
+scintillator_pearl
-2.5 1.25 -0.0038535
-**********************
-Det71
-scintillator_pearl
+**********************
+Det71
+scintillator_pearl
2.5 1.25 0.0038535
-**********************
-Det72
-scintillator_pearl
+**********************
+Det72
+scintillator_pearl
7.5 1.25 -0.0038535
-**********************
-Det73
-scintillator_pearl
+**********************
+Det73
+scintillator_pearl
-7.5 1.75 0.0038535
-**********************
-Det74
-scintillator_pearl
+**********************
+Det74
+scintillator_pearl
-2.5 1.75 -0.0038535
-**********************
-Det75
-scintillator_pearl
+**********************
+Det75
+scintillator_pearl
2.5 1.75 0.0038535
-**********************
-Det76
-scintillator_pearl
+**********************
+Det76
+scintillator_pearl
7.5 1.75 -0.0038535
-**********************
-Det77
-scintillator_pearl
+**********************
+Det77
+scintillator_pearl
-7.5 2.25 0.0038535
-**********************
-Det78
-scintillator_pearl
+**********************
+Det78
+scintillator_pearl
-2.5 2.25 -0.0038535
-**********************
-Det79
-scintillator_pearl
+**********************
+Det79
+scintillator_pearl
2.5 2.25 0.0038535
-**********************
-Det80
-scintillator_pearl
+**********************
+Det80
+scintillator_pearl
7.5 2.25 -0.0038535
-**********************
-Det81
-scintillator_pearl
+**********************
+Det81
+scintillator_pearl
-7.5 2.75 0.0038535
-**********************
-Det82
-scintillator_pearl
+**********************
+Det82
+scintillator_pearl
-2.5 2.75 -0.0038535
-**********************
-Det83
-scintillator_pearl
+**********************
+Det83
+scintillator_pearl
2.5 2.75 0.0038535
-**********************
-Det84
-scintillator_pearl
+**********************
+Det84
+scintillator_pearl
7.5 2.75 -0.0038535
-**********************
-Det85
-scintillator_pearl
+**********************
+Det85
+scintillator_pearl
-7.5 3.25 0.0038535
-**********************
-Det86
-scintillator_pearl
+**********************
+Det86
+scintillator_pearl
-2.5 3.25 -0.0038535
-**********************
-Det87
-scintillator_pearl
+**********************
+Det87
+scintillator_pearl
2.5 3.25 0.0038535
-**********************
-Det88
-scintillator_pearl
+**********************
+Det88
+scintillator_pearl
7.5 3.25 -0.0038535
-**********************
-Det89
-scintillator_pearl
+**********************
+Det89
+scintillator_pearl
-7.5 3.75 0.0038535
-**********************
-Det90
-scintillator_pearl
+**********************
+Det90
+scintillator_pearl
-2.5 3.75 -0.0038535
-**********************
-Det91
-scintillator_pearl
+**********************
+Det91
+scintillator_pearl
2.5 3.75 0.0038535
-**********************
-Det92
-scintillator_pearl
+**********************
+Det92
+scintillator_pearl
7.5 3.75 -0.0038535
-**********************
-Det93
-scintillator_pearl
+**********************
+Det93
+scintillator_pearl
-7.5 4.25 0.0038535
-**********************
-Det94
-scintillator_pearl
+**********************
+Det94
+scintillator_pearl
-2.5 4.25 -0.0038535
-**********************
-Det95
-scintillator_pearl
+**********************
+Det95
+scintillator_pearl
2.5 4.25 0.0038535
-**********************
-Det96
-scintillator_pearl
+**********************
+Det96
+scintillator_pearl
7.5 4.25 -0.0038535
-**********************
-Det97
-scintillator_pearl
+**********************
+Det97
+scintillator_pearl
-7.5 4.75 0.0038535
-**********************
-Det98
-scintillator_pearl
+**********************
+Det98
+scintillator_pearl
-2.5 4.75 -0.0038535
-**********************
-Det99
-scintillator_pearl
+**********************
+Det99
+scintillator_pearl
2.5 4.75 0.0038535
-**********************
-Det100
-scintillator_pearl
+**********************
+Det100
+scintillator_pearl
7.5 4.75 -0.0038535
-**********************
-Det101
-scintillator_pearl
+**********************
+Det101
+scintillator_pearl
-7.5 5.25 0.0038535
-**********************
-Det102
-scintillator_pearl
+**********************
+Det102
+scintillator_pearl
-2.5 5.25 -0.0038535
-**********************
-Det103
-scintillator_pearl
+**********************
+Det103
+scintillator_pearl
2.5 5.25 0.0038535
-**********************
-Det104
-scintillator_pearl
+**********************
+Det104
+scintillator_pearl
7.5 5.25 -0.0038535
-**********************
-Det105
-scintillator_pearl
+**********************
+Det105
+scintillator_pearl
-7.5 5.75 0.0038535
-**********************
-Det106
-scintillator_pearl
+**********************
+Det106
+scintillator_pearl
-2.5 5.75 -0.0038535
-**********************
-Det107
-scintillator_pearl
+**********************
+Det107
+scintillator_pearl
2.5 5.75 0.0038535
-**********************
-Det108
-scintillator_pearl
+**********************
+Det108
+scintillator_pearl
7.5 5.75 -0.0038535
-**********************
-Det109
-scintillator_pearl
+**********************
+Det109
+scintillator_pearl
-7.5 6.25 0.0038535
-**********************
-Det110
-scintillator_pearl
+**********************
+Det110
+scintillator_pearl
-2.5 6.25 -0.0038535
-**********************
-Det111
-scintillator_pearl
+**********************
+Det111
+scintillator_pearl
2.5 6.25 0.0038535
-**********************
-Det112
-scintillator_pearl
+**********************
+Det112
+scintillator_pearl
7.5 6.25 -0.0038535
-**********************
-Det113
-scintillator_pearl
+**********************
+Det113
+scintillator_pearl
-7.5 6.75 0.0038535
-**********************
-Det114
-scintillator_pearl
+**********************
+Det114
+scintillator_pearl
-2.5 6.75 -0.0038535
-**********************
-Det115
-scintillator_pearl
+**********************
+Det115
+scintillator_pearl
2.5 6.75 0.0038535
-**********************
-Det116
-scintillator_pearl
+**********************
+Det116
+scintillator_pearl
7.5 6.75 -0.0038535
-**********************
-Det117
-scintillator_pearl
+**********************
+Det117
+scintillator_pearl
-7.5 7.25 0.0038535
-**********************
-Det118
-scintillator_pearl
+**********************
+Det118
+scintillator_pearl
-2.5 7.25 -0.0038535
-**********************
-Det119
-scintillator_pearl
+**********************
+Det119
+scintillator_pearl
2.5 7.25 0.0038535
-**********************
-Det120
-scintillator_pearl
+**********************
+Det120
+scintillator_pearl
7.5 7.25 -0.0038535
diff --git a/tools/ArielToMantidXML/ARIEL/pearl/module_long.ass b/tools/ArielToMantidXML/ARIEL/pearl/module_long.ass
index 6ee7c616edad5129accc52272fccefc838ad799b..2bfab493d186964ef56aa216cbf33010e82408c3 100644
--- a/tools/ArielToMantidXML/ARIEL/pearl/module_long.ass
+++ b/tools/ArielToMantidXML/ARIEL/pearl/module_long.ass
@@ -1,121 +1,121 @@
-**********************
-Det1
-scintillator_pearl
+**********************
+Det1
+scintillator_pearl
265 2.25 0.0038535
-**********************
-Det2
-scintillator_pearl
+**********************
+Det2
+scintillator_pearl
270 2.25 0.0038535
-**********************
-Det3
-scintillator_pearl
+**********************
+Det3
+scintillator_pearl
275 2.25 0.0038535
-**********************
-Det4
-scintillator_pearl
+**********************
+Det4
+scintillator_pearl
265 1.75 -0.0038535
-**********************
-Det5
-scintillator_pearl
+**********************
+Det5
+scintillator_pearl
270 1.75 -0.0038535
-**********************
-Det6
-scintillator_pearl
+**********************
+Det6
+scintillator_pearl
275 1.75 -0.0038535
-**********************
-Det7
-scintillator_pearl
+**********************
+Det7
+scintillator_pearl
265 1.25 0.0038535
-**********************
-Det8
-scintillator_pearl
+**********************
+Det8
+scintillator_pearl
270 1.25 0.0038535
-**********************
-Det9
-scintillator_pearl
+**********************
+Det9
+scintillator_pearl
275 1.25 0.0038535
-**********************
-Det10
-scintillator_pearl
+**********************
+Det10
+scintillator_pearl
265 0.75 -0.0038535
-**********************
-Det11
-scintillator_pearl
+**********************
+Det11
+scintillator_pearl
270 0.75 -0.0038535
-**********************
-Det12
-scintillator_pearl
+**********************
+Det12
+scintillator_pearl
275 0.75 -0.0038535
-**********************
-Det13
-scintillator_pearl
+**********************
+Det13
+scintillator_pearl
265 0.25 0.0038535
-**********************
-Det14
-scintillator_pearl
+**********************
+Det14
+scintillator_pearl
270 0.25 0.0038535
-**********************
-Det15
-scintillator_pearl
+**********************
+Det15
+scintillator_pearl
275 0.25 0.0038535
-**********************
-Det16
-scintillator_pearl
+**********************
+Det16
+scintillator_pearl
265 -0.25 -0.0038535
-**********************
-Det17
-scintillator_pearl
+**********************
+Det17
+scintillator_pearl
270 -0.25 -0.0038535
-**********************
-Det18
-scintillator_pearl
+**********************
+Det18
+scintillator_pearl
275 -0.25 -0.0038535
-**********************
-Det19
-scintillator_pearl
+**********************
+Det19
+scintillator_pearl
265 -0.75 0.0038535
-**********************
-Det20
-scintillator_pearl
+**********************
+Det20
+scintillator_pearl
270 -0.75 0.0038535
-**********************
-Det21
-scintillator_pearl
+**********************
+Det21
+scintillator_pearl
275 -0.75 0.0038535
-**********************
-Det22
-scintillator_pearl
+**********************
+Det22
+scintillator_pearl
265 -1.25 -0.0038535
-**********************
-Det23
-scintillator_pearl
+**********************
+Det23
+scintillator_pearl
270 -1.25 -0.0038535
-**********************
-Det24
-scintillator_pearl
+**********************
+Det24
+scintillator_pearl
275 -1.25 -0.0038535
-**********************
-Det25
-scintillator_pearl
+**********************
+Det25
+scintillator_pearl
265 -1.75 0.0038535
-**********************
-Det26
-scintillator_pearl
+**********************
+Det26
+scintillator_pearl
270 -1.75 0.0038535
-**********************
-Det27
-scintillator_pearl
+**********************
+Det27
+scintillator_pearl
275 -1.75 0.0038535
-**********************
-Det28
-scintillator_pearl
+**********************
+Det28
+scintillator_pearl
265 -2.25 -0.0038535
-**********************
-Det29
-scintillator_pearl
+**********************
+Det29
+scintillator_pearl
270 -2.25 -0.0038535
-**********************
-Det30
-scintillator_pearl
+**********************
+Det30
+scintillator_pearl
275 -2.25 -0.0038535
-**********************
+**********************
diff --git a/tools/ArielToMantidXML/ArielToMantidXML/Component.cpp b/tools/ArielToMantidXML/ArielToMantidXML/Component.cpp
index 9ed75093890c75bd2dd0afd0cf769815d2733b2d..45fa0eb0d2f4311caf6eed864db17ea89aee2d64 100644
--- a/tools/ArielToMantidXML/ArielToMantidXML/Component.cpp
+++ b/tools/ArielToMantidXML/ArielToMantidXML/Component.cpp
@@ -12,7 +12,7 @@
int Component::counter = 0;
-Component::Component(const std::string& name, const std::string& type) :
+Component::Component(const std::string& name, const std::string& type) :
m_name(name), m_type(type), m_parent(NULL), m_r(0), m_theta(0), m_phi(0)
{
// Open the .dat file for this type and check whether it's a composite type
diff --git a/tools/ArielToMantidXML/ArielToMantidXML/Component.h b/tools/ArielToMantidXML/ArielToMantidXML/Component.h
index a65ccc1d84637273d2d059d80a908bb763a2507e..20bd320cd62937258e084f37d19d55ddfdd5a3ec 100644
--- a/tools/ArielToMantidXML/ArielToMantidXML/Component.h
+++ b/tools/ArielToMantidXML/ArielToMantidXML/Component.h
@@ -21,7 +21,7 @@ public:
void findChildren();
// Sets the parent of the current component
void setParent(Component* parent);
- // Sets the
+ // Sets the
void setSpherical(const double& r, const double& theta, const double& phi);
// Finds the primary flightpath.
// Only works on an 'instrument'/top component(returns empty string otherwise)
@@ -48,7 +48,7 @@ private:
const std::string m_name;
const std::string m_type;
-
+
bool m_isAssembly;
Component* m_parent;
diff --git a/tools/ArielToMantidXML/ArielToMantidXML/XMLWriter.cpp b/tools/ArielToMantidXML/ArielToMantidXML/XMLWriter.cpp
index 56a23c5f68086894597c7854ea563ac592d4b117..3a005446cfb41c4b8eb3b12ec3a7d57ca9fb778a 100644
--- a/tools/ArielToMantidXML/ArielToMantidXML/XMLWriter.cpp
+++ b/tools/ArielToMantidXML/ArielToMantidXML/XMLWriter.cpp
@@ -27,7 +27,7 @@ XMLWriter::XMLWriter(const std::string& name, Component* const startPoint) :
char timestamp[64] = { 0 };
strftime(timestamp, 32, "%Y-%m-%dT%H:%M:%S", localtime(&now));
- m_outputFile << "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" << std::endl;
+ m_outputFile << "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" << std::endl;
m_outputFile << "<instrument name=\"" << name << "\" date-time=\"" << timestamp << "\">" << std::endl;
m_outputFile << "<!-- Generated by the ArielToMantidXML tool -->" << std::endl;
this->writeDefaults();
@@ -80,7 +80,7 @@ void XMLWriter::writeDetectors()
if ( current != m_startPoint )
{
m_outputFile << "<type name=\"" << current->type() << "\"";
- if ( ! current->hasChildren() ) m_outputFile << " is=\"detector\"";
+ if ( ! current->hasChildren() ) m_outputFile << " is=\"detector\"";
m_outputFile << ">" << std::endl;
m_outputFile << "<properties />" << std::endl;
}
@@ -152,7 +152,7 @@ void XMLWriter::writeSourceSample()
m_outputFile << "<component type=\"undulator\">" << std::endl;
// This next line gets the primary flightpath and inserts it
- m_outputFile << " <location z=\"-" << m_startPoint->findL1() << "\" />" << std::endl;
+ m_outputFile << " <location z=\"-" << m_startPoint->findL1() << "\" />" << std::endl;
m_outputFile << "</component>" << std::endl;
m_outputFile << "<component type=\"nickel-holder\">" << std::endl;
@@ -163,7 +163,7 @@ void XMLWriter::writeSourceSample()
m_outputFile << "<type name=\"undulator\" is=\"Source\">" << std::endl;
m_outputFile << " <properties />" << std::endl;
m_outputFile << "</type>" << std::endl;
- m_outputFile << "<!-- Sample-position types -->" << std::endl;
+ m_outputFile << "<!-- Sample-position types -->" << std::endl;
m_outputFile << "<type name=\"nickel-holder\" is=\"SamplePos\">" << std::endl;
m_outputFile << " <properties />" << std::endl;
m_outputFile << "</type>" << std::endl;