Skip to content

Commit 86de1c2

Browse files
MialLewisMialLewis
committed
update paths to run from calibration root
1 parent 4c54a5c commit 86de1c2

12 files changed

+129
-127
lines changed

‎.github/workflows/pr_workflow.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ jobs:
3939
- name: Run EVSVesuvio Calibration Unit Tests
4040
run: |
4141
export MANTIDPROPERTIES=$(pwd)/Mantid.user.properties
42-
python -m unittest discover -s ./unpackaged/vesuvio_calibration/tests/unit
42+
cd unpackaged/vesuvio_calibration
43+
python -m unittest discover -s ./tests/unit
4344
4445
#DISABLED AS THEY APPEAR TOO LARGE FOR GITHUB HOSTED RUNNERS
4546
#- name: Run Vesuvio Calibration System Tests

‎unpackaged/vesuvio_calibration/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ Upon running the script, the two calibration algorithms will be registered under
4747

4848
1. Actviate the conda environment using `conda activate vesuvio-env`.
4949

50-
2. From the root of the repository run `python -m unittest discover -s ./unpackaged/vesuvio_calibration/tests/unit`
50+
2. From `<root of the repository>/unpackaged/vesuvio_calibration` run `python -m unittest discover -s ./tests/unit`
5151

5252
## Running the system tests from the command line.
5353

5454
1. Actviate the conda environment using `conda activate vesuvio-env`.
5555

56-
2. From the root of the repository run `python -m unittest discover -s ./unpackaged/vesuvio_calibration/tests/system`
56+
2. From `<root of the repository>/unpackaged/vesuvio_calibration` run `python -m unittest discover -s ./tests/system`

‎unpackaged/vesuvio_calibration/calibration_scripts/calibrate_vesuvio_analysis.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
from mantid.api import FileProperty, FileAction, PythonAlgorithm,AlgorithmManager
44
from mantid.simpleapi import CreateEmptyTableWorkspace, DeleteWorkspace, ReplaceSpecialValues, GroupWorkspaces, mtd,\
55
ConvertTableToMatrixWorkspace, ConjoinWorkspaces, Transpose, PlotPeakByLogValue,RenameWorkspace
6-
from unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_helper_functions import EVSGlobals, EVSMiscFunctions
6+
from calibration_scripts.calibrate_vesuvio_helper_functions import EVSGlobals, EVSMiscFunctions
7+
78

89
import os
910
import sys

‎unpackaged/vesuvio_calibration/calibration_scripts/calibrate_vesuvio_fit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
ReplaceSpecialValues, FindPeaks, GroupWorkspaces, mtd, Plus, LoadVesuvio, LoadRaw, ConvertToDistribution, FindPeakBackground,\
77
ExtractSingleSpectrum, SumSpectra, AppendSpectra, CloneWorkspace, Fit, MaskDetectors, ExtractUnmaskedSpectra, CreateWorkspace
88
from functools import partial
9-
from unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_helper_functions import EVSGlobals, EVSMiscFunctions
9+
from calibration_scripts.calibrate_vesuvio_helper_functions import EVSGlobals, EVSMiscFunctions
1010

1111
import os
1212
import sys

‎unpackaged/vesuvio_calibration/load_calibration_algorithms.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"""
1414

1515
from mantid.api import AlgorithmFactory
16-
from unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_fit import EVSCalibrationFit
17-
from unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_analysis import EVSCalibrationAnalysis
16+
from calibration_scripts.calibrate_vesuvio_fit import EVSCalibrationFit
17+
from calibration_scripts.calibrate_vesuvio_analysis import EVSCalibrationAnalysis
1818

1919
AlgorithmFactory.subscribe(EVSCalibrationFit)
2020
AlgorithmFactory.subscribe(EVSCalibrationAnalysis)

‎unpackaged/vesuvio_calibration/tests/system/test_system_analysis.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
from mantid.api import AlgorithmFactory
55
from mantid.simpleapi import mtd
66
from mock import patch
7-
from unpackaged.vesuvio_calibration.tests.testhelpers.algorithms import create_algorithm
8-
from unpackaged.vesuvio_calibration.tests.testhelpers.system_test_base import EVSCalibrationTest, TestConstants
9-
from unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_helper_functions import EVSGlobals
10-
from unpackaged.vesuvio_calibration.tests.testhelpers.system_test_misc_functions import assert_allclose_excluding_bad_detectors
11-
from unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_analysis import EVSCalibrationAnalysis
12-
from unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_fit import EVSCalibrationFit
7+
from tests.testhelpers.algorithms import create_algorithm
8+
from tests.testhelpers.system_test_base import EVSCalibrationTest, TestConstants
9+
from calibration_scripts.calibrate_vesuvio_helper_functions import EVSGlobals
10+
from tests.testhelpers.system_test_misc_functions import assert_allclose_excluding_bad_detectors
11+
from calibration_scripts.calibrate_vesuvio_analysis import EVSCalibrationAnalysis
12+
from calibration_scripts.calibrate_vesuvio_fit import EVSCalibrationFit
1313
from copy import copy
1414
from os import path
1515

@@ -40,7 +40,7 @@ def setUp(self):
4040
self._E1_fit = [False, True, True]
4141
self._L0_fit = [False]
4242

43-
@patch('unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
43+
@patch('calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
4444
def test_copper(self, load_file_mock):
4545
self._setup_copper_test()
4646
self._output_workspace = "copper_analysis_test"
@@ -55,7 +55,7 @@ def test_copper(self, load_file_mock):
5555
165, 167, 168, 169, 170, 182, 191, 192]})
5656
self._assert_parameters_match_expected(params_table, detector_specific_r_tols)
5757

58-
@patch('unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
58+
@patch('calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
5959
def test_lead(self, load_file_mock):
6060
self._setup_lead_test()
6161
self._output_workspace = "lead_analysis_test"
@@ -70,7 +70,7 @@ def test_lead(self, load_file_mock):
7070
178, 180, 182, 183]})
7171
self._assert_parameters_match_expected(params_table, detector_specific_r_tols)
7272

73-
@patch('unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
73+
@patch('calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
7474
def test_niobium(self, load_file_mock):
7575
self._setup_niobium_test()
7676
self._output_workspace = "niobium_analysis_test"
@@ -88,7 +88,7 @@ def test_niobium(self, load_file_mock):
8888
182, 186, 187, 189, 191]})
8989
self._assert_parameters_match_expected(params_table, detector_specific_r_tols)
9090

91-
@patch('unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
91+
@patch('calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
9292
def test_copper_with_uranium(self, load_file_mock):
9393
self._setup_copper_test()
9494
self._output_workspace = "copper_analysis_test"
@@ -103,7 +103,7 @@ def test_copper_with_uranium(self, load_file_mock):
103103
165, 167, 168, 169, 170, 182, 191, 192]})
104104
self._assert_parameters_match_expected(params_table, detector_specific_r_tols)
105105

106-
@patch('unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
106+
@patch('calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
107107
def test_lead_with_uranium(self, load_file_mock):
108108
self._setup_lead_test()
109109
self._output_workspace = "lead_analysis_test"
@@ -118,7 +118,7 @@ def test_lead_with_uranium(self, load_file_mock):
118118
178, 180, 182, 183]})
119119
self._assert_parameters_match_expected(params_table, detector_specific_r_tols)
120120

121-
@patch('unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
121+
@patch('calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
122122
def test_copper_with_l0_calc(self, load_file_mock):
123123
self._setup_copper_test()
124124
self._L0_fit = [True, True, True, False, False, False]
@@ -138,7 +138,7 @@ def test_copper_with_l0_calc(self, load_file_mock):
138138
165, 167, 168, 169, 170, 182, 191, 192]})
139139
self._assert_parameters_match_expected(params_table, detector_specific_r_tols)
140140

141-
@patch('unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
141+
@patch('calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
142142
def test_copper_with_multiple_iterations(self, load_file_mock):
143143
self._setup_copper_test()
144144
self._iterations = 2
@@ -158,7 +158,7 @@ def test_copper_with_multiple_iterations(self, load_file_mock):
158158
165, 167, 168, 169, 170, 182, 191, 192]})
159159
self._assert_parameters_match_expected(params_table, detector_specific_r_tols)
160160

161-
@patch('unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
161+
@patch('calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
162162
def test_copper_create_output(self, load_file_mock):
163163
self._setup_copper_test()
164164
self._output_workspace = "copper_analysis_test"
@@ -175,7 +175,7 @@ def test_copper_create_output(self, load_file_mock):
175175
165, 167, 168, 169, 170, 182, 191, 192]})
176176
self._assert_parameters_match_expected(params_table, detector_specific_r_tols)
177177

178-
@patch('unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
178+
@patch('calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
179179
def test_copper_with_individual_and_global_fit(self, load_file_mock):
180180
self._setup_copper_test()
181181
self._output_workspace = "copper_analysis_test"

‎unpackaged/vesuvio_calibration/tests/system/test_system_fit.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
from mantid.api import WorkspaceGroup, AlgorithmFactory
77
from mantid.simpleapi import mtd
88
from mock import patch
9-
from unpackaged.vesuvio_calibration.tests.testhelpers.algorithms import create_algorithm
10-
from unpackaged.vesuvio_calibration.tests.testhelpers.system_test_base import EVSCalibrationTest, TestConstants
11-
from unpackaged.vesuvio_calibration.tests.testhelpers.system_test_misc_functions import assert_allclose_excluding_bad_detectors
12-
from unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_helper_functions import EVSMiscFunctions, EVSGlobals
13-
from unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_fit import EVSCalibrationFit
9+
from tests.testhelpers.algorithms import create_algorithm
10+
from tests.testhelpers.system_test_base import EVSCalibrationTest, TestConstants
11+
from tests.testhelpers.system_test_misc_functions import assert_allclose_excluding_bad_detectors
12+
from calibration_scripts.calibrate_vesuvio_helper_functions import EVSMiscFunctions, EVSGlobals
13+
from calibration_scripts.calibrate_vesuvio_fit import EVSCalibrationFit
1414
from os import path
1515

1616

@@ -40,7 +40,7 @@ def setUp(self):
4040
self._E1_fit = [False]
4141
self._L0_fit = [False]
4242

43-
@patch('unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
43+
@patch('calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
4444
def test_fit_bragg_peaks_copper(self, load_file_mock):
4545
self._setup_copper_test()
4646
self._spec_range = [EVSGlobals.DETECTOR_RANGE]
@@ -52,7 +52,7 @@ def test_fit_bragg_peaks_copper(self, load_file_mock):
5252
params_table = self._run_evs_calibration_fit("Bragg")
5353
self._assert_fitted_positions_match_expected(expected_values, params_table, {15: TestConstants.IGNORE_DETECTOR})
5454

55-
@patch('unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
55+
@patch('calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
5656
def test_fit_bragg_peaks_lead(self, load_file_mock):
5757
self._setup_lead_test()
5858
self._spec_range = [EVSGlobals.DETECTOR_RANGE]
@@ -65,7 +65,7 @@ def test_fit_bragg_peaks_lead(self, load_file_mock):
6565
self._assert_fitted_positions_match_expected(expected_values, params_table, {145: 0.27, 158: 0.15, 190:
6666
TestConstants.IGNORE_DETECTOR})
6767

68-
@patch('unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
68+
@patch('calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
6969
def test_fit_peaks_copper_E1(self, load_file_mock):
7070
self._setup_copper_test()
7171
self._E1_fit_active = True
@@ -79,7 +79,7 @@ def test_fit_peaks_copper_E1(self, load_file_mock):
7979
params_table = self._run_evs_calibration_fit("Recoil")
8080
self._assert_fitted_positions_match_expected(expected_values, params_table, {38: 0.12})
8181

82-
@patch('unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
82+
@patch('calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
8383
def test_fit_peaks_lead_E1(self, load_file_mock):
8484
self._setup_lead_test()
8585
self._E1_fit_active = True
@@ -93,7 +93,7 @@ def test_fit_peaks_lead_E1(self, load_file_mock):
9393
params_table = self._run_evs_calibration_fit("Recoil")
9494
self._assert_fitted_positions_match_expected(expected_values, params_table, {38: 0.12})
9595

96-
@patch('unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
96+
@patch('calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
9797
def test_fit_frontscattering_uranium(self, load_file_mock):
9898
self._setup_uranium_test()
9999
self._run_range = EVSGlobals.U_FRONTSCATTERING_SAMPLE
@@ -107,7 +107,7 @@ def test_fit_frontscattering_uranium(self, load_file_mock):
107107
params_table = self._run_evs_calibration_fit("Recoil")
108108
self._assert_fitted_positions_match_expected(expected_values, params_table)
109109

110-
@patch('unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
110+
@patch('calibration_scripts.calibrate_vesuvio_fit.EVSCalibrationFit._load_file')
111111
def test_fit_backscattering_uranium(self, load_file_mock):
112112
self._setup_uranium_test()
113113
self._run_range = EVSGlobals.U_BACKSCATTERING_SAMPLE

‎unpackaged/vesuvio_calibration/tests/testhelpers/system_test_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import unittest
22
import numpy as np
33
from mantid.simpleapi import LoadVesuvio, LoadRaw, mtd, ConvertToDistribution
4-
from unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_helper_functions import EVSGlobals
4+
from calibration_scripts.calibrate_vesuvio_helper_functions import EVSGlobals
55
from os import path
66

77

‎unpackaged/vesuvio_calibration/tests/testhelpers/system_test_misc_functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import numpy as np
22
from sys import maxsize
3-
from unpackaged.vesuvio_calibration.tests.testhelpers.system_test_base import TestConstants
3+
from tests.testhelpers.system_test_base import TestConstants
44

55

66
def assert_allclose_excluding_bad_detectors(expected_position, position, rtol, default_rtol=TestConstants.DEFAULT_RELATIVE_TOLERANCE):

‎unpackaged/vesuvio_calibration/tests/unit/test_calibrate_vesuvio_analysis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from unpackaged.vesuvio_calibration.calibration_scripts.calibrate_vesuvio_analysis import EVSCalibrationAnalysis
1+
from calibration_scripts.calibrate_vesuvio_analysis import EVSCalibrationAnalysis
22

33
import unittest
44

0 commit comments

Comments
 (0)