Skip to content

Commit

Permalink
Refs #8247 Fix naming inconsistency on result workspaces.
Browse files Browse the repository at this point in the history
This is in both QLrun and QuestRun.
  • Loading branch information
Samuel Jackson committed Oct 28, 2013
1 parent beb37cd commit 69516c4
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions Code/Mantid/scripts/Inelastic/IndirectBayes.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,8 @@ def QLRun(program,samWS,resWS,resnormWS,erange,nbins,Fit,wfile,Loop,Verbose,Plot
xProb = np.append(xProb,xQ)
xProb = np.append(xProb,xQ)
eProb = np.zeros(3*nsam)

group = ''
for m in range(0,nsam):
if Verbose:
logger.notice('Group ' +str(m)+ ' at angle '+ str(theta[m]))
Expand Down Expand Up @@ -300,17 +302,17 @@ def QLRun(program,samWS,resWS,resnormWS,erange,nbins,Fit,wfile,Loop,Verbose,Plot
prob0.append(yprob[0])
prob1.append(yprob[1])
prob2.append(yprob[2])

# create result workspace
fitWS = fname+'_Result'
if nsam > 1:
fout = fitWS +'_'+ str(m)
else:
fout = fitWS
fout = fitWS +'_'+ str(m)

CreateWorkspace(OutputWorkspace=fout, DataX=datX, DataY=datY, DataE=datE,
Nspec=nsp, UnitX='DeltaE', VerticalAxisUnit='Text', VerticalAxisValues=names)
if m == 0:
group = fout
else:
group += ',' + fout

# append workspace to list of results
group += ',' + fout

if nsam > 1:
GroupWorkspaces(InputWorkspaces=group,OutputWorkspace=fitWS)
if program == 'QL':
Expand Down Expand Up @@ -744,8 +746,8 @@ def QuestRun(samWS,resWS,nbs,erange,nbins,Fit,Loop,Verbose,Plot,Save):
Nspec=nsam, UnitX='', VerticalAxisUnit='MomentumTransfer', VerticalAxisValues=Qaxis)
group = fname + '_Sigma,'+ fname + '_Beta'
GroupWorkspaces(InputWorkspaces=group,OutputWorkspace=fname+'_Fit')
if Loop:
GroupWorkspaces(InputWorkspaces=groupZ,OutputWorkspace=fname+'_Contour')
GroupWorkspaces(InputWorkspaces=groupZ,OutputWorkspace=fname+'_Contour')

if Save:
fpath = os.path.join(workdir,fname+'_Fit.nxs')
SaveNexusProcessed(InputWorkspace=fname+'_Fit', Filename=fpath)
Expand Down

0 comments on commit 69516c4

Please sign in to comment.