From cc5a7bb0e08bb141d8af13b746b606dd85312fdc Mon Sep 17 00:00:00 2001
From: Stuart Campbell <campbellsi@ornl.gov>
Date: Fri, 8 Apr 2011 19:51:12 +0000
Subject: [PATCH] In ConfigService, renamed Facility() --> getFacility() Added
a setFacility() refs #2760
---
Code/Mantid/Framework/API/src/FileFinder.cpp | 12 +--
.../Mantid/Framework/API/src/FileProperty.cpp | 2 +-
.../Framework/DataHandling/src/Load.cpp | 2 +-
.../DataHandling/src/LoadInstrumentHelper.cpp | 17 +---
.../DataHandling/src/LoadRawHelper.cpp | 2 +-
.../Framework/ICat/src/DownloadDataFile.cpp | 2 +-
.../Framework/ICat/src/GetDataFiles.cpp | 2 +-
.../Mantid/Framework/ICat/src/GetDataSets.cpp | 2 +-
.../Framework/ICat/src/ListInstruments.cpp | 2 +-
.../ICat/src/ListInvestigationTypes.cpp | 2 +-
Code/Mantid/Framework/ICat/src/Login.cpp | 2 +-
Code/Mantid/Framework/ICat/src/Logout.cpp | 2 +-
.../Framework/ICat/src/MyDataSearch.cpp | 2 +-
Code/Mantid/Framework/ICat/src/Search.cpp | 2 +-
.../Kernel/inc/MantidKernel/ConfigService.h | 8 +-
.../Framework/Kernel/src/ConfigService.cpp | 79 +++++++++++++------
.../Framework/Kernel/test/ConfigServiceTest.h | 20 ++++-
.../Framework/Kernel/test/FacilitiesTest.h | 6 +-
.../inc/MantidPythonAPI/kernel_exports.h | 4 +-
Code/Mantid/MantidPlot/src/ConfigDialog.cpp | 2 +-
.../MantidWidgets/src/InstrumentSelector.cpp | 4 +-
.../MantidQt/MantidWidgets/src/MWRunFiles.cpp | 2 +-
22 files changed, 104 insertions(+), 74 deletions(-)
diff --git a/Code/Mantid/Framework/API/src/FileFinder.cpp b/Code/Mantid/Framework/API/src/FileFinder.cpp
index 3fbe31c20a6..8f475bbe7f0 100644
--- a/Code/Mantid/Framework/API/src/FileFinder.cpp
+++ b/Code/Mantid/Framework/API/src/FileFinder.cpp
@@ -129,7 +129,7 @@ namespace Mantid
if (isdigit(hint[0]))
{
- instrPart = Kernel::ConfigService::Instance().Facility().Instrument().shortName();
+ instrPart = Kernel::ConfigService::Instance().getFacility().Instrument().shortName();
runPart = hint;
}
else
@@ -147,7 +147,7 @@ namespace Mantid
runPart = hint.substr(nChars);
}
- Kernel::InstrumentInfo instr = Kernel::ConfigService::Instance().Facility().Instrument(instrPart);
+ Kernel::InstrumentInfo instr = Kernel::ConfigService::Instance().getFacility().Instrument(instrPart);
size_t nZero = instr.zeroPadding();
// remove any leading zeros in case there are too many of them
std::string::size_type i = runPart.find_first_not_of('0');
@@ -184,7 +184,7 @@ namespace Mantid
std::pair < std::string, std::string > p = toInstrumentAndNumber(filename);
- Kernel::InstrumentInfo instr = Kernel::ConfigService::Instance().Facility().Instrument(p.first);
+ Kernel::InstrumentInfo instr = Kernel::ConfigService::Instance().getFacility().Instrument(p.first);
std::string delimiter = instr.delimiter();
filename = p.first;
@@ -231,7 +231,7 @@ namespace Mantid
}
const std::vector<std::string> facility_extensions =
- Kernel::ConfigService::Instance().Facility().extensions();
+ Kernel::ConfigService::Instance().getFacility().extensions();
// select allowed extensions
std::vector < std::string > extensions;
if (exts != NULL)
@@ -263,11 +263,11 @@ namespace Mantid
std::string archiveOpt = Kernel::ConfigService::Instance().getString("datasearch.searcharchive");
std::transform(archiveOpt.begin(), archiveOpt.end(), archiveOpt.begin(), tolower);
if (!archiveOpt.empty() && archiveOpt != "off"
- && !Kernel::ConfigService::Instance().Facility().archiveSearch().empty())
+ && !Kernel::ConfigService::Instance().getFacility().archiveSearch().empty())
{
std::cout << "Starting archive search..." << std::endl;
IArchiveSearch_sptr arch = ArchiveSearchFactory::Instance().create(
- *Kernel::ConfigService::Instance().Facility().archiveSearch().begin());
+ *Kernel::ConfigService::Instance().getFacility().archiveSearch().begin());
if (arch)
{
std::string path;
diff --git a/Code/Mantid/Framework/API/src/FileProperty.cpp b/Code/Mantid/Framework/API/src/FileProperty.cpp
index aac5a49f469..44d3f6df0c0 100644
--- a/Code/Mantid/Framework/API/src/FileProperty.cpp
+++ b/Code/Mantid/Framework/API/src/FileProperty.cpp
@@ -183,7 +183,7 @@ void FileProperty::setUp(const std::string & defExt)
*/
bool FileProperty::extsMatchRunFiles()
{
- Kernel::FacilityInfo facilityInfo = Kernel::ConfigService::Instance().Facility();
+ Kernel::FacilityInfo facilityInfo = Kernel::ConfigService::Instance().getFacility();
const std::vector<std::string> facilityExts = facilityInfo.extensions();
std::vector<std::string>::const_iterator facilityExtsBegin = facilityExts.begin();
std::vector<std::string>::const_iterator facilityExtsEnd = facilityExts.end();
diff --git a/Code/Mantid/Framework/DataHandling/src/Load.cpp b/Code/Mantid/Framework/DataHandling/src/Load.cpp
index 50d3bf09d3e..0ea02446eee 100644
--- a/Code/Mantid/Framework/DataHandling/src/Load.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/Load.cpp
@@ -201,7 +201,7 @@ namespace Mantid
void Load::init()
{
// Take extensions first from Facility object
- const FacilityInfo & defaultFacility = Mantid::Kernel::ConfigService::Instance().Facility();
+ const FacilityInfo & defaultFacility = Mantid::Kernel::ConfigService::Instance().getFacility();
std::vector<std::string> exts = defaultFacility.extensions();
// Add in some other known extensions
exts.push_back(".xml");
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadInstrumentHelper.cpp b/Code/Mantid/Framework/DataHandling/src/LoadInstrumentHelper.cpp
index 4e4b0bd9d76..4e300a8a6e0 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadInstrumentHelper.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadInstrumentHelper.cpp
@@ -185,24 +185,9 @@ std::string LoadInstrumentHelper::getWorkspaceStartDate(const boost::shared_ptr<
*/
std::string LoadInstrumentHelper::getInstrumentFilename(const std::string& instrumentName, const std::string& date)
{
-// std::string instrument;
-// instrument = instrumentName;
-// std::transform(instrument.begin(), instrument.end(), instrument.begin(), toupper);
-//
-// // hack to look for long name versions
-// if (instrument == "EQSANS")
-// instrument = "EQ-SANS";
-// if (instrument == "HIRESSANS")
-// instrument = "GPSANS";
-// if (instrument == "NOM")
-// instrument = "NOMAD";
-// if (instrument == "SEQ")
-// instrument = "SEQUOIA";
-// if (instrument == "PG3")
-// instrument = "POWGEN";
// Lookup the instrument (long) name
- std::string instrument(Kernel::ConfigService::Instance().Facility().Instrument(instrumentName).name());
+ 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();
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadRawHelper.cpp b/Code/Mantid/Framework/DataHandling/src/LoadRawHelper.cpp
index f0c34164ae7..11c6f95e66a 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadRawHelper.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadRawHelper.cpp
@@ -14,7 +14,7 @@
#include "MantidKernel/TimeSeriesProperty.h"
#include "LoadRaw/isisraw2.h"
#include "MantidDataHandling/LoadLog.h"
-#include "MantidDataHandling/LoadInstrumentHelper.h"
+//#include "MantidDataHandling/LoadInstrumentHelper.h"
#include "MantidAPI/LoadAlgorithmFactory.h"
#include <boost/date_time/gregorian/gregorian.hpp>
diff --git a/Code/Mantid/Framework/ICat/src/DownloadDataFile.cpp b/Code/Mantid/Framework/ICat/src/DownloadDataFile.cpp
index 60a69f0e8c2..2654bf5eabb 100644
--- a/Code/Mantid/Framework/ICat/src/DownloadDataFile.cpp
+++ b/Code/Mantid/Framework/ICat/src/DownloadDataFile.cpp
@@ -62,7 +62,7 @@ void CDownloadDataFile::exec()
ICatalog_sptr catalog_sptr;
try
{
- catalog_sptr=CatalogFactory::Instance().create(ConfigService::Instance().Facility().catalogName());
+ catalog_sptr=CatalogFactory::Instance().create(ConfigService::Instance().getFacility().catalogName());
}
catch(Kernel::Exception::NotFoundError&)
diff --git a/Code/Mantid/Framework/ICat/src/GetDataFiles.cpp b/Code/Mantid/Framework/ICat/src/GetDataFiles.cpp
index eb45daa9d1e..bed26e87c99 100644
--- a/Code/Mantid/Framework/ICat/src/GetDataFiles.cpp
+++ b/Code/Mantid/Framework/ICat/src/GetDataFiles.cpp
@@ -43,7 +43,7 @@ namespace Mantid
ICatalog_sptr catalog_sptr;
try
{
- catalog_sptr=CatalogFactory::Instance().create(ConfigService::Instance().Facility().catalogName());
+ catalog_sptr=CatalogFactory::Instance().create(ConfigService::Instance().getFacility().catalogName());
}
catch(Kernel::Exception::NotFoundError&)
diff --git a/Code/Mantid/Framework/ICat/src/GetDataSets.cpp b/Code/Mantid/Framework/ICat/src/GetDataSets.cpp
index 8ff1aecc28a..2fe56838403 100644
--- a/Code/Mantid/Framework/ICat/src/GetDataSets.cpp
+++ b/Code/Mantid/Framework/ICat/src/GetDataSets.cpp
@@ -38,7 +38,7 @@ namespace Mantid
ICatalog_sptr catalog_sptr;
try
{
- catalog_sptr=CatalogFactory::Instance().create(ConfigService::Instance().Facility().catalogName());
+ catalog_sptr=CatalogFactory::Instance().create(ConfigService::Instance().getFacility().catalogName());
}
catch(Kernel::Exception::NotFoundError&)
diff --git a/Code/Mantid/Framework/ICat/src/ListInstruments.cpp b/Code/Mantid/Framework/ICat/src/ListInstruments.cpp
index 6dcdfe6ca2c..35ff77ee526 100644
--- a/Code/Mantid/Framework/ICat/src/ListInstruments.cpp
+++ b/Code/Mantid/Framework/ICat/src/ListInstruments.cpp
@@ -37,7 +37,7 @@ namespace Mantid
try
{
- catalog_sptr=CatalogFactory::Instance().create(ConfigService::Instance().Facility().catalogName());
+ catalog_sptr=CatalogFactory::Instance().create(ConfigService::Instance().getFacility().catalogName());
}
catch(Kernel::Exception::NotFoundError&)
diff --git a/Code/Mantid/Framework/ICat/src/ListInvestigationTypes.cpp b/Code/Mantid/Framework/ICat/src/ListInvestigationTypes.cpp
index 11d771d388d..302f7dabba3 100644
--- a/Code/Mantid/Framework/ICat/src/ListInvestigationTypes.cpp
+++ b/Code/Mantid/Framework/ICat/src/ListInvestigationTypes.cpp
@@ -35,7 +35,7 @@ namespace Mantid
ICatalog_sptr catalog_sptr;
try
{
- catalog_sptr=CatalogFactory::Instance().create(ConfigService::Instance().Facility().catalogName());
+ catalog_sptr=CatalogFactory::Instance().create(ConfigService::Instance().getFacility().catalogName());
}
catch(Kernel::Exception::NotFoundError&)
{
diff --git a/Code/Mantid/Framework/ICat/src/Login.cpp b/Code/Mantid/Framework/ICat/src/Login.cpp
index 6e422a03f61..19b0d14dc9c 100644
--- a/Code/Mantid/Framework/ICat/src/Login.cpp
+++ b/Code/Mantid/Framework/ICat/src/Login.cpp
@@ -42,7 +42,7 @@ void Login::initDocs()
try
{
- catalog_sptr=CatalogFactory::Instance().create(ConfigService::Instance().Facility().catalogName());
+ catalog_sptr=CatalogFactory::Instance().create(ConfigService::Instance().getFacility().catalogName());
}
catch(Kernel::Exception::NotFoundError&)
diff --git a/Code/Mantid/Framework/ICat/src/Logout.cpp b/Code/Mantid/Framework/ICat/src/Logout.cpp
index 4e24f6906a3..2902c40a555 100644
--- a/Code/Mantid/Framework/ICat/src/Logout.cpp
+++ b/Code/Mantid/Framework/ICat/src/Logout.cpp
@@ -30,7 +30,7 @@ void CLogout::initDocs()
ICatalog_sptr catalog_sptr;
try
{
- catalog_sptr=CatalogFactory::Instance().create(ConfigService::Instance().Facility().catalogName());
+ catalog_sptr=CatalogFactory::Instance().create(ConfigService::Instance().getFacility().catalogName());
}
catch(Kernel::Exception::NotFoundError&)
diff --git a/Code/Mantid/Framework/ICat/src/MyDataSearch.cpp b/Code/Mantid/Framework/ICat/src/MyDataSearch.cpp
index bca3a959162..1f4c8a435c7 100644
--- a/Code/Mantid/Framework/ICat/src/MyDataSearch.cpp
+++ b/Code/Mantid/Framework/ICat/src/MyDataSearch.cpp
@@ -37,7 +37,7 @@ namespace Mantid
ICatalog_sptr catalog_sptr;
try
{
- catalog_sptr=CatalogFactory::Instance().create(ConfigService::Instance().Facility().catalogName());
+ catalog_sptr=CatalogFactory::Instance().create(ConfigService::Instance().getFacility().catalogName());
}
catch(Kernel::Exception::NotFoundError&)
diff --git a/Code/Mantid/Framework/ICat/src/Search.cpp b/Code/Mantid/Framework/ICat/src/Search.cpp
index 81ec42b2b6c..ac424ecf73e 100644
--- a/Code/Mantid/Framework/ICat/src/Search.cpp
+++ b/Code/Mantid/Framework/ICat/src/Search.cpp
@@ -60,7 +60,7 @@ namespace Mantid
ICatalog_sptr catalog_sptr;
try
{
- catalog_sptr=CatalogFactory::Instance().create(ConfigService::Instance().Facility().catalogName());
+ catalog_sptr=CatalogFactory::Instance().create(ConfigService::Instance().getFacility().catalogName());
}
catch(Kernel::Exception::NotFoundError&)
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/ConfigService.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/ConfigService.h
index bcdc7d70bb0..0fb86714ff2 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/ConfigService.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/ConfigService.h
@@ -166,11 +166,13 @@ namespace Mantid
//@}
/// Load facility information from instrumentDir/Facilities.xml file
- void updateFacilities(const std::string& fName = "");
+ void updateFacilities(const std::string& facilityName = "");
/// Get the default facility
- const FacilityInfo& Facility()const;
+ const FacilityInfo& getFacility()const;
/// Get a facility
- const FacilityInfo& Facility(const std::string& fName)const;
+ const FacilityInfo& getFacility(const std::string& facilityName)const;
+ /// Set the default facility
+ void setFacility(const std::string& facilityName);
/// Look for an instrument
const InstrumentInfo & getInstrument(const std::string& instrumentName = "") const;
diff --git a/Code/Mantid/Framework/Kernel/src/ConfigService.cpp b/Code/Mantid/Framework/Kernel/src/ConfigService.cpp
index 696f584537d..aa8e2c4a819 100644
--- a/Code/Mantid/Framework/Kernel/src/ConfigService.cpp
+++ b/Code/Mantid/Framework/Kernel/src/ConfigService.cpp
@@ -1117,16 +1117,15 @@ void ConfigServiceImpl::updateFacilities(const std::string& fName)
const InstrumentInfo & ConfigServiceImpl::getInstrument(const std::string& instrumentName) const
{
- // TODO: Change this to use getFacility()
// Let's first search for the instrument in our default facility
- std::string defaultFacility = ConfigService::Instance().getString("default.facility");
+ std::string defaultFacility = ConfigService::Instance().getFacility().name();
if (!defaultFacility.empty())
{
try
{
g_log.debug() << "Looking for " << instrumentName << " at " << defaultFacility << "." << std::endl;
- return Facility(defaultFacility).Instrument(instrumentName);
+ return getFacility(defaultFacility).Instrument(instrumentName);
}
catch (Exception::NotFoundError e)
{
@@ -1154,33 +1153,17 @@ const InstrumentInfo & ConfigServiceImpl::getInstrument(const std::string& instr
throw Exception::NotFoundError("Instrument", instrumentName);
}
-/** Get the default `
+/** Get the default facility
* @return the facility information object
*/
-const FacilityInfo& ConfigServiceImpl::Facility() const
+const FacilityInfo& ConfigServiceImpl::getFacility() const
{
std::string defFacility = getString("default.facility");
if (defFacility.empty())
{
defFacility = "ISIS";
}
- return Facility(defFacility);
-}
-
-/** Add an observer to a notification
- @param observer :: Reference to the observer to add
- */
-void ConfigServiceImpl::addObserver(const Poco::AbstractObserver& observer) const
-{
- m_notificationCenter.addObserver(observer);
-}
-
-/** Remove an observer
- @param observer :: Reference to the observer to remove
- */
-void ConfigServiceImpl::removeObserver(const Poco::AbstractObserver& observer) const
-{
- m_notificationCenter.removeObserver(observer);
+ return getFacility(defFacility);
}
/**
@@ -1189,18 +1172,62 @@ void ConfigServiceImpl::removeObserver(const Poco::AbstractObserver& observer) c
* @return the facility information object
* @throw NotFoundException if the facility is not found
*/
-const FacilityInfo& ConfigServiceImpl::Facility(const std::string& fName) const
+const FacilityInfo& ConfigServiceImpl::getFacility(const std::string& facilityName) const
{
std::vector<FacilityInfo*>::const_iterator it = m_facilities.begin();
for (; it != m_facilities.end(); ++it)
{
- if ((**it).name() == fName)
+ if ((**it).name() == facilityName)
{
return **it;
}
}
- g_log.error("Facility " + fName + " not found");
- throw Exception::NotFoundError("Facilities", fName);
+ g_log.error("Facility " + facilityName + " not found");
+ throw Exception::NotFoundError("Facilities", facilityName);
+}
+
+/**
+ * Set the default facility
+ * @param facilityName the facility name
+ * @throw NotFoundException if the facility is not found
+ */
+void ConfigServiceImpl::setFacility(const std::string &facilityName)
+{
+ bool found = false;
+ // Look through the facilities for a matching one.
+ std::vector<FacilityInfo*>::const_iterator it = m_facilities.begin();
+ for (; it != m_facilities.end(); ++it)
+ {
+ if ((**it).name() == facilityName)
+ {
+ // Found the facility
+ found = true;
+ // So it's safe to set it as our default
+ setString("default.facility", facilityName);
+ }
+ }
+ if (found == false)
+ {
+ g_log.error("Failed to set default facility to be " + facilityName + ". Facility not found");
+ throw Exception::NotFoundError("Facilities", facilityName);
+ }
+
+}
+
+/** Add an observer to a notification
+ @param observer :: Reference to the observer to add
+ */
+void ConfigServiceImpl::addObserver(const Poco::AbstractObserver& observer) const
+{
+ m_notificationCenter.addObserver(observer);
+}
+
+/** Remove an observer
+ @param observer :: Reference to the observer to remove
+ */
+void ConfigServiceImpl::removeObserver(const Poco::AbstractObserver& observer) const
+{
+ m_notificationCenter.removeObserver(observer);
}
/// \cond TEMPLATE
diff --git a/Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h b/Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h
index f26dd3f7b75..05720cc4bf4 100644
--- a/Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h
+++ b/Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h
@@ -7,6 +7,8 @@
#include "MantidKernel/Logger.h"
#include "MantidKernel/TestChannel.h"
#include "MantidKernel/InstrumentInfo.h"
+#include "MantidKernel/FacilityInfo.h"
+
#include <Poco/Path.h>
#include <Poco/File.h>
#include <boost/shared_ptr.hpp>
@@ -94,11 +96,27 @@ public:
}
+ void testDefaultFacility()
+ {
+ TS_ASSERT_THROWS_NOTHING(const FacilityInfo& fac = ConfigService::Instance().getFacility() );
+//
+ ConfigService::Instance().setFacility("ISIS");
+ const FacilityInfo& fac = ConfigService::Instance().getFacility();
+ TS_ASSERT_EQUALS(ConfigService::Instance().getFacility().name(),"ISIS");
+
+ ConfigService::Instance().setFacility("SNS");
+ const FacilityInfo& fac1 = ConfigService::Instance().getFacility();
+ TS_ASSERT_EQUALS(fac1.name(),"SNS");
+
+// // Non existent facility
+// TS_ASSERT_THROWS(ConfigService::Instance().setFacility(""), Mantid::Kernel::Exception::NotFoundError);
+
+ }
void testInstrumentSearch()
{
// Set a default facility
- //ConfigService::Instance().setFacility("SNS");
+ ConfigService::Instance().setFacility("SNS");
// Try and find some instruments from a facility
TS_ASSERT_EQUALS(ConfigService::Instance().getInstrument("BASIS").name(),"BASIS");
diff --git a/Code/Mantid/Framework/Kernel/test/FacilitiesTest.h b/Code/Mantid/Framework/Kernel/test/FacilitiesTest.h
index fc0aa2e7c61..25efa978cc4 100644
--- a/Code/Mantid/Framework/Kernel/test/FacilitiesTest.h
+++ b/Code/Mantid/Framework/Kernel/test/FacilitiesTest.h
@@ -84,15 +84,13 @@ public:
void testConfigService()
{
- TS_ASSERT_THROWS_NOTHING(
- const FacilityInfo& fac = ConfigService::Instance().Facility("ISIS")
- );
+ TS_ASSERT_THROWS_NOTHING(ConfigService::Instance().getFacility("ISIS"));
}
void testDefaultInstrument()
{
ConfigService::Instance().setString("default.instrument","HRPD");
- const FacilityInfo& fac = ConfigService::Instance().Facility();
+ const FacilityInfo& fac = ConfigService::Instance().getFacility();
InstrumentInfo instr = fac.Instrument();
TS_ASSERT_EQUALS(instr.name(),"HRPD");
}
diff --git a/Code/Mantid/Framework/PythonAPI/inc/MantidPythonAPI/kernel_exports.h b/Code/Mantid/Framework/PythonAPI/inc/MantidPythonAPI/kernel_exports.h
index ffd73590cd3..228af5455b8 100755
--- a/Code/Mantid/Framework/PythonAPI/inc/MantidPythonAPI/kernel_exports.h
+++ b/Code/Mantid/Framework/PythonAPI/inc/MantidPythonAPI/kernel_exports.h
@@ -38,13 +38,13 @@ namespace Mantid
{
if( name.empty() )
{
- return Mantid::Kernel::ConfigService::Instance().Facility();
+ return Mantid::Kernel::ConfigService::Instance().getFacility();
}
else
{
try
{
- return Mantid::Kernel::ConfigService::Instance().Facility(name);
+ return Mantid::Kernel::ConfigService::Instance().getFacility(name);
}
catch(Kernel::Exception::NotFoundError&)
{
diff --git a/Code/Mantid/MantidPlot/src/ConfigDialog.cpp b/Code/Mantid/MantidPlot/src/ConfigDialog.cpp
index eaa66fc3038..e79dd170586 100644
--- a/Code/Mantid/MantidPlot/src/ConfigDialog.cpp
+++ b/Code/Mantid/MantidPlot/src/ConfigDialog.cpp
@@ -626,7 +626,7 @@ void ConfigDialog::initMantidPage()
facility->addItems(prop_list);
// Set default property
- property = QString::fromStdString(mantid_config.Facility().name());
+ property = QString::fromStdString(mantid_config.getFacility().name());
int index = facility->findText(property);
if( index < 0 )
{
diff --git a/Code/Mantid/MantidQt/MantidWidgets/src/InstrumentSelector.cpp b/Code/Mantid/MantidQt/MantidWidgets/src/InstrumentSelector.cpp
index f542a07210c..0c30c8a2d31 100644
--- a/Code/Mantid/MantidQt/MantidWidgets/src/InstrumentSelector.cpp
+++ b/Code/Mantid/MantidQt/MantidWidgets/src/InstrumentSelector.cpp
@@ -117,11 +117,11 @@ namespace MantidWidgets
if( name.isEmpty() )
{
- m_currentFacility = &(mantidSettings.Facility());
+ m_currentFacility = &(mantidSettings.getFacility());
}
else
{
- m_currentFacility = &(mantidSettings.Facility(name.toStdString()));
+ m_currentFacility = &(mantidSettings.getFacility(name.toStdString()));
}
const std::vector<InstrumentInfo> & instruments = m_currentFacility->Instruments();
diff --git a/Code/Mantid/MantidQt/MantidWidgets/src/MWRunFiles.cpp b/Code/Mantid/MantidQt/MantidWidgets/src/MWRunFiles.cpp
index 8c05477a934..bf451ebef91 100644
--- a/Code/Mantid/MantidQt/MantidWidgets/src/MWRunFiles.cpp
+++ b/Code/Mantid/MantidQt/MantidWidgets/src/MWRunFiles.cpp
@@ -482,7 +482,7 @@ QString MWRunFiles::createFileFilter()
}
else if( isForRunFiles() )
{
- std::vector<std::string> exts = ConfigService::Instance().Facility().extensions();
+ std::vector<std::string> exts = ConfigService::Instance().getFacility().extensions();
for( std::vector<std::string>::iterator ex= exts.begin(); ex != exts.end(); ++ex )
{
fileExts.append(QString::fromStdString(*ex));
--
GitLab