Refs #4472 simplification of adding two Run's together

mantidproject · Mar 2, 2012 · d17df8f · d17df8f
1 parent 954fb60
commit d17df8f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/Code/Mantid/Framework/API/src/Run.cpp b/Code/Mantid/Framework/API/src/Run.cpp
@@ -83,7 +83,7 @@ Kernel::Logger& Run::g_log = Kernel::Logger::get("Run");
       if (rhs.m_manager.existsProperty(ADDABLE[i]))
       {
         // get a pointer to the property on the right-handside workspace
-        Property * right = rhs.m_manager.getProperty();
+        Property * right = rhs.m_manager.getProperty(ADDABLE[i]);
 
         // now deal with the left-handside
         if (m_manager.existsProperty(ADDABLE[i]))

diff --git a/Code/Mantid/Framework/Kernel/src/PropertyManager.cpp b/Code/Mantid/Framework/Kernel/src/PropertyManager.cpp
@@ -313,15 +313,10 @@ namespace Mantid
      */
     bool PropertyManager::existsProperty( const std::string& name ) const
     {
-      try
-      {
-        getPointerToProperty(name);
-        return true;
-      }
-      catch (Exception::NotFoundError&)
-      {
-        return false;
-      }
+      std::string ucName = name;
+      std::transform(ucName.begin(), ucName.end(), ucName.begin(), toupper);
+      auto it = m_properties.find(ucName);
+      return (it != m_properties.end());
     }
 
     //-----------------------------------------------------------------------------------------------