Merge remote-tracking branch 'origin/bugfix/9429_monitor_workspaces_n…

…ot_being_replaced_when_new_added_event_mode_data_is_assigned'
mantidproject · Jun 5, 2014 · 6d5bea3 · 6d5bea3
2 parents ff7108e + 87ad094
commit 6d5bea3
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Code/Mantid/scripts/SANS/isis_reduction_steps.py b/Code/Mantid/scripts/SANS/isis_reduction_steps.py
@@ -145,8 +145,13 @@ def _load(self, inst = None, is_can=False, extra_options=dict()):
 
         outWs = Load(self._data_file, **extra_options)
 
+        monitor_ws_name = workspace + "_monitors"
+
         if isinstance(outWs, IEventWorkspace):
-            LoadNexusMonitors(self._data_file, OutputWorkspace=workspace + "_monitors")
+            LoadNexusMonitors(self._data_file, OutputWorkspace=monitor_ws_name)
+        else:
+            if monitor_ws_name in mtd:
+                DeleteWorkspace(monitor_ws_name)
 
         loader_name = outWs.getHistory().lastAlgorithm().getProperty('LoaderName').value