correct sys test workspace and file names, re #12426

mantidproject · Jul 16, 2015 · 380b080 · 380b080
1 parent 3c2c634
commit 380b080
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/...id/Testing/Data/SystemTest/ENGINX_precalculated_vanadium_run000236516_bank_curves.nxs.md5 b/...id/Testing/Data/SystemTest/ENGINX_precalculated_vanadium_run000236516_bank_curves.nxs.md5
@@ -0,0 +1 @@
+e5262f4b8faee3aeb0670dc6a6a79c70
diff --git a/...id/Testing/Data/SystemTest/ENGINX_precalculated_vanadium_run000236516_integration.nxs.md5 b/...id/Testing/Data/SystemTest/ENGINX_precalculated_vanadium_run000236516_integration.nxs.md5
@@ -0,0 +1 @@
+b80d6b275be723a41cc90cee179526f8
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/EnggCalibrationTest.py b/Code/Mantid/Testing/SystemTests/tests/analysis/EnggCalibrationTest.py
@@ -27,13 +27,9 @@ def __init__(self):
         # unit tests) are still the same results as we get from the actual calculations
         self._precalc_van_ws = LoadNexus(Filename='ENGINX_precalculated_vanadium_run000236516_bank_curves.nxs',
                                          OutputWorkspace='ENGIN-X_vanadium_curves_test_ws')
-        precalc_van_integ_nxs = LoadNexus(Filename=
-                                          'ENGINX_precalculated_vanadium_run000236516_integration.nxs',
-                                          OutputWorkspace='ENGIN-X_vanadium_integ_test_ws')
-        self._precalc_van_integ_tbl = CreateEmptyTableWorkspace(OutputWorkspace='van_spectra_integration_table')
-        self._precalc_van_integ_tbl.addColumn('int', 'Spectra integration')
-        for idx in range(0, precalc_van_integ_nxs.getNumberHistograms()):
-            self._precalc_van_integ_tbl.addRow([ int(precalc_van_integ_nxs.readY(idx)[0]) ])
+        self._precalc_van_integ_tbl = LoadNexus(Filename=
+                                               'ENGINX_precalculated_vanadium_run000236516_integration.nxs',
+                                               OutputWorkspace='ENGIN-X_vanadium_integ_test_ws')
 
         self.van_bank_curves_name = 'enginx_van_bank_curves'
         self.van_bank_curves_pre_integ_name = 'enginx_van_bank_curves_with_precalc_integ'
@@ -55,7 +51,7 @@ def runTest(self):
                   VanadiumWorkspace = van_ws,
                   Bank = '1',
                   OutVanadiumCurveFits = self.van_bank_curves_name,
-                  OutputWorkspace='out_ws')
+                  OutputWorkspace=self.out_ws_name)
 
         # Now with pre-calculated curves and integration values. This makes sure that these do not
         # change too much AND the final results do not change too much as a result
@@ -64,7 +60,7 @@ def runTest(self):
                   Bank = '1',
                   VanadiumIntegWorkspace = self._precalc_van_integ_tbl,
                   OutVanadiumCurveFits = self.van_bank_curves_pre_integ_name,
-                  OutputWorkspace='out_pre_int_ws')
+                  OutputWorkspace=self.out_ws_precalc_name)
 
     def validate(self):
         out_ws = mtd[self.out_ws_name]