diff --git a/Code/Mantid/Framework/API/src/ExperimentInfo.cpp b/Code/Mantid/Framework/API/src/ExperimentInfo.cpp
index dace59eea4614dcae5ec0514bb7951a8dd78b739..d36f5ec22827c6c686892c4267b78da940c3419d 100644
--- a/Code/Mantid/Framework/API/src/ExperimentInfo.cpp
+++ b/Code/Mantid/Framework/API/src/ExperimentInfo.cpp
@@ -817,7 +817,7 @@ namespace API
std::string instrument(Kernel::ConfigService::Instance().getInstrument(instrumentName).name());
// Get the search directory for XML instrument definition files (IDFs)
- std::string directoryName = Kernel::ConfigService::Instance().getInstrumentDirectory();
+ std::vector<std::string> directoryNames = Kernel::ConfigService::Instance().getInstrumentDirectories();
boost::regex regex(instrument+"_Definition.*\\.xml", boost::regex_constants::icase);
Poco::DirectoryIterator end_iter;
@@ -826,39 +826,44 @@ namespace API
std::string mostRecentIDF; // store most recently starting matching IDF if found, else most recently starting IDF.
DateAndTime refDate("1900-01-31 23:59:00"); // used to help determine the most recently starting IDF, if none match
DateAndTime refDateGoodFile("1900-01-31 23:59:00"); // used to help determine the most recently starting matching IDF
- for ( Poco::DirectoryIterator dir_itr(directoryName); dir_itr != end_iter; ++dir_itr )
+ for ( auto instDirs_itr = directoryNames.begin(); instDirs_itr != directoryNames.end(); ++instDirs_itr)
{
- if ( !Poco::File(dir_itr->path() ).isFile() ) continue;
-
- std::string l_filenamePart = Poco::Path(dir_itr->path()).getFileName();
- if ( regex_match(l_filenamePart, regex) )
+ //This will iterate around the directories from user ->etc ->install, and find the first beat file
+ std::string directoryName = *instDirs_itr;
+ for ( Poco::DirectoryIterator dir_itr(directoryName); dir_itr != end_iter; ++dir_itr )
{
- g_log.debug() << "Found file: '" << dir_itr->path() << "'\n";
- std::string validFrom, validTo;
- getValidFromTo(dir_itr->path(), validFrom, validTo);
- g_log.debug() << "File '" << dir_itr->path() << " valid dates: from '" << validFrom << "' to '" << validTo << "'\n";
- DateAndTime from(validFrom);
- // Use a default valid-to date if none was found.
- DateAndTime to;
- if (validTo.length() > 0)
- to.setFromISO8601(validTo);
- else
- to.setFromISO8601("2100-01-01T00:00:00");
+ if ( !Poco::File(dir_itr->path() ).isFile() ) continue;
- if ( from <= d && d <= to )
+ std::string l_filenamePart = Poco::Path(dir_itr->path()).getFileName();
+ if ( regex_match(l_filenamePart, regex) )
{
- if( from > refDateGoodFile )
- { // We'd found a matching file more recently starting than any other matching file found
- foundGoodFile = true;
- refDateGoodFile = from;
+ g_log.debug() << "Found file: '" << dir_itr->path() << "'\n";
+ std::string validFrom, validTo;
+ getValidFromTo(dir_itr->path(), validFrom, validTo);
+ g_log.debug() << "File '" << dir_itr->path() << " valid dates: from '" << validFrom << "' to '" << validTo << "'\n";
+ DateAndTime from(validFrom);
+ // Use a default valid-to date if none was found.
+ DateAndTime to;
+ if (validTo.length() > 0)
+ to.setFromISO8601(validTo);
+ else
+ to.setFromISO8601("2100-01-01T00:00:00");
+
+ if ( from <= d && d <= to )
+ {
+ if( from > refDateGoodFile )
+ { // We'd found a matching file more recently starting than any other matching file found
+ foundGoodFile = true;
+ refDateGoodFile = from;
+ mostRecentIDF = dir_itr->path();
+ }
+ }
+ if ( !foundGoodFile && ( from > refDate ) )
+ { // Use most recently starting file, in case we don't find a matching file.
+ refDate = from;
mostRecentIDF = dir_itr->path();
}
}
- if ( !foundGoodFile && ( from > refDate ) )
- { // Use most recently starting file, in case we don't find a matching file.
- refDate = from;
- mostRecentIDF = dir_itr->path();
- }
}
}
g_log.debug() << "IDF selected is " << mostRecentIDF << std::endl;
diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadInstrument.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadInstrument.h
index 2ad801b20fc2355b88c6064cd3532a52d55d1bb9..5e8201bca7d1cab1c89b38bd1d0ed64eec4653c0 100644
--- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadInstrument.h
+++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadInstrument.h
@@ -87,7 +87,7 @@ namespace Mantid
/// Algorithm's name for identification overriding a virtual method
virtual const std::string name() const { return "LoadInstrument";};
///Summary of algorithms purpose
- virtual const std::string summary() const {return "Loads an Instrument Definition File (IDF) into a workspace. After the IDF has been read this algorithm will attempt to run the Child Algorithm LoadParameterFile; where if IDF filename is of the form IDENTIFIER_Definition.xml then the instrument parameters in the file named IDENTIFIER_Parameters.xml would be loaded (in the directory specified by the parameterDefinition.directory Mantid property).";}
+ virtual const std::string summary() const {return "Loads an Instrument Definition File (IDF) into a workspace. After the IDF has been read this algorithm will attempt to run the Child Algorithm LoadParameterFile; where if IDF filename is of the form IDENTIFIER_Definition.xml then the instrument parameters in the file named IDENTIFIER_Parameters.xml would be loaded.";}
/// Algorithm's version for identification overriding a virtual method
virtual int version() const { return 1;};
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadIDFFromNexus.cpp b/Code/Mantid/Framework/DataHandling/src/LoadIDFFromNexus.cpp
index ee1b57f9584cec42af8ea90662e26e4effa5d65c..358d49004f54d394b4b2ad6f453e909138b2fbb1 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadIDFFromNexus.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadIDFFromNexus.cpp
@@ -79,19 +79,25 @@ void LoadIDFFromNexus::exec()
if ( parameterString.empty() )
{
// Create the 'fallback' parameter file name to look for
- const std::string directory = ConfigService::Instance().getString("parameterDefinition.directory");
+ std::vector<std::string> directoryNames = ConfigService::Instance().getInstrumentDirectories();
const std::string instrumentName = localWorkspace->getInstrument()->getName();
- const std::string paramFile = directory + instrumentName + "_Parameters.xml";
-
- try {
- // load and also populate instrument parameters from this 'fallback' parameter file
- Algorithm_sptr loadParamAlg = createChildAlgorithm("LoadParameterFile");
- loadParamAlg->setProperty("Filename", paramFile);
- loadParamAlg->setProperty("Workspace", localWorkspace);
- loadParamAlg->execute();
- g_log.notice() << "Instrument parameter file: " << paramFile << " has been loaded" << std::endl;
- } catch ( std::runtime_error& ) {
- g_log.debug() << "Instrument parameter file: " << paramFile << " not found or un-parsable. ";
+ for ( auto instDirs_itr = directoryNames.begin(); instDirs_itr != directoryNames.end(); ++instDirs_itr)
+ {
+ //This will iterate around the directories from user ->etc ->install, and find the first beat file
+ std::string directoryName = *instDirs_itr;
+ const std::string paramFile = directoryName + instrumentName + "_Parameters.xml";
+
+ try {
+ // load and also populate instrument parameters from this 'fallback' parameter file
+ Algorithm_sptr loadParamAlg = createChildAlgorithm("LoadParameterFile");
+ loadParamAlg->setProperty("Filename", paramFile);
+ loadParamAlg->setProperty("Workspace", localWorkspace);
+ loadParamAlg->execute();
+ g_log.notice() << "Instrument parameter file: " << paramFile << " has been loaded" << std::endl;
+ break; //stop at the first one
+ } catch ( std::runtime_error& ) {
+ g_log.debug() << "Instrument parameter file: " << paramFile << " not found or un-parsable. ";
+ }
}
}
else
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadInstrument.cpp b/Code/Mantid/Framework/DataHandling/src/LoadInstrument.cpp
index 465e04a7598b2032f0b7534bd3a327f72503ac7e..45661ecd0d7d862719c6baea545402440da26bdd 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadInstrument.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadInstrument.cpp
@@ -202,14 +202,17 @@ namespace Mantid
{
// Not found, so search the other places were it may occur
Kernel::ConfigServiceImpl & configService = Kernel::ConfigService::Instance();
- std::string directoryName = configService.getString("parameterDefinition.directory");
- if (directoryName.empty())
+ std::vector<std::string> directoryNames = configService.getInstrumentDirectories();
+
+ for ( auto instDirs_itr = directoryNames.begin(); instDirs_itr != directoryNames.end(); ++instDirs_itr)
{
- // This is the assumed deployment directory for parameter files, where we need to be
- // relative to the directory of the executable, not the current working directory.
- directoryName = Poco::Path(configService.getPropertiesDir()).resolve("../instrument").toString();
+ //This will iterate around the directories from user ->etc ->install, and find the first beat file
+ std::string directoryName = *instDirs_itr;
+ fullPathParamIDF = getFullPathParamIDF( directoryName );
+ //stop when you find the first one
+ if (!fullPathParamIDF.empty())
+ break;
}
- fullPathParamIDF = getFullPathParamIDF( directoryName );
}
if(!fullPathParamIDF.empty()) {
diff --git a/Code/Mantid/Framework/Kernel/CMakeLists.txt b/Code/Mantid/Framework/Kernel/CMakeLists.txt
index eb69cdb6b0b683733d014cc96952e1b62144e511..2a662b61e67ff463f39b7c3d4096b75f5b607563 100644
--- a/Code/Mantid/Framework/Kernel/CMakeLists.txt
+++ b/Code/Mantid/Framework/Kernel/CMakeLists.txt
@@ -364,7 +364,7 @@ set_property ( TARGET Kernel PROPERTY FOLDER "MantidFramework" )
target_link_libraries ( Kernel ${MANTIDLIBS} ${GSL_LIBRARIES} ${NEXUS_LIBRARIES} )
if ( WIN32 )
- target_link_libraries ( Kernel Psapi.lib ) # For memory usage queries
+ target_link_libraries ( Kernel Psapi.lib shell32.lib ) # For memory usage queries
endif()
# Add the unit tests directory
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/ConfigService.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/ConfigService.h
index c82d26ecfac271580ea886d5be75ca003df9c291..62f8ebbc64125112ce31a64185db1313d3a89fd8 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/ConfigService.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/ConfigService.h
@@ -158,6 +158,8 @@ namespace Mantid
std::string getCurrentDir() const;
/// Returns the system's temp directory
std::string getTempDir();
+ /// Returns the system's appdata directory
+ std::string getAppDataDir();
//Return the executable path
std::string getDirectoryOfExecutable() const;
//Return the full path to the executable
@@ -184,6 +186,8 @@ namespace Mantid
/// Get the list of user search paths
const std::vector<std::string>& getUserSearchDirs() const;
/// Get instrument search directory
+ const std::vector<std::string>& getInstrumentDirectories() const;
+ /// Get instrument search directory
const std::string getInstrumentDirectory() const;
//@}
@@ -249,13 +253,17 @@ namespace Mantid
/// Create the storage of the data search directories
void cacheDataSearchPaths();
/// Create the storage of the user search directories
- void cacheUserSearchPaths();
+ void cacheUserSearchPaths();
+ /// Create the storage of the instrument directories
+ void cacheInstrumentPaths();
/// Returns true if the path is in the data search list
bool isInDataSearchList(const std::string & path) const;
/// Empty the list of facilities, deleting the FacilityInfo objects in the process
void clearFacilities();
/// Set the PV_PLUGIN_PATH to point at this version of Mantid.
void setParaViewPluginPath() const;
+ /// Verifies the directory exists and add it to the back of the directory list if valid
+ bool addDirectoryifExists(const std::string& directoryName, std::vector<std::string>& directoryList);
// Forward declaration of inner class
template <class T>
@@ -288,6 +296,8 @@ namespace Mantid
std::vector<std::string> m_DataSearchDirs;
/// Store a list of user search paths
std::vector<std::string> m_UserSearchDirs;
+ /// Store a list of instrument directory paths
+ std::vector<std::string> m_InstrumentDirs;
/// A map of facilities to instruments
std::map<std::string,std::vector<std::string> > m_instr_prefixes;
diff --git a/Code/Mantid/Framework/Kernel/src/ConfigService.cpp b/Code/Mantid/Framework/Kernel/src/ConfigService.cpp
index a8c19760fe57132ac7bd7d3633ef0114d206bb44..4674ee60ce0172b4638e403dcc0743a03ea59a77 100644
--- a/Code/Mantid/Framework/Kernel/src/ConfigService.cpp
+++ b/Code/Mantid/Framework/Kernel/src/ConfigService.cpp
@@ -1,6 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
+
#include "MantidKernel/ConfigService.h"
#include "MantidKernel/MantidVersion.h"
#include "MantidKernel/ParaViewVersion.h"
@@ -32,6 +33,7 @@
#include <Poco/PipeStream.h>
#include <Poco/StreamCopier.h>
+
#include <boost/algorithm/string/replace.hpp>
#include <boost/algorithm/string/join.hpp>
#include <boost/regex.hpp>
@@ -46,6 +48,7 @@
#include <mach-o/dyld.h>
#endif
+
namespace Mantid
{
/**
@@ -179,7 +182,7 @@ ConfigServiceImpl::ConfigServiceImpl() :
#else
m_user_properties_file_name("Mantid.user.properties"),
#endif
- m_DataSearchDirs(), m_UserSearchDirs(), m_instr_prefixes(), m_removedFlag("@@REMOVED@@")
+ m_DataSearchDirs(), m_UserSearchDirs(), m_InstrumentDirs(), m_instr_prefixes(), m_removedFlag("@@REMOVED@@")
{
//getting at system details
m_pSysConfig = new WrappedObject<Poco::Util::SystemConfiguration> ;
@@ -215,13 +218,20 @@ ConfigServiceImpl::ConfigServiceImpl() :
}
}
+ //Assert that the appdata and the instrument subdirectory exists
+ std::string appDataDir = getAppDataDir();
+ Poco::Path path(appDataDir);
+ path.pushDirectory("instrument");
+ Poco::File file(path);
+ //createdirectories will fail gracefully if it is already present
+ file.createDirectories();
+
//Fill the list of possible relative path keys that may require conversion to absolute paths
m_ConfigPaths.insert(std::make_pair("mantidqt.python_interfaces_directory", true));
m_ConfigPaths.insert(std::make_pair("plugins.directory", true));
m_ConfigPaths.insert(std::make_pair("pvplugins.directory", true));
m_ConfigPaths.insert(std::make_pair("mantidqt.plugins.directory", true));
m_ConfigPaths.insert(std::make_pair("instrumentDefinition.directory", true));
- m_ConfigPaths.insert(std::make_pair("parameterDefinition.directory", true));
m_ConfigPaths.insert(std::make_pair("groupingFiles.directory", true));
m_ConfigPaths.insert(std::make_pair("maskFiles.directory", true));
m_ConfigPaths.insert(std::make_pair("colormaps.directory", true));
@@ -820,6 +830,7 @@ void ConfigServiceImpl::updateConfig(const std::string& filename, const bool app
cacheDataSearchPaths();
appendDataSearchDir(getString("defaultsave.directory"));
cacheUserSearchPaths();
+ cacheInstrumentPaths();
}
}
@@ -1128,6 +1139,10 @@ void ConfigServiceImpl::setString(const std::string & key, const std::string & v
else if (key == "usersearch.directories")
{
cacheUserSearchPaths();
+ }
+ else if (key == "instrumentDefinition.directory")
+ {
+ cacheInstrumentPaths();
}
else if (key == "defaultsave.directory")
{
@@ -1251,6 +1266,28 @@ std::string ConfigServiceImpl::getTempDir()
return m_pSysConfig->getString("system.tempDir");
}
+/** Gets the absolute path of the appdata directory
+*
+* @returns The absolute path of the appdata directory
+*/
+std::string ConfigServiceImpl::getAppDataDir()
+{
+ const std::string vendorName = "mantidproject";
+ const std::string applicationName = "mantid";
+#if POCO_OS == POCO_OS_WINDOWS_NT
+ std::string appdata = std::getenv("APPDATA");
+ Poco::Path path(appdata);
+ path.makeDirectory();
+ path.pushDirectory(vendorName);
+ path.pushDirectory(applicationName);
+ return path.toString();
+#else //linux and mac
+ Poco::Path path(Poco::Path::home());
+ path.pushDirectory("." + applicationName);
+ return path.toString();
+#endif
+}
+
/**
* Get the directory containing the program executable
* @returns A string containing the path of the directory
@@ -1501,26 +1538,79 @@ const std::vector<std::string>& ConfigServiceImpl::getUserSearchDirs() const
}
/**
- * Return the search directory for XML instrument definition files (IDFs)
- * @returns Full path of instrument search directory
+ * Return the search directories for XML instrument definition files (IDFs)
+ * @returns An ordered list of paths for instrument searching
+ */
+const std::vector<std::string>& ConfigServiceImpl::getInstrumentDirectories() const
+{
+ return m_InstrumentDirs;
+}
+
+/**
+ * Return the base search directories for XML instrument definition files (IDFs)
+ * @returns a last entry of getInstrumentDirectories
*/
const std::string ConfigServiceImpl::getInstrumentDirectory() const
{
- // Determine the search directory for XML instrument definition files (IDFs)
- std::string directoryName = getString("instrumentDefinition.directory");
- if (directoryName.empty())
- {
- // This is the assumed deployment directory for IDFs, where we need to be relative to the
- // directory of the executable, not the current working directory.
- directoryName = Poco::Path(getPropertiesDir()).resolve("../instrument").toString();
- }
+ return m_InstrumentDirs[m_InstrumentDirs.size()-1];
+}
+
+/**
+ * Fills the internal cache of instrument definition directories
+ */
+void ConfigServiceImpl::cacheInstrumentPaths()
+{
+ m_InstrumentDirs.clear();
+ Poco::Path path(getAppDataDir());
+ path.makeDirectory();
+ path.pushDirectory("instrument");
+ std::string appdatadir = path.toString();
+ addDirectoryifExists(appdatadir,m_InstrumentDirs);
+
+#ifndef _WIN32
+ std::string etcdatadir = "/etc/mantid/instrument";
+ addDirectoryifExists(etcdatadir,m_InstrumentDirs);
+#endif
+
+ // Determine the search directory for XML instrument definition files (IDFs)
+ std::string directoryName = getString("instrumentDefinition.directory");
+ if (directoryName.empty())
+ {
+ // This is the assumed deployment directory for IDFs, where we need to be relative to the
+ // directory of the executable, not the current working directory.
+ directoryName = Poco::Path(getPropertiesDir()).resolve("../instrument").toString();
+ }
+ addDirectoryifExists(directoryName,m_InstrumentDirs);
+}
- if (!Poco::File(directoryName).isDirectory())
+
+
+/**
+ * Verifies the directory exists and add it to the back of the directory list if valid
+ * @param directoryName the directory name to add
+ * @param directoryList the list to add the directory to
+ * @returns true if the directory was valid and added to the list
+ */
+bool ConfigServiceImpl::addDirectoryifExists(const std::string& directoryName, std::vector<std::string>& directoryList)
+{
+ try
{
- g_log.error("Unable to locate instrument search directory at: " + directoryName);
+ if (Poco::File(directoryName).isDirectory())
+ {
+ directoryList.push_back(directoryName);
+ return true;
+ }
+ else
+ {
+ g_log.information("Unable to locate directory at: " + directoryName);
+ return false;
+ }
}
-
- return directoryName;
+ catch (Poco::PathNotFoundException&)
+ {
+ g_log.information("Unable to locate directory at: " + directoryName);
+ return false;
+ }
}
/**
diff --git a/Code/Mantid/Framework/Properties/Mantid.properties.template b/Code/Mantid/Framework/Properties/Mantid.properties.template
index 5ff922301cbcc52803d48d339afe739b6df5e74d..745bb42bb970bf0b3e99876828d6121b51326a1d 100644
--- a/Code/Mantid/Framework/Properties/Mantid.properties.template
+++ b/Code/Mantid/Framework/Properties/Mantid.properties.template
@@ -37,9 +37,6 @@ python.plugins.directories = @PYTHONPLUGIN_DIRS@
# Where to load instrument definition files from
instrumentDefinition.directory = @MANTID_ROOT@/instrument
-# Where to load parameter definition files from
-parameterDefinition.directory = @MANTID_ROOT@/instrument
-
# Where to load Grouping files (that are shipped with Mantid) from
groupingFiles.directory = @MANTID_ROOT@/instrument/Grouping
diff --git a/Code/Mantid/MantidPlot/src/ConfigDialog.cpp b/Code/Mantid/MantidPlot/src/ConfigDialog.cpp
index f0ff62bef193d89f1b467947acc8324695ffb82d..6dd94585c643b1fedfc834d899607bccd1252782 100644
--- a/Code/Mantid/MantidPlot/src/ConfigDialog.cpp
+++ b/Code/Mantid/MantidPlot/src/ConfigDialog.cpp
@@ -1146,21 +1146,7 @@ void ConfigDialog::initDirSearchTab()
connect( button, SIGNAL(clicked()), this, SLOT(addInstrumentDir()) );
- /// parameterDefinition.directory
- label = new QLabel(tr("Parameter definitions"));
- grid->addWidget(label, 3, 0);
-
- str = Mantid::Kernel::ConfigService::Instance().getString("parameterDefinition.directory");
- leParameterDir = new QLineEdit();
- leParameterDir->setText(QString::fromStdString(str));
- grid->addWidget(leParameterDir, 3, 1);
-
- button = new QPushButton();
- button->setIcon(QIcon(getQPixmap("choose_folder_xpm")));
- grid->addWidget(button, 3, 2);
-
- connect( button, SIGNAL(clicked()), this, SLOT(addParameterDir()) );
- grid->setRowStretch(4,1);
+ grid->setRowStretch(3,1);
}
void ConfigDialog::initCurveFittingTab()
@@ -2227,10 +2213,6 @@ void ConfigDialog::updateDirSearchSettings()
setting.replace('\\','/');
mantid_config.setString("instrumentDefinition.directory",setting.toStdString());
- setting = leParameterDir->text();
- setting.replace('\\','/');
- mantid_config.setString("parameterDefinition.directory",setting.toStdString());
-
}
void ConfigDialog::updateCurveFitSettings()
@@ -2634,13 +2616,4 @@ void ConfigDialog::addInstrumentDir()
}
}
-void ConfigDialog::addParameterDir()
-{
- QString dir = QFileDialog::getExistingDirectory(this, tr("Select new parameter definition directory"),
- "", 0);
- if (!dir.isEmpty())
- {
- leParameterDir->setText(dir);
- }
-}
diff --git a/Code/Mantid/MantidPlot/src/ConfigDialog.h b/Code/Mantid/MantidPlot/src/ConfigDialog.h
index 4bad67ddbe9e6464ebf5b1e9b64fa52f7c7ee814..15939816591ca0ab15611f5a42df0985c6de4ada 100644
--- a/Code/Mantid/MantidPlot/src/ConfigDialog.h
+++ b/Code/Mantid/MantidPlot/src/ConfigDialog.h
@@ -119,7 +119,6 @@ public:
void addPythonScriptsDirs();
void addPythonPluginDirs();
void addInstrumentDir();
- void addParameterDir();
void enableButtons();
void itemCheckedChanged(QTreeWidgetItem* item);
void updateChildren(std::map<std::string, std::string> &programKeysAndDetails, QTreeWidgetItem* program);
@@ -187,7 +186,6 @@ private:
QLineEdit* lePythonScriptsDirs;///< pythonscripts.directories
QLineEdit* lePythonPluginsDirs;///< python plugins directories
QLineEdit* leInstrumentDir;///< instrumentDefinition.directory
- QLineEdit* leParameterDir;///< parameterDefinition.directory
// Mantid curve fitting page
QWidget *curveFittingPage;
QComboBox *backgroundFunctions;