Merge remote-tracking branch 'origin/feature/4856_msdfit_ui_upgrade'

mantidproject · May 1, 2014 · 8c127e2 · 8c127e2
2 parents 28a76f8 + 4d2722b
commit 8c127e2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/SystemTests/AnalysisTests/ISISIndirectInelastic.py b/SystemTests/AnalysisTests/ISISIndirectInelastic.py
@@ -533,8 +533,8 @@ def _run(self):
             SaveNexusProcessed(Filename=filename,
                                InputWorkspace=ws)
 
-
-        msdfit_result = msdfit(inputs=int_files,
+        eq2_file = elwin_results[1]
+        msdfit_result = msdfit(eq2_file,
                                startX=self.startX,
                                endX=self.endX,
                                Save=False,
@@ -591,8 +591,8 @@ def __init__(self):
         self.files = ['osi97935_graphite002_red.nxs',
                       'osi97936_graphite002_red.nxs']
         self.eRange = [-0.02,0.02]
-        self.startX = 0.208716
-        self.endX = 3.162844
+        self.startX = 0.195082
+        self.endX = 3.202128
 
 
     def get_reference_files(self):

diff --git a/SystemTests/AnalysisTests/ReferenceResults/II.IRISMSDFit.nxs b/SystemTests/AnalysisTests/ReferenceResults/II.IRISMSDFit.nxs
diff --git a/SystemTests/AnalysisTests/ReferenceResults/II.OSIRISMSDFit.nxs b/SystemTests/AnalysisTests/ReferenceResults/II.OSIRISMSDFit.nxs