Refs #8389 Updated sigma and beta work with a colour fill plot.

Code/Mantid/scripts/Inelastic/IndirectBayes.py

@@ -717,16 +717,22 @@ def QuestRun(samWS,resWS,nbs,erange,nbins,Fit,Loop,Verbose,Plot,Save):
 		if (m > 0):
 			Qaxis += ','
 		Qaxis += str(Q[m])
+
+		dataXz = []
+		dataYz = []
+		dataEz = []
+
 		for n in range(0,Nsig):
 			yfit_list = np.split(zpout[:Nsig*Nbet],Nsig)
 			dataYzp = yfit_list[n]
-			if n == 0:
-				CreateWorkspace(OutputWorkspace=zpWS, DataX=xbout[:Nbet], DataY=dataYzp[:Nbet], DataE=eBet0,
-					Nspec=1, UnitX='MomentumTransfer')
-			else:
-				CreateWorkspace(OutputWorkspace='__Zpt', DataX=xbout[:Nbet], DataY=dataYzp[:Nbet], DataE=eBet0,
-					Nspec=1, UnitX='MomentumTransfer')
-				ConjoinWorkspaces(InputWorkspace1=zpWS, InputWorkspace2='__Zpt', CheckOverlapping=False)				
+
+			dataXz = np.append(dataXz,xbout[:Nbet])
+			dataYz = np.append(dataYz,dataYzp[:Nbet])
+			dataEz = np.append(dataEz,eBet0)
+
+		CreateWorkspace(OutputWorkspace=zpWS, DataX=dataXz, DataY=dataYz, DataE=dataEz,
+			Nspec=Nsig, UnitX='MomentumTransfer', VerticalAxisUnit='MomentumTransfer', VerticalAxisValues=dataXs)
+
 		if m == 0:
 			xSig = dataXs
 			ySig = dataYs
@@ -743,10 +749,18 @@ def QuestRun(samWS,resWS,nbs,erange,nbins,Fit,Loop,Verbose,Plot,Save):
 			yBet = np.append(yBet,dataYb)
 			eBet = np.append(eBet,eBet0)
 			groupZ = groupZ +','+ zpWS
+
+	#create workspaces for sigma and beta
 	CreateWorkspace(OutputWorkspace=fname+'_Sigma', DataX=xSig, DataY=ySig, DataE=eSig,
 		Nspec=nsam, UnitX='', VerticalAxisUnit='MomentumTransfer', VerticalAxisValues=Qaxis)
+	unitx = mtd[fname+'_Sigma'].getAxis(0).setUnit("Label")
+	unitx.setLabel('sigma' , '')
+
 	CreateWorkspace(OutputWorkspace=fname+'_Beta', DataX=xBet, DataY=yBet, DataE=eBet,
 		Nspec=nsam, UnitX='', VerticalAxisUnit='MomentumTransfer', VerticalAxisValues=Qaxis)
+	unitx = mtd[fname+'_Beta'].getAxis(0).setUnit("Label")
+	unitx.setLabel('beta' , '')
+
 	group = fname + '_Sigma,'+ fname + '_Beta'
 	GroupWorkspaces(InputWorkspaces=group,OutputWorkspace=fname+'_Fit')	
 	GroupWorkspaces(InputWorkspaces=groupZ,OutputWorkspace=fname+'_Contour')
@@ -764,12 +778,10 @@ def QuestRun(samWS,resWS,nbs,erange,nbins,Fit,Loop,Verbose,Plot,Save):
 	EndTime('Quest')
 
 def QuestPlot(inputWS,Plot):
-	if (Plot == 'Sigma'):
-		sig_plot=mp.plotSpectrum(inputWS+'_Sigma',0,True)
-	if (Plot == 'Beta'):
-		beta_plot = mp.plotSpectrum(inputWS+'_Beta',0,True)
-	if(Plot == 'All'):
-		mp.plotSpectrum([inputWS+'_Sigma',inputWS+'_Beta'], 0, True)
+	if (Plot == 'Sigma' or Plot == 'All'):
+		sig_plot=mp.importMatrixWorkspace(inputWS+'_Sigma').plotGraph2D()
+	if (Plot == 'Beta' or Plot == 'All'):
+		beta_plot=mp.importMatrixWorkspace(inputWS+'_Beta').plotGraph2D()
 
 # ResNorm programs
 def ResNormRun(vname,rname,erange,nbin,Verbose=False,Plot='None',Save=False):