Updated rename algorithms so they don't allow using already existing

workspace names. Refs #7309
mantidproject · Jul 25, 2013 · ddd7953 · ddd7953
1 parent d48b218
commit ddd7953
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/src/RenameWorkspace.cpp b/Code/Mantid/Framework/Algorithms/src/RenameWorkspace.cpp
@@ -36,7 +36,7 @@ using namespace API;
 void RenameWorkspace::init()
 {
   declareProperty(new WorkspaceProperty<Workspace> ("InputWorkspace", "", Direction::Input));
-  declareProperty(new WorkspaceProperty<Workspace> ("OutputWorkspace", "", Direction::Output));
+  declareProperty(new WorkspaceProperty<Workspace> ("OutputWorkspace", "", Direction::Output, UniqueMode::Unique));
 }
 
 /** Executes the algorithm

diff --git a/Code/Mantid/Framework/Algorithms/src/RenameWorkspaces.cpp b/Code/Mantid/Framework/Algorithms/src/RenameWorkspaces.cpp
@@ -92,7 +92,6 @@ void RenameWorkspaces::exec()
      }
   }
 
-
   size_t nWs = inputWsName.size();
   if( newWsName.size() > 0) {
     // We are using a list of new names
@@ -111,6 +110,13 @@ void RenameWorkspaces::exec()
     }
   }
 
+  // Check that all of the new names are unique
+  for(auto it = newWsName.begin(); it != newWsName.end(); it++)
+  {
+    if(AnalysisDataService::Instance().doesExist((*it)))
+      throw std::invalid_argument("Workspace with the name \"" + (*it) + "\" already exists");
+  }
+
   // loop over array and rename each workspace
   for (size_t i=0; i<nWs; ++i)
   {