Skip to content

Commit

Permalink
Refs #5421 Fix Quest Plotting and Quasi run function.
Browse files Browse the repository at this point in the history
  • Loading branch information
Samuel Jackson committed Sep 25, 2013
1 parent 9003dd3 commit b497d84
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Code/Mantid/MantidQt/CustomInterfaces/src/Quasi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ namespace MantidQt

QString program = m_uiForm.cbProgram->currentText();

if(program == "Lorenzians")
if(program == "Lorentzians")
{
program = "QL";
}
Expand Down
20 changes: 14 additions & 6 deletions Code/Mantid/scripts/Inelastic/IndirectBayes.py
Original file line number Diff line number Diff line change
Expand Up @@ -580,18 +580,18 @@ def C2Se(sname):
Eb.append(be[1])
Vaxis = []
dataX = np.array(Xout)
dataY = np.array(Yf1)
dataE = np.array(Ef1)
dataY = np.array(Yf)
dataE = np.array(Ef)
nhist = 1
Vaxis.append('width')
dataX = np.append(dataX,np.array(Xout))
dataY = np.append(dataY,np.array(Yi1))
dataE = np.append(dataE,np.array(Ei1))
dataY = np.append(dataY,np.array(Yi))
dataE = np.append(dataE,np.array(Ei))
nhist += 1
Vaxis.append('ampl')
dataX = np.append(dataX,np.array(Xout))
dataY = np.append(dataY,np.array(Yb1))
dataE = np.append(dataE,np.array(Eb1))
dataY = np.append(dataY,np.array(Yb))
dataE = np.append(dataE,np.array(Eb))
nhist += 1
Vaxis.append('beta')
logger.notice('Vaxis=' + str(Vaxis))
Expand Down Expand Up @@ -759,6 +759,14 @@ def QuestRun(samWS,resWS,nbs,erange,nbins,Fit,Loop,Verbose,Plot,Save):
QuestPlot(fname,Plot)
EndTime('Quest')

def QuestPlot(inputWS,Plot):
if (Plot == 'Sigma' or Plot == 'All'):
sig_plot=mp.plotSpectrum(inputWS+'_Sigma',0,True)
if (Plot == 'Beta' or Plot == 'All'):
beta_plot = mp.plotSpectrum(inputWS+'_Beta',0,True)
if(Plot == 'All'):
mp.mergePlots(sig_plot,beta_plot)

# ResNorm programs

def ResNormRun(vname,rname,erange,nbin,Verbose=False,Plot=False,Save=False):
Expand Down

0 comments on commit b497d84

Please sign in to comment.