Fix for SuggestTibCNCS. Refs #10979

Code/Mantid/Framework/PythonInterface/plugins/algorithms/SuggestTibCNCS.py

@@ -93,7 +93,7 @@ def PyExec(self):
         if itpulse.overlap(Interval(tinf,tinf)):
             #if the prompt pulse overlaps with t_inf move the upper part one frame down
             intervalList.append(Interval(itpulse.min,tinf))
-            intervalList.append(Interval(tinf-frame,itpulse.max+tinf-frame))
+            intervalList.append(Interval(tinf-frame,itpulse.max-frame))
         else:
             if tinf<itpulse.min:
                 itpulse=Interval(itpulse.min-frame,itpulse.max-frame)

Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/SuggestTibCNCSTest.py

@@ -1,15 +1,24 @@
 import unittest,os
 import mantid
+import numpy
 
 
 class SuggestTibCNCSTest(unittest.TestCase):
     def test_simple(self):
-    	result=mantid.simpleapi.SuggestTibCNCS(3.)
-    	self.assertAlmostEqual(result[0]*0.1,4491.5,0)
-    	self.assertAlmostEqual(result[1]*0.1,4731.5,0)
-    	result=mantid.simpleapi.SuggestTibCNCS(1.)
-    	self.assertAlmostEqual(result[0]*0.1,9562.1,0)
-    	self.assertAlmostEqual(result[1]*0.1,9902.1,0)
+        result=mantid.simpleapi.SuggestTibCNCS(3.)
+        self.assertAlmostEqual(result[0]*0.1,4491.5,0)
+        self.assertAlmostEqual(result[1]*0.1,4731.5,0)
+        result=mantid.simpleapi.SuggestTibCNCS(1.)
+        self.assertAlmostEqual(result[0]*0.1,9562.1,0)
+        self.assertAlmostEqual(result[1]*0.1,9902.1,0)
+        result=mantid.simpleapi.SuggestTibCNCS(6.)
+        self.assertAlmostEqual(result[0]*0.1,2983.3,0)
+        self.assertAlmostEqual(result[1]*0.1,3323.3,0)
+
+    def test_someresult(self):
+        for en in numpy.arange(1.,30.,0.1):
+            result=mantid.simpleapi.SuggestTibCNCS(en)
+            self.assertGreater(result[1]-result[0],1000.)
 
 if __name__=="__main__":
     unittest.main()