Refs #9209 Rename workspace in reduction to fit format expected.

mantidproject · Jul 8, 2014 · f4eba03 · f4eba03
1 parent 8e0ce36
commit f4eba03
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py b/Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py
@@ -919,16 +919,12 @@ def abscorFeeder(sample, container, geom, useCor, corrections, Verbose=False, Sc
     s_hist,sxlen = CheckHistZero(sample)
 
     diffraction_run = checkUnitIs(sample, 'dSpacing')
+    sam_name = getWSprefix(sample)
+    ext = '_red'
 
     if not diffraction_run:
         efixed = getEfixed(sample)
-        sam_name = getWSprefix(sample)
-        ext = '_red'
-    else:
-        inst_name, run_no = getInstrRun(sample)
-        sam_name =  inst_name + run_no
-        ext = '_diff'
-
+
     if container != '':
         CheckHistSame(sample, 'Sample', container, 'Container')
 

diff --git a/Code/Mantid/scripts/Inelastic/IndirectDiffractionReduction.py b/Code/Mantid/scripts/Inelastic/IndirectDiffractionReduction.py
@@ -45,6 +45,10 @@ def _setup_steps(self):
             step.set_formats(self._save_formats)
             self.append_step(step)
 
+        step = steps.Naming()
+        self.append_step(step)
+
+
 def getStringProperty(workspace, property):
     """This function is used in the interface.
     """