Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/bugfix/8286_ConvFit_delta_func_e…
Browse files Browse the repository at this point in the history
…rror'
  • Loading branch information
mantid-roman committed Oct 30, 2013
2 parents 8d3db37 + a014192 commit d6d10a3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def createConvFitFun(options, par, file):
lor_fun = 'name=Lorentzian,Amplitude='+str(par[ip])+',PeakCentre='+str(par[ip+1])+',HWHM='+str(par[ip+2])
if options[2] == 2:
lor_2 = 'name=Lorentzian,Amplitude='+str(par[ip+3])+',PeakCentre='+str(par[ip+4])+',HWHM='+str(par[ip+5])
lor_fun = lor_fun +';'+ lor_2 +';ties=(f0.PeakCentre=f1.PeakCentre)'
lor_fun = lor_fun +';'+ lor_2 +';ties=(f1.PeakCentre=f2.PeakCentre)'
if options[1]:
delta_fun = 'name=DeltaFunction,Height='+str(par[2])
lor_fun = delta_fun +';' + lor_fun
Expand Down

0 comments on commit d6d10a3

Please sign in to comment.