Skip to content

Commit

Permalink
Refs #8340 Change workspace names to use correct suffix.
Browse files Browse the repository at this point in the history
  • Loading branch information
Samuel Jackson committed Nov 1, 2013
1 parent 9b3ac49 commit 71c4f11
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -1037,14 +1037,16 @@ def applyCorrections(inputWS, canWS, corr, Verbose=False):
sam_name = getWSprefix(inputWS)
ConvertUnits(InputWorkspace=inputWS, OutputWorkspace=inputWS, Target='Wavelength',
EMode='Indirect', EFixed=efixed)

nameStem = corr[:-4]
if canWS != '':
(instr, can_run) = getInstrRun(canWS)
corrections = [corr+'_1', corr+'_2', corr+'_3', corr+'_4']
corrections = [nameStem+'_ass', nameStem+'_assc', nameStem+'_acsc', nameStem+'_acc']
CorrectedWS = sam_name +'Correct_'+ can_run
ConvertUnits(InputWorkspace=canWS, OutputWorkspace=canWS, Target='Wavelength',
EMode='Indirect', EFixed=efixed)
else:
corrections = [corr+'_1']
corrections = [nameStem+'_ass']
CorrectedWS = sam_name +'Corrected'
nHist = mtd[inputWS].getNumberHistograms()
# Check that number of histograms in each corrections workspace matches
Expand Down

0 comments on commit 71c4f11

Please sign in to comment.