Skip to content

Commit

Permalink
replace EVSVesuvio with mvesuvio
Browse files Browse the repository at this point in the history
  • Loading branch information
MialLewis committed Dec 21, 2023
1 parent 0012579 commit ece803c
Show file tree
Hide file tree
Showing 90 changed files with 129 additions and 70 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci_tests_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 7 additions & 7 deletions .github/workflows/pr_workflow.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: EVSVesuvio pull request workflow
name: mvesuvio pull request workflow

on: push

Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
4 changes: 0 additions & 4 deletions EVSVesuvio/system_tests/test_config/vesuvio.user.properties

This file was deleted.

4 changes: 2 additions & 2 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -32,7 +32,7 @@ requirements:

test:
imports:
- EVSVesuvio
- mvesuvio

about:
home: https://github.com/mantidproject/vesuvio
Expand Down
2 changes: 1 addition & 1 deletion EVSVesuvio/__init__.py → mvesuvio/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions EVSVesuvio/analysis_runner.py → mvesuvio/analysis_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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)

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

This file contains some information about each data file in the folder.
ncp data file: boot type | procedure | tof binning | masked tof range.
yspace fit data file: boot type | procedure | symmetrisation | rebin pars | fit model | mask type

spec_3-13_iter_0_nsampl_3.npz : BOOT_RESIDUALS | JOINT | 275.,1.,420 | None
spec_164-175_iter_1_MS_GC_nsampl_3.npz : BOOT_RESIDUALS | JOINT | 110,1.,430 | None
spec_164-175_iter_1_MS_GC_ySpaceFit_nsampl_3.npz : BOOT_RESIDUALS | FORWARD | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
spec_3-13_iter_0_nsampl_3.npz : BOOT_RESIDUALS | JOINT | 275.,1.,420 | None
spec_164-175_iter_1_MS_GC_nsampl_3.npz : BOOT_RESIDUALS | JOINT | 110,1.,430 | None
spec_164-175_iter_1_MS_GC_ySpaceFit_nsampl_3.npz : BOOT_RESIDUALS | FORWARD | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
spec_3-13_iter_0_nsampl_3.npz : BOOT_RESIDUALS | JOINT | 275.,1.,420 | None
spec_164-175_iter_1_MS_GC_nsampl_3.npz : BOOT_RESIDUALS | JOINT | 110,1.,430 | None
spec_164-175_iter_1_MS_GC_ySpaceFit_nsampl_3.npz : BOOT_RESIDUALS | FORWARD | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
spec_3-13_iter_0_nsampl_3.npz : BOOT_RESIDUALS | JOINT | 275.,1.,420 | None
spec_164-175_iter_1_MS_GC_nsampl_3.npz : BOOT_RESIDUALS | JOINT | 110,1.,430 | None
spec_164-175_iter_1_MS_GC_ySpaceFit_nsampl_3.npz : BOOT_RESIDUALS | FORWARD | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
spec_3-13_iter_0_nsampl_3.npz : BOOT_RESIDUALS | JOINT | 275.,1.,420 | None
spec_164-175_iter_1_MS_GC_nsampl_3.npz : BOOT_RESIDUALS | JOINT | 110,1.,430 | None
spec_164-175_iter_1_MS_GC_ySpaceFit_nsampl_3.npz : BOOT_RESIDUALS | FORWARD | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
spec_3-13_iter_0_nsampl_3.npz : BOOT_RESIDUALS | JOINT | 275.,1.,420 | None
spec_164-175_iter_1_MS_GC_nsampl_3.npz : BOOT_RESIDUALS | JOINT | 110,1.,430 | None
spec_164-175_iter_1_MS_GC_ySpaceFit_nsampl_3.npz : BOOT_RESIDUALS | FORWARD | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
spec_3-13_iter_0_nsampl_3.npz : BOOT_RESIDUALS | JOINT | 275.,1.,420 | None
spec_164-175_iter_1_MS_GC_nsampl_3.npz : BOOT_RESIDUALS | JOINT | 110,1.,430 | None
spec_164-175_iter_1_MS_GC_ySpaceFit_nsampl_3.npz : BOOT_RESIDUALS | FORWARD | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@

This file contains some information about each data file in the folder.
ncp data file: boot type | procedure | tof binning | masked tof range.
yspace fit data file: boot type | procedure | symmetrisation | rebin pars | fit model | mask type

spec_3-13_iter_0_nsampl_3.npz : JACKKNIFE | JOINT | 275.,1.,420 | None
spec_3-13_iter_0_ySpaceFit_nsampl_3.npz : JACKKNIFE | None | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
spec_164-175_iter_1_MS_GC_nsampl_3.npz : JACKKNIFE | JOINT | 110,1.,430 | None
spec_164-175_iter_1_MS_GC_ySpaceFit_nsampl_3.npz : JACKKNIFE | None | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
spec_3-13_iter_0_nsampl_3.npz : JACKKNIFE | JOINT | 275.,1.,420 | None
spec_3-13_iter_0_ySpaceFit_nsampl_3.npz : JACKKNIFE | None | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
spec_164-175_iter_1_MS_GC_nsampl_3.npz : JACKKNIFE | JOINT | 110,1.,430 | None
spec_164-175_iter_1_MS_GC_ySpaceFit_nsampl_3.npz : JACKKNIFE | None | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
spec_3-13_iter_0_nsampl_3.npz : JACKKNIFE | JOINT | 275.,1.,420 | None
spec_3-13_iter_0_ySpaceFit_nsampl_3.npz : JACKKNIFE | None | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
spec_164-175_iter_1_MS_GC_nsampl_3.npz : JACKKNIFE | JOINT | 110,1.,430 | None
spec_164-175_iter_1_MS_GC_ySpaceFit_nsampl_3.npz : JACKKNIFE | None | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
spec_3-13_iter_0_nsampl_3.npz : JACKKNIFE | JOINT | 275.,1.,420 | None
spec_3-13_iter_0_ySpaceFit_nsampl_3.npz : JACKKNIFE | None | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
spec_164-175_iter_1_MS_GC_nsampl_3.npz : JACKKNIFE | JOINT | 110,1.,430 | None
spec_164-175_iter_1_MS_GC_ySpaceFit_nsampl_3.npz : JACKKNIFE | None | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
spec_3-13_iter_0_nsampl_3.npz : JACKKNIFE | JOINT | 275.,1.,420 | None
spec_3-13_iter_0_ySpaceFit_nsampl_3.npz : JACKKNIFE | None | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
spec_164-175_iter_1_MS_GC_nsampl_3.npz : JACKKNIFE | JOINT | 110,1.,430 | None
spec_164-175_iter_1_MS_GC_ySpaceFit_nsampl_3.npz : JACKKNIFE | None | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
spec_3-13_iter_0_nsampl_3.npz : JACKKNIFE | JOINT | 275.,1.,420 | None
spec_3-13_iter_0_ySpaceFit_nsampl_3.npz : JACKKNIFE | None | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
spec_164-175_iter_1_MS_GC_nsampl_3.npz : JACKKNIFE | JOINT | 110,1.,430 | None
spec_164-175_iter_1_MS_GC_ySpaceFit_nsampl_3.npz : JACKKNIFE | None | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
spec_3-13_iter_0_nsampl_3.npz : JACKKNIFE | JOINT | 275.,1.,420 | None
spec_3-13_iter_0_ySpaceFit_nsampl_3.npz : JACKKNIFE | None | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
spec_164-175_iter_1_MS_GC_nsampl_3.npz : JACKKNIFE | JOINT | 110,1.,430 | None
spec_164-175_iter_1_MS_GC_ySpaceFit_nsampl_3.npz : JACKKNIFE | None | True | -20, 0.5, 20 | SINGLE_GAUSSIAN | None
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 4 additions & 0 deletions mvesuvio/system_tests/test_config/vesuvio.user.properties
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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,
)
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
14 changes: 7 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand All @@ -82,4 +82,4 @@ dirty = "{version}+uncommitted"
distance-dirty = "{version}.dev{distance}+uncommitted"

[tool.versioningit.write]
file = "EVSVesuvio/__init__.py"
file = "mvesuvio/__init__.py"
4 changes: 2 additions & 2 deletions unpackaged/examples/BaH2_500C.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions unpackaged/examples/D_HMT.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit ece803c

Please sign in to comment.