Replace EVSVesuvio with mvesuvio

.github/workflows/ci_tests_nightly.yml

@@ -28,10 +28,10 @@ jobs:
       - name: Run mvesuvio analysis unit tests
         run: |
           export MANTIDPROPERTIES=$(pwd)/Mantid.user.properties
-          python -m unittest discover -s ./EVSVesuvio/vesuvio_analysis/tests
+          python -m unittest discover -s ./mvesuvio/vesuvio_analysis/tests
 
       # Runs System tests
       - name: Run mvesuvio analysis system tests
         run: |
-          export VESUVIOPROPERTIES=$(pwd)/EVSVesuvio/system_tests/test_config/vesuvio.user.properties
-          python -m unittest discover -s ./EVSVesuvio/system_tests
+          export VESUVIOPROPERTIES=$(pwd)/mvesuvio/system_tests/test_config/vesuvio.user.properties
+          python -m unittest discover -s ./mvesuvio/system_tests

.github/workflows/pr_workflow.yml

@@ -1,4 +1,4 @@
-name: EVSVesuvio pull request workflow
+name: mvesuvio pull request workflow
 
 on: push
 
@@ -30,18 +30,18 @@ jobs:
       # Remove `export MANTIDPROPERTIES=$(pwd)/Mantid.user.properties` when updated to mantid > 6.8.0
 
       # Runs Unit tests
-      - name: Run EVSVesuvio Analysis Unit Tests
+      - name: Run mvesuvio Analysis Unit Tests
         run: |
           export MANTIDPROPERTIES=$(pwd)/Mantid.user.properties
-          python -m unittest discover -s ./EVSVesuvio/vesuvio_analysis/tests
+          python -m unittest discover -s ./mvesuvio/vesuvio_analysis/tests
 
       # Runs System tests
-      - name: Run EVSVesuvio Analysis System Tests
+      - name: Run mvesuvio Analysis System Tests
         run: |
-          export VESUVIOPROPERTIES=$(pwd)/EVSVesuvio/system_tests/test_config/vesuvio.user.properties
-          python -m unittest discover -s ./EVSVesuvio/system_tests
+          export VESUVIOPROPERTIES=$(pwd)/mvesuvio/system_tests/test_config/vesuvio.user.properties
+          python -m unittest discover -s ./mvesuvio/system_tests
 
-      - name: Run EVSVesuvio Calibration Unit Tests
+      - name: Run mvesuvio Calibration Unit Tests
         run: |
           export MANTIDPROPERTIES=$(pwd)/Mantid.user.properties
           cd unpackaged/vesuvio_calibration

.pre-commit-config.yaml

@@ -8,15 +8,15 @@ repos:
     hooks:
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
-        exclude: 'EVSVesuvio/vesuvio_analysis/scribles|EVSVesuvio/experiments/original_inputs|EVSVesuvio/original_inputs.py|unpackaged'
+        exclude: 'mvesuvio/vesuvio_analysis/scribles|mvesuvio/experiments/original_inputs|mvesuvio/original_inputs.py|unpackaged'
         types: ['python']
       - id: check-added-large-files
         args: ['--maxkb=4096']
-        exclude: 'EVSVesuvio/experiments/original_inputs|unpackaged'
+        exclude: 'mvesuvio/experiments/original_inputs|unpackaged'
 
   - repo: https://github.com/PyCQA/flake8.git
     rev: 6.1.0
     hooks:
       - id: flake8
         args: ['--config', 'config.flake8']
-        exclude: 'EVSVesuvio/vesuvio_analysis/scribles|EVSVesuvio/experiments/original_inputs|EVSVesuvio/original_inputs.py|unpackaged'
+        exclude: 'mvesuvio/vesuvio_analysis/scribles|mvesuvio/experiments/original_inputs|mvesuvio/original_inputs.py|unpackaged'

conda/meta.yaml

@@ -15,7 +15,7 @@ build:
   noarch: python
   script: python -m pip install --ignore-installed .
   entry_points:
-    - mvesuvio = EVSVesuvio.scripts:main
+    - mvesuvio = mvesuvio.scripts:main
 
 requirements:
   build:
@@ -32,7 +32,7 @@ requirements:
 
 test:
   imports:
-    - EVSVesuvio
+    - mvesuvio
 
 about:
   home: https://github.com/mantidproject/vesuvio

EVSVesuvio/__init__.py → mvesuvio/__init__.py

@@ -10,7 +10,7 @@
 __version__ = ".".join(map(str, version_info))
 __project_url__ = "https://github.com/mantidproject/vesuvio"
 
-from EVSVesuvio.scripts import main
+from mvesuvio.scripts import main
 
 class ArgInputs:
     def __init__(self, command):

EVSVesuvio/analysis_runner.py → mvesuvio/analysis_runner.py

@@ -2,8 +2,8 @@
 from pathlib import Path
 import importlib
 import sys
-from EVSVesuvio.vesuvio_analysis.run_script import runScript
-from EVSVesuvio.scripts import handle_config
+from mvesuvio.vesuvio_analysis.run_script import runScript
+from mvesuvio.scripts import handle_config
 
 
 def run(yes_to_all=False):

EVSVesuvio/scripts/__init__.py → mvesuvio/scripts/__init__.py

@@ -2,7 +2,7 @@
 """
 import argparse
 from os import environ, path
-from EVSVesuvio.scripts import handle_config
+from mvesuvio.scripts import handle_config
 
 
 def main(manual_args=None):
@@ -98,7 +98,7 @@ def __run_analysis(yes_to_all):
     environ["MANTIDPROPERTIES"] = path.join(
         handle_config.VESUVIO_CONFIG_PATH, "Mantid.user.properties"
     )
-    from EVSVesuvio import analysis_runner
+    from mvesuvio import analysis_runner
 
     analysis_runner.run(yes_to_all)
 

EVSVesuvio/system_tests/test_analysis.py → mvesuvio/system_tests/test_analysis.py

@@ -1,9 +1,9 @@
-from EVSVesuvio.vesuvio_analysis.run_script import runScript
+from mvesuvio.vesuvio_analysis.run_script import runScript
 import unittest
 import numpy as np
 import numpy.testing as nptest
 from pathlib import Path
-from EVSVesuvio.system_tests.tests_IC import (
+from mvesuvio.system_tests.tests_IC import (
     scriptName,
     wsBackIC,
     wsFrontIC,

EVSVesuvio/system_tests/test_bootstrap.py → mvesuvio/system_tests/test_bootstrap.py

@@ -1,9 +1,9 @@
-from EVSVesuvio.vesuvio_analysis.run_script import runScript
+from mvesuvio.vesuvio_analysis.run_script import runScript
 import unittest
 import numpy as np
 import numpy.testing as nptest
 from pathlib import Path
-from EVSVesuvio.system_tests.tests_IC import (
+from mvesuvio.system_tests.tests_IC import (
     scriptName,
     wsBackIC,
     wsFrontIC,

mvesuvio/system_tests/test_config/vesuvio.user.properties

@@ -0,0 +1,4 @@
+# properties to be used in CI testing.
+caching.location=mvesuvio/system_tests/test_config
+caching.experiment=test_expr
+caching.ipfolder=mvesuvio/config/ip_files

EVSVesuvio/system_tests/test_jackknife.py → mvesuvio/system_tests/test_jackknife.py

@@ -1,9 +1,9 @@
-from EVSVesuvio.vesuvio_analysis.run_script import runScript
+from mvesuvio.vesuvio_analysis.run_script import runScript
 import unittest
 import numpy as np
 import numpy.testing as nptest
 from pathlib import Path
-from EVSVesuvio.system_tests.tests_IC import (
+from mvesuvio.system_tests.tests_IC import (
     scriptName,
     wsBackIC,
     wsFrontIC,

EVSVesuvio/system_tests/test_old_new_comparison.py → mvesuvio/system_tests/test_old_new_comparison.py

@@ -1,10 +1,10 @@
-from EVSVesuvio.vesuvio_analysis.run_script import runScript
+from mvesuvio.vesuvio_analysis.run_script import runScript
 import unittest
 import numpy as np
 import numpy.testing as nptest
 from pathlib import Path
-from EVSVesuvio.scripts import handle_config
-from EVSVesuvio.system_tests.old_new_comparison_inputs import (
+from mvesuvio.scripts import handle_config
+from mvesuvio.system_tests.old_new_comparison_inputs import (
     LoadVesuvioBackParameters,
     LoadVesuvioFrontParameters,
     BackwardInitialConditions,

EVSVesuvio/system_tests/test_yspace_fit.py → mvesuvio/system_tests/test_yspace_fit.py

@@ -1,11 +1,11 @@
-from EVSVesuvio.vesuvio_analysis.run_script import runScript
+from mvesuvio.vesuvio_analysis.run_script import runScript
 from mantid.simpleapi import Load
 from mantid.api import AnalysisDataService
 from pathlib import Path
 import numpy as np
 import unittest
 import numpy.testing as nptest
-from EVSVesuvio.system_tests.tests_IC import (
+from mvesuvio.system_tests.tests_IC import (
     scriptName,
     wsBackIC,
     wsFrontIC,

EVSVesuvio/system_tests/test_yspace_fit_GC.py → mvesuvio/system_tests/test_yspace_fit_GC.py

@@ -1,11 +1,11 @@
-from EVSVesuvio.vesuvio_analysis.run_script import runScript
+from mvesuvio.vesuvio_analysis.run_script import runScript
 from mantid.simpleapi import Load
 from mantid.api import AnalysisDataService
 from pathlib import Path
 import numpy as np
 import unittest
 import numpy.testing as nptest
-from EVSVesuvio.system_tests.tests_IC import (
+from mvesuvio.system_tests.tests_IC import (
     scriptName,
     wsBackIC,
     wsFrontIC,

EVSVesuvio/system_tests/tests_IC.py → mvesuvio/system_tests/tests_IC.py

@@ -1,6 +1,6 @@
 import numpy as np
 from pathlib import Path
-from EVSVesuvio.scripts import handle_config
+from mvesuvio.scripts import handle_config
 
 ipFilesPath = Path(handle_config.read_config_var("caching.ipfolder"))
 ipFilePath = ipFilesPath / "ip2018_3.par"

EVSVesuvio/vesuvio_analysis/ICHelpers.py → mvesuvio/vesuvio_analysis/ICHelpers.py

@@ -1,6 +1,6 @@
 from mantid.simpleapi import Load, LoadVesuvio, SaveNexus
 from pathlib import Path
-from EVSVesuvio.scripts import handle_config
+from mvesuvio.scripts import handle_config
 from mantid.kernel import logger
 import ntpath
 

EVSVesuvio/vesuvio_analysis/bootstrap.py → mvesuvio/vesuvio_analysis/bootstrap.py

@@ -1,9 +1,9 @@
-from EVSVesuvio.vesuvio_analysis.fit_in_yspace import fitInYSpaceProcedure
-from EVSVesuvio.vesuvio_analysis.procedures import (
+from mvesuvio.vesuvio_analysis.fit_in_yspace import fitInYSpaceProcedure
+from mvesuvio.vesuvio_analysis.procedures import (
     runJointBackAndForwardProcedure,
     runIndependentIterativeProcedure,
 )
-from EVSVesuvio.vesuvio_analysis.ICHelpers import (
+from mvesuvio.vesuvio_analysis.ICHelpers import (
     buildFinalWSName,
     noOfHistsFromTOFBinning,
 )

EVSVesuvio/vesuvio_analysis/bootstrap_analysis.py → mvesuvio/vesuvio_analysis/bootstrap_analysis.py

@@ -1,10 +1,10 @@
 from xml.dom import NotFoundErr
-from EVSVesuvio.vesuvio_analysis.analysis_functions import (
+from mvesuvio.vesuvio_analysis.analysis_functions import (
     calculateMeansAndStds,
     filterWidthsAndIntensities,
 )
-from EVSVesuvio.vesuvio_analysis.ICHelpers import setBootstrapDirs
-from EVSVesuvio.vesuvio_analysis.fit_in_yspace import selectModelAndPars
+from mvesuvio.vesuvio_analysis.ICHelpers import setBootstrapDirs
+from mvesuvio.vesuvio_analysis.fit_in_yspace import selectModelAndPars
 import numpy as np
 import matplotlib.pyplot as plt
 from scipy import stats

EVSVesuvio/vesuvio_analysis/run_script.py → mvesuvio/vesuvio_analysis/run_script.py

@@ -1,12 +1,12 @@
-from EVSVesuvio.vesuvio_analysis.ICHelpers import (
+from mvesuvio.vesuvio_analysis.ICHelpers import (
     buildFinalWSName,
     completeICFromInputs,
     completeBootIC,
     completeYFitIC,
 )
-from EVSVesuvio.vesuvio_analysis.bootstrap import runBootstrap
-from EVSVesuvio.vesuvio_analysis.fit_in_yspace import fitInYSpaceProcedure
-from EVSVesuvio.vesuvio_analysis.procedures import (
+from mvesuvio.vesuvio_analysis.bootstrap import runBootstrap
+from mvesuvio.vesuvio_analysis.fit_in_yspace import fitInYSpaceProcedure
+from mvesuvio.vesuvio_analysis.procedures import (
     runIndependentIterativeProcedure,
     runJointBackAndForwardProcedure,
     runPreProcToEstHRatio,

EVSVesuvio/vesuvio_analysis/tests/test_analysis_functions.py → mvesuvio/vesuvio_analysis/tests/test_analysis_functions.py

@@ -1,6 +1,6 @@
 import unittest
 from mock import MagicMock
-from EVSVesuvio.vesuvio_analysis.analysis_functions import extractWS
+from mvesuvio.vesuvio_analysis.analysis_functions import extractWS
 
 
 class TestAnalysisFunctions(unittest.TestCase):

pyproject.toml

@@ -40,24 +40,24 @@ tests_require = [
 "Bug Tracker" = "https://github.com/mantidproject/vesuvio/issues"
 
 [project.entry-points]
-console_scripts = { mvesuvio = "EVSVesuvio.scripts:main" }
+console_scripts = { mvesuvio = "mvesuvio.scripts:main" }
 
 [tool.setuptools.packages.find]
-include = ["EVSVesuvio*"]
+include = ["mvesuvio*"]
 namespaces = false
 
 [tool.setuptools.package-data]
-"EVSVesuvio.config.ip_files" = ["*.par"]
-"EVSVesuvio.config" = ["*.properties"]
+"mvesuvio.config.ip_files" = ["*.par"]
+"mvesuvio.config" = ["*.properties"]
 
 [tool.pytest.ini_options]
 pythonpath = ["."]
-testpaths = ["EVSVesuvio/system_tests"]
+testpaths = ["mvesuvio/system_tests"]
 filterwarnings = ["error"]
 
 [tool.coverage.report]
 include = [
-    "*/EVSVesuvio/vesuvio_analysis/*",
+    "*/mvesuvio/vesuvio_analysis/*",
 ]
 
 omit = [
@@ -82,4 +82,4 @@ dirty = "{version}+uncommitted"
 distance-dirty = "{version}.dev{distance}+uncommitted"
 
 [tool.versioningit.write]
-file = "EVSVesuvio/__init__.py"
+file = "mvesuvio/__init__.py"

unpackaged/examples/BaH2_500C.py

@@ -1,8 +1,8 @@
 import time
 import numpy as np
 from pathlib import Path
-from EVSVesuvio.vesuvio_analysis.bootstrap_analysis import runAnalysisOfStoredBootstrap
-from EVSVesuvio.vesuvio_analysis.run_script import runScript
+from mvesuvio.vesuvio_analysis.bootstrap_analysis import runAnalysisOfStoredBootstrap
+from mvesuvio.vesuvio_analysis.run_script import runScript
 
 scriptName = Path(__file__).name.split(".")[0]  # Take out .py
 experimentPath = Path(__file__).absolute().parent.parent / "experiments" / scriptName  # Path to the repository

unpackaged/examples/D_HMT.py

@@ -2,8 +2,8 @@
 import time
 import numpy as np
 from pathlib import Path
-from EVSVesuvio.vesuvio_analysis.bootstrap_analysis import runAnalysisOfStoredBootstrap
-from EVSVesuvio.vesuvio_analysis.run_script import runScript
+from mvesuvio.vesuvio_analysis.bootstrap_analysis import runAnalysisOfStoredBootstrap
+from mvesuvio.vesuvio_analysis.run_script import runScript
 
 scriptName =  Path(__file__).name.split(".")[0]  # Take out .py
 experimentPath = Path(__file__).absolute().parent.parent / "experiments" / scriptName  # Path to experiments/sample

unpackaged/examples/starch_80_RD.py

@@ -2,8 +2,8 @@
 import time
 import numpy as np
 from pathlib import Path
-from EVSVesuvio.vesuvio_analysis.bootstrap_analysis import runAnalysisOfStoredBootstrap
-from EVSVesuvio.vesuvio_analysis.run_script import runScript
+from mvesuvio.vesuvio_analysis.bootstrap_analysis import runAnalysisOfStoredBootstrap
+from mvesuvio.vesuvio_analysis.run_script import runScript
 
 scriptName =  Path(__file__).name.split(".")[0]  # Take out .py
 experimentPath = Path(__file__).absolute().parent.parent / "experiments" / scriptName  # Path to the repository

unpackaged/original_analysis/Original_adapted_bckwd_script.py

@@ -28,8 +28,8 @@
 from pathlib import Path
 
 # ------------ sort out paths
-from EVSVesuvio.scripts import handle_config
-from EVSVesuvio.analysis_runner import import_from_path
+from mvesuvio.scripts import handle_config
+from mvesuvio.analysis_runner import import_from_path
 from pathlib import Path
 from os import path
 

unpackaged/original_analysis/Original_adapted_fwrd_script.py

@@ -29,8 +29,8 @@
 start_time = time.time()
 
 # ------------ sort out paths
-from EVSVesuvio.scripts import handle_config
-from EVSVesuvio.analysis_runner import import_from_path
+from mvesuvio.scripts import handle_config
+from mvesuvio.analysis_runner import import_from_path
 from pathlib import Path
 from os import path
 

unpackaged/original_analysis/compare_current_with_original_results.py

@@ -13,8 +13,8 @@
 np.set_printoptions(suppress=True, precision=8, linewidth=150)
 # plt.style.use('dark_background')
 
-from EVSVesuvio.scripts import handle_config
-from EVSVesuvio.analysis_runner import import_from_path
+from mvesuvio.scripts import handle_config
+from mvesuvio.analysis_runner import import_from_path
 from pathlib import Path
 from os import path
 

unpackaged/vesuvio_calibration/README.md

@@ -1,6 +1,6 @@
 # Vesuvio Calibration Scripts
 
-In this subdirectory of the EVSVesuvio repository the following is provided:
+In this subdirectory of the mvesuvio repository the following is provided:
 - Vesuvio calibration scripts, composed of 3 python modules:
     1. `calibration_scripts.calibrate_vesuvio_fit`
     2. `calibration_scripts.calibrate_vesuvio_analysis`