Merge branch 'feature/5421_IDA_bayes_interface' of github.com:mantidp…

…roject/mantid into feature/5421_IDA_bayes_interface
mantidproject · Sep 26, 2013 · bcdddf6 · bcdddf6
2 parents da407ef + b497d84
commit bcdddf6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Quasi.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Quasi.cpp
@@ -124,7 +124,7 @@ namespace MantidQt
 
 			QString program = m_uiForm.cbProgram->currentText();
 
-			if(program == "Lorenzians")
+			if(program == "Lorentzians")
 			{
 				program = "QL";
 			}

diff --git a/Code/Mantid/scripts/Inelastic/IndirectBayes.py b/Code/Mantid/scripts/Inelastic/IndirectBayes.py
@@ -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))
@@ -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):
@@ -905,4 +913,4 @@ def JumpRun(sname,jump,prog,width,Crop,qrange,Verbose,Plot,Save):
 
 def JumpPlot(inputWS):
     j_plot=mp.plotSpectrum(inputWS+'_Data',0,True)
-    mp.mergePlots(j_plot,mp.plotSpectrum(inputWS+'_Fit',0,True))
+    mp.mergePlots(j_plot,mp.plotSpectrum(inputWS+'_Fit',0,True))