diff --git a/Code/Mantid/Framework/Build/Tests/Mantid.properties.template b/Code/Mantid/Framework/Build/Tests/Mantid.properties.template
deleted file mode 100644
index 0b499be4d2fda0c1843921fbee804d57661052de..0000000000000000000000000000000000000000
--- a/Code/Mantid/Framework/Build/Tests/Mantid.properties.template
+++ /dev/null
@@ -1,42 +0,0 @@
-#framework configuration
-mantid.legs = 6
-
-#logging configuration
-logging.loggers.root.level = information
-logging.loggers.root.channel = fileChannel
-logging.channels.fileChannel.class = FileChannel
-logging.channels.fileChannel.path = Test.log
-logging.channels.fileChannel.formatter.class = PatternFormatter
-logging.channels.fileChannel.formatter.pattern = %Y-%m-%d %H:%M:%S,%i [%I] %p %s - %t
-logging.channels.fileChannel.times = local
-logging.channels.fileChannel.formatter.times = local
-
-#Plugin configuration
-plugins.directory = .
-
-#Where to load instrument definition files from
-instrumentDefinition.directory = @MANTID_ROOT@/Instrument
-
-# Where to load parameter definition files from
-parameterDefinition.directory = @MANTID_ROOT@/Instrument
-
-# The location of the scripts directory. This is added to the python path by the
-# Python API so that Mantid scripts can be imported more easily
-pythonscripts.directory = @MANTID_ROOT@/Scripts
-
-# Data search path
-datasearch.directories = @MANTID_ROOT@/../../Test/AutoTestData;@MANTID_ROOT@/../../Test/VATES;@MANTID_ROOT@/Instrument
-
-# Default save directory
-defaultsave.directory = .
-
-# ICat downlaod directory
-icatDownload.directory = .
-
-# Uncommenting the line below will lead to all 2D workspaces being of the ManagedWorkspace2D variety
-#ManagedWorkspace.LowerMemoryLimit = 0
-ManagedWorkspace.LowerMemoryLimit = 80
-ManagedWorkspace.DataBlockSize = 4000
-ManagedWorkspace.FilePath = .
-
-algorithms.retained = 50
diff --git a/Code/Mantid/Framework/Kernel/CMakeLists.txt b/Code/Mantid/Framework/Kernel/CMakeLists.txt
index 5147b559fd6594775e089ece200878ca02aa7255..e90419cd4aa9ef065f516fd28e2851a9051b5874 100644
--- a/Code/Mantid/Framework/Kernel/CMakeLists.txt
+++ b/Code/Mantid/Framework/Kernel/CMakeLists.txt
@@ -220,6 +220,6 @@ endif ()
set ( MANTID_ROOT ${CMAKE_SOURCE_DIR} )
-configure_file ( ../Build/Tests/Mantid.properties.template
+configure_file ( ../Properties/Mantid.properties.template
${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Mantid.properties
)
diff --git a/Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h b/Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h
index 7e5ad7aa63a545c01044266e0b23dc949bccbeb9..5b6ec37beb677be20a3f06c0a77601481cb49c89 100644
--- a/Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h
+++ b/Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h
@@ -110,20 +110,20 @@ public:
void TestCustomProperty()
{
//Mantid.legs is defined in the properties script as 6
- std::string legCountString = ConfigService::Instance().getString("mantid.legs");
- TS_ASSERT_EQUALS(legCountString, "6");
+ std::string countString = ConfigService::Instance().getString("ManagedWorkspace.DataBlockSize");
+ TS_ASSERT_EQUALS(countString, "4000");
}
void TestCustomPropertyAsValue()
{
//Mantid.legs is defined in the properties script as 6
int value = 0;
- int retVal = ConfigService::Instance().getValue("mantid.legs",value);
+ int retVal = ConfigService::Instance().getValue("ManagedWorkspace.DataBlockSize",value);
double dblValue = 0;
- retVal = ConfigService::Instance().getValue("mantid.legs",dblValue);
+ retVal = ConfigService::Instance().getValue("ManagedWorkspace.DataBlockSize",dblValue);
- TS_ASSERT_EQUALS(value, 6);
- TS_ASSERT_EQUALS(dblValue, 6.0);
+ TS_ASSERT_EQUALS(value, 4000);
+ TS_ASSERT_EQUALS(dblValue, 4000.0);
}
void TestMissingProperty()
diff --git a/Code/Mantid/Framework/Properties/Mantid.properties.template b/Code/Mantid/Framework/Properties/Mantid.properties.template
new file mode 100644
index 0000000000000000000000000000000000000000..06f900da5ea04fe2dc06e4b6b782ec59bd53211c
--- /dev/null
+++ b/Code/Mantid/Framework/Properties/Mantid.properties.template
@@ -0,0 +1,129 @@
+# File: Mantid Properties
+# Purpose: This file contains the basic configuration for Mantid.
+# WARNING: This file is not intended to be edited by users.
+# If you wish to override any setting in this file
+# Simply copy the entry into the Mantid.user.Properties file
+# and set the value you desire there. Any settings in the user.properties
+# file will override those set in this file.
+#
+# This File will be overwritten with each new version of Mantid, however
+# we will never alter your user.properties file so settings there are safe.
+
+# A semi-colon separated list of supported facilities
+supported.facilities = ISIS;SNS
+
+# Set a default facility
+default.facility = ISIS
+
+# Set a default instrument
+default.instrument =
+
+# Set of PyQt interfaces to add to the Interfaces menu, separated by a space
+mantidqt.python_interfaces = HFIR_Reduction.py
+mantidqt.python_interfaces_directory = @MANTID_ROOT@/Scripts
+
+# Where to find mantid plugin libraries
+plugins.directory = .
+
+# Where to find Mantid Qt plugin libraries
+mantidqt.plugins.directory = .
+
+# Where to load instrument definition files from
+instrumentDefinition.directory = @MANTID_ROOT@/Instrument
+
+# Where to load parameter definition files from
+parameterDefinition.directory = @MANTID_ROOT@/Instrument
+
+# Location of Python scripts that are required for certain aspects of Mantid to function
+# correctly, i.e. customized interfaces
+#
+# WARNING: Altering this value will almost certainly break Mantid functionality
+#
+requiredpythonscript.directories = @MANTID_ROOT@/Scripts/Crystallography;@MANTID_ROOT@/Scripts/DisorderedMaterials;@MANTID_ROOT@/Scripts/Engineering;@MANTID_ROOT@/Scripts/Inelastic;@MANTID_ROOT@/Scripts/LargeScaleStructures;\
+@MANTID_ROOT@/Scripts/Muons;@MANTID_ROOT@/Scripts/Neutrinos;@MANTID_ROOT@/Scripts/SANS;@MANTID_ROOT@/Scripts/
+
+# Additional directory for Python scripts. This is added to the Python path by the
+# Python API (DEPRECATED: Use pythonscripts.directories)
+# Note that this is NOT recursive
+pythonscripts.directory = @MANTID_ROOT@/Scripts
+
+# Additional directories for Python scripts. These are added to the Python path by the
+# Python API.
+# Note that they are NOT recursive
+pythonscripts.directories = @MANTID_ROOT@/Scripts
+
+# The locations of Python algorithms that are to be loaded at startup
+pythonalgorithms.directories = @MANTID_ROOT@/Framework/PythonAPI/PythonAlgorithms
+
+# A semi-colon(;) separated list of directories to use to search for data
+# Use forward slash / for all paths
+datasearch.directories = @MANTID_ROOT@/../../Test/AutoTestData;@MANTID_ROOT@/../../Test/VATES;@MANTID_ROOT@/Instrument
+
+# A semi-colon(;) separated list of directories to use to search for files other than data
+# Use forward slash / for all paths
+usersearch.directories =
+
+# Setting this to On enables searching the facilitie's archive automatically
+datasearch.searcharchive = Off
+
+# A default directory to use for saving files
+# Use forward slash / for all paths
+defaultsave.directory =
+
+# ICat download directory
+icatDownload.directory = @MANTID_ROOT@/../../Test/Data/ICatDownload
+
+# The Number of algorithms properties to retain im memory for refence in scripts.
+algorithms.retained = 50
+
+# ManagedWorkspace.LowerMemoryLimit sets the memory limit to trigger the use of
+# a ManagedWorkspace. A ManagedWorkspace will be used for a workspace requiring greater amount of memory
+# than defined by LowerMemoryLimit. LowerMemoryLimit is a precentage of the physical memory available for
+# the process. On Linux it is the free physical memory, on Windows it is the smaller of the free physical memory
+# and the available virtual memory. The default value for LowerMemoryLimit is 40%. Setting the limit too high
+# may lead to unrecoverable bad allocations. If this happens the advice is to close Mantid and relaunch it
+# with a smaller LowerMemoryLimit.
+#
+ManagedWorkspace.LowerMemoryLimit = 80
+# Setting this to 1 will disable managed workspaces completely - use with care!
+ManagedWorkspace.AlwaysInMemory = 0
+ManagedWorkspace.DataBlockSize = 4000
+ManagedWorkspace.FilePath = .
+CompressedWorkspace.DoNotUse = 1
+
+# Defines the area (in FWHM) on both sides of the peak centre within which peaks are calculated.
+# Outside this area peak functions return zero.
+curvefitting.peakRadius = 5
+
+
+#Uncommenting the line below will enable algorithm chain re-running whenever a
+#workspace is replaced. Uncommenting and setting it to 0 will also turn it off
+#enabling this is currently discouraged as it could cause race conditions with python scripts
+#AlgorithmChaining.SwitchedOn = 1
+
+# logging configuration
+# root level message filter (drop to debug for more messages)
+logging.loggers.root.level = information
+# splitting the messages to many logging channels
+logging.loggers.root.channel.class = SplitterChannel
+logging.loggers.root.channel.channel1 = consoleChannel
+logging.loggers.root.channel.channel2 = fileFilterChannel
+logging.loggers.root.channel.channel3 = signalChannel
+# output to the console - primarily for console based apps
+logging.channels.consoleChannel.class = ConsoleChannel
+logging.channels.consoleChannel.formatter = f1
+# specific filter for the file channel raising the level to warning (drop to debug for debugging)
+logging.channels.fileFilterChannel.class= FilterChannel
+logging.channels.fileFilterChannel.channel= fileChannel
+logging.channels.fileFilterChannel.level= warning
+# output to a file (For error capturing and debugging)
+logging.channels.fileChannel.class = FileChannel
+logging.channels.fileChannel.path = ../logs/mantid.log
+logging.channels.fileChannel.formatter.class = PatternFormatter
+logging.channels.fileChannel.formatter.pattern = %Y-%m-%d %H:%M:%S,%i [%I] %p %s - %t
+logging.formatters.f1.class = PatternFormatter
+logging.formatters.f1.pattern = %s-[%p] %t
+logging.formatters.f1.times = local
+logging.channels.fileChannel.formatter.times = local
+# SignalChannel - Passes messages to the MantidPlot User interface
+logging.channels.signalChannel.class = SignalChannel