Changeset 5365

Timestamp:

27/07/10 09:41:09 (6 weeks ago)

Author:

Roman Tolchenov

Message:

Added FileFinder class. re #1393

Location:

trunk/Code/Mantid

Files:

• API/API.vcproj (modified) (2 diffs)
• API/inc/MantidAPI/FileFinder.h (added)
• API/src/FileFinder.cpp (added)
• API/test/FileFinderTest.h (added)
• Algorithms/Algorithms.vcproj (modified) (2 diffs)
• Kernel/inc/MantidKernel/ConfigService.h (modified) (2 diffs)
• Kernel/inc/MantidKernel/FacilityInfo.h (modified) (1 diff)
• Kernel/src/ConfigService.cpp (modified) (5 diffs)
• Kernel/src/FacilityInfo.cpp (modified) (4 diffs)
• Kernel/test/FacilitiesTest.h (modified) (1 diff)

trunk/Code/Mantid/API/API.vcproj

@@ -232 +232 @@
                         </File>
                         <File
+                                RelativePath=".\src\FileFinder.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\src\FrameworkManager.cpp"
                                 >
@@ -473 +477 @@
                         <File
                                 RelativePath=".\test\ExpressionTest.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\inc\MantidAPI\FileFinder.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\test\FileFinderTest.h"
                                 >
                         </File>

trunk/Code/Mantid/Algorithms/Algorithms.vcproj

@@ -192 +192 @@
                         </File>
                         <File
+                                RelativePath=".\src\ApplyTransmissionCorrection.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\src\BinaryOperation.cpp"
                                 >
@@ -563 +567 @@
                         <File
                                 RelativePath=".\test\AnyShapeAbsorptionTest.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\inc\MantidAlgorithms\ApplyTransmissionCorrection.h"
                                 >
                         </File>

trunk/Code/Mantid/Kernel/inc/MantidKernel/ConfigService.h

@@ -98 +98 @@
       const std::vector<std::string>& getInstrumentPrefixes(const std::string& facility) const;
 
+      /// Load facility information from instrumentDir/Facilities.xml file 
+      void updateFacilities(const std::string& fName = "");
       /// Get the default facility
       const FacilityInfo& Facility()const;
@@ -132 +134 @@
       /// Create the map of facility name to instrument prefix list
       void cacheInstrumentPrefixes();
-      /// Load facility information from instrumentDir/Facilities.xml file
-      void updateFacilities();
 
       // Forward declaration of inner class

trunk/Code/Mantid/Kernel/inc/MantidKernel/FacilityInfo.h

@@ -70 +70 @@
   const std::vector<InstrumentInfo> Instruments(const std::string& tech)const;
   /// Returns instruments with given name
-  const InstrumentInfo Instrument(const std::string& iName)const;
+  const InstrumentInfo Instrument(const std::string& iName = "")const;
 private:
   /// Add new extension

trunk/Code/Mantid/Kernel/src/ConfigService.cpp

@@ -166 +166 @@
   ConfigServiceImpl::~ConfigServiceImpl()
   {
+    std::cerr << "ConfigService destroyed." << std::endl;
     Kernel::Logger::shutdown();
     delete m_pSysConfig;
@@ -859 +860 @@
 
   /**
-    * Load facility information from instrumentDir/Facilities.xml file
+    * Load facility information from instrumentDir/Facilities.xml file if fName parameter
+    * is not set
+    * @param fName An alternative file name for loading facilities information.
     */
-  void ConfigServiceImpl::updateFacilities()
-  {
+  void ConfigServiceImpl::updateFacilities(const std::string& fName)
+  {
+    m_facilities.clear();
+
     std::string instrDir = getString("instrumentDefinition.directory");
-    std::string fileName = instrDir + "Facilities.xml";
+    std::string fileName = fName.empty() ? instrDir + "Facilities.xml" : fName;
 
     // Set up the DOM parser and parse xml file
@@ -876 +881 @@
     {
       g_log.error("Unable to parse file " + fileName);
-      throw Kernel::Exception::FileError("Unable to parse File:" , fileName);
+      throw Kernel::Exception::FileError("Unable to parse file:" , fileName);
     }
     // Get pointer to root element
@@ -883 +888 @@
     {
       g_log.error("XML file: " + fileName + "contains no root element.");
-      throw Kernel::Exception::InstrumentDefinitionError("No root element in XML facilities file", fileName);
+      throw std::runtime_error("No root element in Facilities.xml file");
     }
 
@@ -896 +901 @@
         m_facilities.push_back(new FacilityInfo(elem));
       }
+    }
+
+    if (m_facilities.empty())
+    {
+      throw std::runtime_error("The facility definition file "+fileName+" defines no facilities");
     }
 

trunk/Code/Mantid/Kernel/src/FacilityInfo.cpp

@@ -5 +5 @@
 #include "MantidKernel/Support.h"
 #include "MantidKernel/Exception.h"
+#include "MantidKernel/ConfigService.h"
 
 #include "Poco/DOM/Element.h"
@@ -29 +30 @@
   if (m_name.empty())
   {
-    g_log.error("Facility anme is not defined");
-    throw std::runtime_error("Facility anme is not defined");
+    g_log.error("Facility name is not defined");
+    throw std::runtime_error("Facility name is not defined");
   }
   std::string paddingStr = elem->getAttribute("zeropadding");
@@ -68 +69 @@
     }
   }
+
+  if (m_instruments.empty())
+  {
+    throw std::runtime_error("Facility "+m_name+" does not have any instrument;");
+  }
 }
 
@@ -90 +96 @@
 const InstrumentInfo FacilityInfo::Instrument(const std::string& iName)const
 {
+  std::string iname;
+  if (iName.empty())
+  {
+    iname = ConfigService::Instance().getString("default.instrument");
+    if (iname.empty())
+    {
+      return m_instruments.front();
+    }
+  }
+  else
+  {
+    iname = iName;
+  }
   std::vector<InstrumentInfo>::const_iterator it = m_instruments.begin();
   for(;it != m_instruments.end(); ++it)
   {
-    if (it->name() == iName)
+    if (it->name() == iname)
     {
       return *it;
     }
   }
-  g_log.error("Instrument "+iName+" not found in facility "+name());
-  throw Exception::NotFoundError("FacilityInfo",iName);
+
+  // if unsuccessful try shortname
+  for(it = m_instruments.begin(); it != m_instruments.end(); ++it)
+  {
+    if (it->shortName() == iname)
+    {
+      return *it;
+    }
+  }
+  g_log.error("Instrument "+iname+" not found in facility "+name());
+  throw Exception::NotFoundError("FacilityInfo",iname);
 }
 

trunk/Code/Mantid/Kernel/test/FacilitiesTest.h

@@ -90 +90 @@
   }
 
+  void testDefaultFacility()
+  {
+    TS_ASSERT_THROWS_NOTHING(
+      const FacilityInfo& fac = ConfigService::Instance().Facility()
+    );
+    const FacilityInfo& fac = ConfigService::Instance().Facility();
+    TS_ASSERT_EQUALS(fac.name(),"ISIS");
+
+    ConfigService::Instance().setString("default.facility","SNS");
+    const FacilityInfo& fac1 = ConfigService::Instance().Facility();
+    TS_ASSERT_EQUALS(fac1.name(),"SNS");
+
+    ConfigService::Instance().setString("default.facility","");
+    const FacilityInfo& fac2 = ConfigService::Instance().Facility();
+    TS_ASSERT_EQUALS(fac2.name(),"ISIS");
+  }
+
+  void testDefaultInstrument()
+  {
+    ConfigService::Instance().setString("default.instrument","HRPD");
+    const FacilityInfo& fac = ConfigService::Instance().Facility();
+    InstrumentInfo instr = fac.Instrument();
+    TS_ASSERT_EQUALS(instr.name(),"HRPD");
+  }
+
 private: