Fix diagnostics with calibration file on indirect c2e.

Refs #6955
mantidproject · Apr 29, 2013 · 73976f6 · 73976f6
1 parent 7c389e4
commit 73976f6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Code/Mantid/scripts/Inelastic/IndirectEnergyConversion.py b/Code/Mantid/scripts/Inelastic/IndirectEnergyConversion.py
@@ -86,6 +86,10 @@ def slice(inputfiles, calib, xrange, spec, suffix, Save=False, Verbose=True,
     workdir = config['defaultsave.directory']
     outWSlist = []
     CheckXrange(xrange,'Time')
+    calib_wsname = None
+    if calib != '':
+        calib_wsname = '__calibration'
+        Load(Filename=calib,OutputWorkspace=calib_wsname)
     for file in inputfiles:
         if Verbose:
             logger.notice('Reading file :'+file)
@@ -120,10 +124,11 @@ def slice(inputfiles, calib, xrange, spec, suffix, Save=False, Verbose=True,
         DeleteWorkspace(root)
     if Plot:
         graph = mp.plotBin(outWSlist, 0)
+    if calib_wsname is not None:
+        DeleteWorkspace(Workspace=calib_wsname)
     EndTime('Slice')
 
 def useCalib(detectors):
-    CheckHistSame(detectors,'Detectors','__calibration','Calibration')
     Divide(LHSWorkspace=detectors, RHSWorkspace='__calibration', OutputWorkspace=detectors)
     return detectors