Merge remote-tracking branch 'origin/feature/8347_upgrade_jumpfit'

SystemTests/AnalysisTests/ISISIndirectBayesTest.py

@@ -289,45 +289,75 @@ class JumpCETest(stresstesting.MantidStressTest):
 
     def runTest(self):
         from IndirectJumpFit import JumpRun
-        sname = 'iris21360_graphite002_QLd_Workspace'
-        qrange = [0.0, 5.0]
+        sname = 'irs26176_graphite002_QLr_Workspace'
+        qrange = [0.6, 1.6]
         verbOp = False
         plotOp = False
         saveOp = False
 
         filename = sname+'.nxs' # path name for nxs file
         LoadNexusProcessed(Filename=filename, OutputWorkspace=sname)
-        JumpRun(sname,'CE',0,qrange[0],qrange[1],verbOp,plotOp,saveOp)
+        JumpRun(sname,'CE',1,qrange[0],qrange[1],verbOp,plotOp,saveOp)
 
     def validate(self):
         self.tolerance = 1e-5 
-        return 'iris21360_graphite002_QLd_CEfit_Workspace','ISISIndirectBayes_JumpCETest.nxs'
-
-    def cleanup(self):
-        filenames = ['irs26176_graphite002_QLr_CEfit_FW11.lpt']
-        _cleanup_files(config['defaultsave.directory'], filenames)
+        return 'irs26176_graphite002_QLr_CEfit_Workspace','ISISIndirectBayes_JumpCETest.nxs'
 
 #=============================================================================
 class JumpSSTest(stresstesting.MantidStressTest):
 
     def runTest(self):
         from IndirectJumpFit import JumpRun
         sname = 'iris21360_graphite002_QLd_Workspace'
-        qrange = [0.0, 5.0]
+        qrange = [0.6, 1.6]
         verbOp = False
         plotOp = False
         saveOp = False
 
         path = sname+'.nxs'  # path name for nxs file
         LoadNexusProcessed(Filename=path, OutputWorkspace=sname)
-        JumpRun(sname,'SS',0,qrange[0],qrange[1],verbOp,plotOp,saveOp)
+        JumpRun(sname,'SS',1,qrange[0],qrange[1],verbOp,plotOp,saveOp)
 
     def validate(self):
         self.tolerance = 1e-5 
         return 'iris21360_graphite002_QLd_SSfit_Workspace','ISISIndirectBayes_JumpSSTest.nxs'
 
-    def cleanup(self):
-        filenames = ['irs26176_graphite002_QLr_SSfit_FW11.lpt']
-        _cleanup_files(config['defaultsave.directory'], filenames)
+#=============================================================================
+class JumpFickTest(stresstesting.MantidStressTest):
+
+    def runTest(self):
+        from IndirectJumpFit import JumpRun
+        sname = 'iris21360_graphite002_QLd_Workspace'
+        qrange = [0.6, 1.6]
+        verbOp = False
+        plotOp = False
+        saveOp = False
+
+        path = sname+'.nxs'  # path name for nxs file
+        LoadNexusProcessed(Filename=path, OutputWorkspace=sname)
+        JumpRun(sname,'Fick',1,qrange[0],qrange[1],verbOp,plotOp,saveOp)
+
+    def validate(self):
+        self.tolerance = 1e-5 
+        return 'iris21360_graphite002_QLd_Fickfit_Workspace','ISISIndirectBayes_JumpFickTest.nxs'
+
+#=============================================================================
+class JumpTeixeiraTest(stresstesting.MantidStressTest):
+
+    def runTest(self):
+        from IndirectJumpFit import JumpRun
+        sname = 'iris21360_graphite002_QLd_Workspace'
+        qrange = [0.6, 1.6]
+        verbOp = False
+        plotOp = False
+        saveOp = False
+
+        path = sname+'.nxs'  # path name for nxs file
+        LoadNexusProcessed(Filename=path, OutputWorkspace=sname)
+        JumpRun(sname,'Teixeira',1,qrange[0],qrange[1],verbOp,plotOp,saveOp)
+
+    def validate(self):
+        self.tolerance = 1e-2
+        return 'iris21360_graphite002_QLd_Teixeirafit_Workspace','ISISIndirectBayes_JumpTeixeiraTest.nxs'
 
 #=============================================================================