Skip to content

Commit

Permalink
Refs #8585 JumpFit should only list the first three widths.
Browse files Browse the repository at this point in the history
Also swapped index function names from of Quasi output to be
consistent with ConvFit and updated plotting indicies.
  • Loading branch information
Samuel Jackson committed Jan 17, 2014
1 parent c22aa5a commit 67986c3
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
6 changes: 6 additions & 0 deletions Code/Mantid/MantidQt/CustomInterfaces/src/JumpFit.cpp
Expand Up @@ -195,6 +195,12 @@ namespace MantidQt
cbItemName = title.substr(0, substrIndex);
spectraList[cbItemName] = static_cast<int>(i);
m_uiForm.cbWidth->addItem(QString(cbItemName.c_str()));

//display widths f1.f1, f2.f1 and f2.f2
if (m_uiForm.cbWidth->count() == 3)
{
return;
}
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions Code/Mantid/scripts/Inelastic/IndirectBayes.py
Expand Up @@ -491,13 +491,13 @@ def C2Fw(prog,sname):
e.append(width)

#create x data and axis names for each function
axis_names.append('f'+str(nl-1)+'.f0.'+'Height')
axis_names.append('f'+str(nl)+'.f0.'+'Height')
x.append(x_data)
for j in range(1,nl+1):
axis_names.append('f'+str(nl-1)+'.f'+str(j)+'.Amplitude')
axis_names.append('f'+str(nl)+'.f'+str(j)+'.Amplitude')
x.append(x_data)

axis_names.append('f'+str(nl-1)+'.f'+str(j)+'.FWHM')
axis_names.append('f'+str(nl)+'.f'+str(j)+'.FWHM')
x.append(x_data)

x = np.asarray(x).flatten()
Expand Down Expand Up @@ -603,10 +603,10 @@ def QLPlotQL(inputWS,Plot,res_plot,Loop):
nhist = mtd[ws_name].getNumberHistograms()

if (Plot == 'Amplitude' or Plot == 'All'):
plotSpectra(ws_name, 'Amplitude', indicies=range(0,nhist,3))
plotSpectra(ws_name, 'Amplitude', indicies=[1,4,6])

if (Plot == 'FWHM' or Plot == 'All'):
plotSpectra(ws_name, 'Full width half maximum (meV)', indicies=range(2,nhist,3))
plotSpectra(ws_name, 'Full width half maximum (meV)', indicies=[2,5,7])

if (Plot == 'Prob' or Plot == 'All'):
pWS = inputWS+'_Prob'
Expand Down

0 comments on commit 67986c3

Please sign in to comment.