Merge branch 'feature/9345_indirect_jumpfit_python_algorithm'

SystemTests/AnalysisTests/ISISIndirectBayesTest.py

@@ -288,26 +288,31 @@ def cleanup(self):
 class JumpCETest(stresstesting.MantidStressTest):
 
     def runTest(self):
-        from IndirectJumpFit import JumpRun
         sname = 'irs26176_graphite002_QLr_Workspace'
         qrange = [0.6, 1.705600]
         verbOp = False
         plotOp = False
         saveOp = False
 
-        filename = sname+'.nxs' # path name for nxs file
+        filename = sname + '.nxs'  # path name for nxs file
         LoadNexusProcessed(Filename=filename, OutputWorkspace=sname)
-        JumpRun(sname,'CE',2,qrange[0],qrange[1],verbOp,plotOp,saveOp)
+        JumpFit(InputWorkspace=sname,
+                Function='ChudleyElliot',
+                Width=2,
+                QMin=qrange[0],
+                QMax=qrange[1],
+                Verbose=verbOp,
+                Plot=plotOp,
+                Save=saveOp)
 
     def validate(self):
         self.tolerance = 1e-5 
-        return 'irs26176_graphite002_QLr_CEfit_Workspace','ISISIndirectBayes_JumpCETest.nxs'
+        return 'irs26176_graphite002_QLr_ChudleyElliotfit_Workspace','ISISIndirectBayes_JumpCETest.nxs'
 
 #=============================================================================
 class JumpHallRossTest(stresstesting.MantidStressTest):
 
     def runTest(self):
-        from IndirectJumpFit import JumpRun
         sname = 'irs26176_graphite002_QLr_Workspace'
         qrange = [0.6, 1.705600]
         verbOp = False
@@ -316,7 +321,14 @@ def runTest(self):
 
         path = sname+'.nxs'  # path name for nxs file
         LoadNexusProcessed(Filename=path, OutputWorkspace=sname)
-        JumpRun(sname,'HallRoss',2,qrange[0],qrange[1],verbOp,plotOp,saveOp)
+        JumpFit(InputWorkspace=sname,
+                Function='HallRoss',
+                Width=2,
+                QMin=qrange[0],
+                QMax=qrange[1],
+                Verbose=verbOp,
+                Plot=plotOp,
+                Save=saveOp)
 
     def validate(self):
         self.tolerance = 1e-5 
@@ -326,7 +338,6 @@ def validate(self):
 class JumpFickTest(stresstesting.MantidStressTest):
 
     def runTest(self):
-        from IndirectJumpFit import JumpRun
         sname = 'irs26176_graphite002_QLr_Workspace'
         qrange = [0.6, 1.705600]
         verbOp = False
@@ -335,17 +346,23 @@ def runTest(self):
 
         path = sname+'.nxs'  # path name for nxs file
         LoadNexusProcessed(Filename=path, OutputWorkspace=sname)
-        JumpRun(sname,'Fick',2,qrange[0],qrange[1],verbOp,plotOp,saveOp)
+        JumpFit(InputWorkspace=sname,
+                Function='FickDiffusion',
+                Width=2,
+                QMin=qrange[0],
+                QMax=qrange[1],
+                Verbose=verbOp,
+                Plot=plotOp,
+                Save=saveOp)
 
     def validate(self):
         self.tolerance = 1e-5 
-        return 'irs26176_graphite002_QLr_Fickfit_Workspace','ISISIndirectBayes_JumpFickTest.nxs'
+        return 'irs26176_graphite002_QLr_FickDiffusionfit_Workspace','ISISIndirectBayes_JumpFickTest.nxs'
 
 #=============================================================================
 class JumpTeixeiraTest(stresstesting.MantidStressTest):
 
     def runTest(self):
-        from IndirectJumpFit import JumpRun
         sname = 'irs26176_graphite002_QLr_Workspace'
         qrange = [0.6, 1.705600]
         verbOp = False
@@ -354,10 +371,17 @@ def runTest(self):
 
         path = sname+'.nxs'  # path name for nxs file
         LoadNexusProcessed(Filename=path, OutputWorkspace=sname)
-        JumpRun(sname,'Teixeira',2,qrange[0],qrange[1],verbOp,plotOp,saveOp)
+        JumpFit(InputWorkspace=sname,
+                Function='TeixeiraWater',
+                Width=2,
+                QMin=qrange[0],
+                QMax=qrange[1],
+                Verbose=verbOp,
+                Plot=plotOp,
+                Save=saveOp)
 
     def validate(self):
         self.tolerance = 1e-2
-        return 'irs26176_graphite002_QLr_Teixeirafit_Workspace','ISISIndirectBayes_JumpTeixeiraTest.nxs'
+        return 'irs26176_graphite002_QLr_TeixeiraWaterfit_Workspace','ISISIndirectBayes_JumpTeixeiraTest.nxs'
 
 #=============================================================================