Fixed the problem with renaming in ADS.

This was causing tests to fail. Refs #7309
mantidproject · Jul 26, 2013 · eac1866 · eac1866
1 parent a9351f2
commit eac1866
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Code/Mantid/scripts/Reflectometry/isis_reflgui/quick.py b/Code/Mantid/scripts/Reflectometry/isis_reflgui/quick.py
@@ -304,9 +304,13 @@ def cleanup():
 			DeleteWorkspace(name)
 
 def coAdd(run,name):
-	names = mtd.getObjectNames()
 	wTof = "_W" + name   		# main workspace in time-of-flight	
-	if run in names:
+	if mtd.doesExist(run):
+		# If ws with such name already exists, delete it, so
+		# RenameWorkspace will not complain
+		if mtd.doesExist(wTof):
+			mtd.remove(wTof)
+
 		RenameWorkspace(InputWorkspace=run,OutputWorkspace=wTof)
 	else: