Skip to content
This repository has been archived by the owner on Apr 3, 2019. It is now read-only.

Commit

Permalink
Merge branch 'feature/5421_IDA_bayes_interface' of github.com:mantidp…
Browse files Browse the repository at this point in the history
…roject/systemtests into feature/5421_IDA_bayes_interface

Conflicts:
	SystemTests/AnalysisTests/ISISIndirectBayesTest.py

Refs #5421
  • Loading branch information
Samuel Jackson committed Oct 24, 2013
2 parents eae4413 + 53dc577 commit f7ed440
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions SystemTests/AnalysisTests/ISISIndirectBayesTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def runTest(self):
rsname = ''
wfile = ''
erange = [-0.5, 0.5]
fitOp = [True, 'Sloping', False, False]
fitOp = [True, 'Sloping', False, False] #elastic, background, width, resnorm
loopOp = False
verbOp = False
plotOp = False
Expand Down Expand Up @@ -141,7 +141,7 @@ def runTest(self):
rsname = ''
wfile = ''
erange = [-0.5, 0.5]
fitOp = [True, 'Sloping', False, False]
fitOp = [True, 'Sloping', False, False] #elastic, background, width, resnorm
loopOp = False
verbOp = False
plotOp = False
Expand Down Expand Up @@ -179,7 +179,7 @@ def runTest(self):
rsname = ''
wfile = ''
erange = [-0.5, 0.5]
fitOp = [True, 'Sloping', False, False]
fitOp = [True, 'Sloping', False, False] #elastic, background, width, resnorm
loopOp = False
verbOp = False
plotOp = False
Expand Down

0 comments on commit f7ed440

Please sign in to comment.