Skip to content

Commit

Permalink
Refs #8808 Fix typo.
Browse files Browse the repository at this point in the history
  • Loading branch information
Samuel Jackson committed Feb 11, 2014
1 parent 64308f1 commit 1b543cd
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py
Expand Up @@ -802,7 +802,7 @@ def furyfitPlotSeq(inputWS, Plot):
plotSpecs.append(i)
mp.plotSpectrum(inputWS, plotSpecs, True)

def furyfitSeq(inputWS, func, ftype, startx, endx, intensities_constrined=False, Save=False, Plot='None', Verbose=False):
def furyfitSeq(inputWS, func, ftype, startx, endx, intensities_constrained=False, Save=False, Plot='None', Verbose=False):
StartTime('FuryFit')

workdir = config['defaultsave.directory']
Expand Down Expand Up @@ -833,7 +833,7 @@ def furyfitSeq(inputWS, func, ftype, startx, endx, intensities_constrined=False,
wsnames = [fitWS, outNm+'_Result']
params = [startx, endx, fitType]
for ws in wsnames:
furyAddSampleLogs(inputWS, ws, params, intensities_constrined=intensities_constrined)
furyAddSampleLogs(inputWS, ws, params, intensities_constrained=intensities_constrained)

if Save:
#save workspace to default directory
Expand All @@ -852,13 +852,13 @@ def furyfitSeq(inputWS, func, ftype, startx, endx, intensities_constrined=False,
return mtd[fitWS]

#Copy logs from sample and add some addtional ones
def furyAddSampleLogs(inputWs, ws, params, intensities_constrined=False, beta_constrained=False):
def furyAddSampleLogs(inputWs, ws, params, intensities_constrained=False, beta_constrained=False):
startx, endx, fitType = params
CopyLogs(InputWorkspace=inputWs, OutputWorkspace=ws)
AddSampleLog(Workspace=ws, LogName="start_x", LogType="Number", LogText=str(startx))
AddSampleLog(Workspace=ws, LogName="end_x", LogType="Number", LogText=str(endx))
AddSampleLog(Workspace=ws, LogName="fit_type", LogType="String", LogText=fitType)
AddSampleLog(Workspace=ws, LogName="intensities_constrined", LogType="String", LogText=str(intensities_constrined))
AddSampleLog(Workspace=ws, LogName="intensities_constrained", LogType="String", LogText=str(intensities_constrained))
AddSampleLog(Workspace=ws, LogName="beta_constrained", LogType="String", LogText=str(beta_constrained))

def furyfitMultParsToWS(Table, Data):
Expand Down Expand Up @@ -972,7 +972,7 @@ def getFuryMultResult(inputWS, outNm, function, Verbose):
group += ',' + fout
GroupWorkspaces(InputWorkspaces=group,OutputWorkspace=fitWS[:-1])

def furyfitMult(inputWS, function, ftype, startx, endx, intensities_constrined=False, Save=False, Plot='None', Verbose=False):
def furyfitMult(inputWS, function, ftype, startx, endx, intensities_constrained=False, Save=False, Plot='None', Verbose=False):
StartTime('FuryFit Mult')
workdir = config['defaultsave.directory']
option = ftype[:-2]
Expand Down Expand Up @@ -1002,8 +1002,8 @@ def furyfitMult(inputWS, function, ftype, startx, endx, intensities_constrined=F
getFuryMultResult(inputWS, outNm, function, Verbose)

params = [startx, endx, ftype]
furyAddSampleLogs(inputWS, outWS, params, intensities_constrined=intensities_constrined, beta_constrained=True)
furyAddSampleLogs(inputWS, result_workspace, params, intensities_constrined=intensities_constrined, beta_constrained=True)
furyAddSampleLogs(inputWS, outWS, params, intensities_constrained=intensities_constrained, beta_constrained=True)
furyAddSampleLogs(inputWS, result_workspace, params, intensities_constrained=intensities_constrained, beta_constrained=True)

if Save:
opath = os.path.join(workdir, outWS+'.nxs') # path name for nxs file
Expand Down

0 comments on commit 1b543cd

Please sign in to comment.