diff --git a/.github/workflows/runfitbot.yml b/.github/workflows/runfitbot.yml index d96e32db..2e1b370f 100644 --- a/.github/workflows/runfitbot.yml +++ b/.github/workflows/runfitbot.yml @@ -46,7 +46,7 @@ jobs: - name: Install project 🔨 # it is required to repeat extras, otherwise they will be removed from # the environment - run: poetry install --no-interaction ${{ inputs.poetry-extras }} + run: poetry install --no-interaction - name: Perform a fit 🚀 shell: bash --login {0} diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 336d7479..83818e85 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -35,6 +35,8 @@ jobs: # it is required to repeat extras, otherwise they will be removed from # the environment run: poetry install --no-interaction ${{ inputs.poetry-extras }} + - name: Download the theory + run: poetry run nns get theory - name: Install task runner 🔨 run: pip install poethepoet - name: Lint with pylint 🚀 diff --git a/README.md b/README.md index 31abe969..f26a4b1e 100644 --- a/README.md +++ b/README.md @@ -25,9 +25,6 @@ - [Tutorials](https://nnpdf.github.io/nnusf/tutorials/datasets.html) - [Delivery & Usage](https://nnpdf.github.io/nnusf/delivery/lhapdf.html) -> **Note** -> For the time being, we recommend the user to use the -> [development](https://nnpdf.github.io/nnusf/quickstart/installation.html#development-installation) installation. # Citation diff --git a/docs/source/index.rst b/docs/source/index.rst index b90e0931..c2ff41c2 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -55,24 +55,29 @@ To reference NNSFν in a scientific publication please use the following: .. code-block:: latex - @article {reference_id, - author = {A. Candido, A. Garcia, G. Magni, T. R. Rabemananjara, J. Rojo, R. Stegeman}, - title = {Neutrino Structure Functions from GeV to EeV Energies}, - year = {2023}, - doi = {10.1101/2020.07.15.204701}, - eprint = {https://arxiv.org/list/hep-ph/}, - journal = {aRxiv} + @article{Candido:2023utz, + author = "Candido, Alessandro and Garcia, Alfonso and Magni, Giacomo and Rabemananjara, Tanjona and Rojo, Juan and Stegeman, Roy", + title = "{Neutrino Structure Functions from GeV to EeV Energies}", + eprint = "2302.08527", + archivePrefix = "arXiv", + primaryClass = "hep-ph", + reportNumber = "Nikhef 2022-014, Edinburgh 2022/27, TIF-UNIMI-2023-5", + month = "2", + year = "2023" } If NNSFν proves to be useful in your work, please also reference the codes: .. code-block:: latex - @article {reference_id, - author = {A. Candido, A. Garcia, G. Magni, T. R. Rabemananjara, J. Rojo, R. Stegeman}, - title = {Neutrino Structure Functions from GeV to EeV Energies}, - year = {2023}, - doi = {10.1101/2020.07.15.204701}, + @misc{https://doi.org/10.5281/zenodo.7657132, + doi = {10.5281/ZENODO.7657132}, + url = {https://zenodo.org/record/7657132}, + author = "Candido, Alessandro and Garcia, Alfonso and Magni, Giacomo and Rabemananjara, Tanjona and Rojo, Juan and Stegeman, Roy", + title = "{Neutrino Structure Functions from GeV to EeV Energies}", + publisher = {Zenodo}, + year = {2023}, + copyright = {Open Access} } diff --git a/docs/source/mbadges.md b/docs/source/mbadges.md index 907037de..e140ad66 100644 --- a/docs/source/mbadges.md +++ b/docs/source/mbadges.md @@ -1,6 +1,8 @@

- Zenodo + Zenodo + arXiv + PyPI Docs Status - License + License

diff --git a/docs/source/quickstart/installation.rst b/docs/source/quickstart/installation.rst index 7a08febe..5a28a836 100644 --- a/docs/source/quickstart/installation.rst +++ b/docs/source/quickstart/installation.rst @@ -11,6 +11,25 @@ via the `Python Package Index `_ using the following command: pip install nnusf +.. note:: + + In order to use NNSFν one needs to download the the :mod:`commondata` + and :mod:`theory` files and store them into the user directory + (which is platform/system dependent). + + NNSFν provides an easy way to download and install these input data files + by simply running the following commands: + + .. code-block:: console + + nns get theory + + To see where the files have been installed, type the following commands: + + .. code-block:: console + + nns get print_userdir_path + To check that the package has been installed correctly, just run the following which will print out all the available subcommands: @@ -31,30 +50,45 @@ Once this is done, first clone the repository and enter into the directory: git clone https://github.com/NNPDF/nnusf.git --depth 1 cd nnusf -Then, to install the NNSF:math:`\nu` package just type: +Then, to install the NNSFν package just type: .. code-block:: bash poetry install -Note that when installing using :mod:`poetry` one has the choice of doing so in -a :mod:`poetry` virtual environment or not. To install the package in the current -active environment, before :mod:`poetry install` type the following command: +.. note:: -.. code-block:: bash + Note that when installing using :mod:`poetry` one has the choice of doing so in + a :mod:`poetry` virtual environment or not. To install the package in the current + active environment, before :mod:`poetry install` type the following command: - poetry config virtualenvs.create false --local + .. code-block:: console -If instead you choose to install the package in a clean environment, first you -need to save the path to the environment into an environment variable: + poetry config virtualenvs.create false --local -.. code-block:: bash + If instead you choose to install the package in a clean environment, first you + need to save the path to the environment into an environment variable: - export PREFIX=$(realpath $(poetry env --path)) + .. code-block:: console -Then download the scripts from `N3PDF/workflows/packages/lhapdf `_ -and install :mod:`LHAPDF`: + export PREFIX=$(realpath $(poetry env --path)) -.. code-block:: bash + Then download the scripts from + `N3PDF/workflows/packages/lhapdf `_ + and install :mod:`LHAPDF`: + + .. code-block:: console + + sh install.sh + +.. tip:: + + If NNSFv was instead installed in a :mod:`poetry` virtual environment then + it may be useful to enter in a :mod:`poetry` shell by invoking the following + command: + + .. code-block:: console + + poetry shell - sh install.sh + otherwise prepending all the commands by :mod:`poetry` will be required. diff --git a/docs/source/tutorials/datasets.rst b/docs/source/tutorials/datasets.rst index 9b567fe9..e68e4771 100644 --- a/docs/source/tutorials/datasets.rst +++ b/docs/source/tutorials/datasets.rst @@ -24,7 +24,7 @@ Once this is done run the following command: .. code-block:: bash - nnu data filter ./commondata/rawdata/* + nnu data filter ${NNUSF_USERDIR}/commondata/rawdata/* This will dump the pandas tables containing the input kinematics, central values, and uncertainties in :mod:`commondata/kinematics`, @@ -43,7 +43,7 @@ To do so, just run the following: .. code-block:: bash - nnu data coefficients ./commondata/data/* + nnu data coefficients ${NNUSF_USERDIR}/commondata/data/* Yadism pseudo-data @@ -58,7 +58,7 @@ to generate the input kinematics, just run the following command: .. code-block:: bash - nnu data matching_grids_empty ./commondata/data/DATA_${EXPERIMENT}_${OBSERVABLE}.csv + nnu data matching_grids_empty ${NNUSF_USERDIR}/commondata/data/DATA_${EXPERIMENT}_${OBSERVABLE}.csv This will generate inside :mod:`commondata/kinematics` a table named :mod:`KIN_${EXPERIMENT}_${OBSERVABLE}_MATCHING.csv` containing the input @@ -103,4 +103,4 @@ just need to run the same command as before: .. code-block:: bash - nnu data coefficients ./commondata/data/* + nnu data coefficients ${NNUSF_USERDIR}/commondata/data/* diff --git a/coefficients/BEBCWA59_F2.npy b/nnusf_data/coefficients/BEBCWA59_F2.npy similarity index 100% rename from coefficients/BEBCWA59_F2.npy rename to nnusf_data/coefficients/BEBCWA59_F2.npy diff --git a/coefficients/BEBCWA59_F2_MATCHING.npy b/nnusf_data/coefficients/BEBCWA59_F2_MATCHING.npy similarity index 100% rename from coefficients/BEBCWA59_F2_MATCHING.npy rename to nnusf_data/coefficients/BEBCWA59_F2_MATCHING.npy diff --git a/coefficients/BEBCWA59_F3.npy b/nnusf_data/coefficients/BEBCWA59_F3.npy similarity index 100% rename from coefficients/BEBCWA59_F3.npy rename to nnusf_data/coefficients/BEBCWA59_F3.npy diff --git a/coefficients/BEBCWA59_F3_MATCHING.npy b/nnusf_data/coefficients/BEBCWA59_F3_MATCHING.npy similarity index 100% rename from coefficients/BEBCWA59_F3_MATCHING.npy rename to nnusf_data/coefficients/BEBCWA59_F3_MATCHING.npy diff --git a/coefficients/CCFR_F2.npy b/nnusf_data/coefficients/CCFR_F2.npy similarity index 100% rename from coefficients/CCFR_F2.npy rename to nnusf_data/coefficients/CCFR_F2.npy diff --git a/coefficients/CCFR_F2_MATCHING.npy b/nnusf_data/coefficients/CCFR_F2_MATCHING.npy similarity index 100% rename from coefficients/CCFR_F2_MATCHING.npy rename to nnusf_data/coefficients/CCFR_F2_MATCHING.npy diff --git a/coefficients/CCFR_F3.npy b/nnusf_data/coefficients/CCFR_F3.npy similarity index 100% rename from coefficients/CCFR_F3.npy rename to nnusf_data/coefficients/CCFR_F3.npy diff --git a/coefficients/CCFR_F3_MATCHING.npy b/nnusf_data/coefficients/CCFR_F3_MATCHING.npy similarity index 100% rename from coefficients/CCFR_F3_MATCHING.npy rename to nnusf_data/coefficients/CCFR_F3_MATCHING.npy diff --git a/coefficients/CDHSW_DXDYNUB.npy b/nnusf_data/coefficients/CDHSW_DXDYNUB.npy similarity index 100% rename from coefficients/CDHSW_DXDYNUB.npy rename to nnusf_data/coefficients/CDHSW_DXDYNUB.npy diff --git a/coefficients/CDHSW_DXDYNUB_MATCHING.npy b/nnusf_data/coefficients/CDHSW_DXDYNUB_MATCHING.npy similarity index 100% rename from coefficients/CDHSW_DXDYNUB_MATCHING.npy rename to nnusf_data/coefficients/CDHSW_DXDYNUB_MATCHING.npy diff --git a/coefficients/CDHSW_DXDYNUU.npy b/nnusf_data/coefficients/CDHSW_DXDYNUU.npy similarity index 100% rename from coefficients/CDHSW_DXDYNUU.npy rename to nnusf_data/coefficients/CDHSW_DXDYNUU.npy diff --git a/coefficients/CDHSW_DXDYNUU_MATCHING.npy b/nnusf_data/coefficients/CDHSW_DXDYNUU_MATCHING.npy similarity index 100% rename from coefficients/CDHSW_DXDYNUU_MATCHING.npy rename to nnusf_data/coefficients/CDHSW_DXDYNUU_MATCHING.npy diff --git a/coefficients/CDHSW_F2.npy b/nnusf_data/coefficients/CDHSW_F2.npy similarity index 100% rename from coefficients/CDHSW_F2.npy rename to nnusf_data/coefficients/CDHSW_F2.npy diff --git a/coefficients/CDHSW_F2_MATCHING.npy b/nnusf_data/coefficients/CDHSW_F2_MATCHING.npy similarity index 100% rename from coefficients/CDHSW_F2_MATCHING.npy rename to nnusf_data/coefficients/CDHSW_F2_MATCHING.npy diff --git a/coefficients/CDHSW_F3.npy b/nnusf_data/coefficients/CDHSW_F3.npy similarity index 100% rename from coefficients/CDHSW_F3.npy rename to nnusf_data/coefficients/CDHSW_F3.npy diff --git a/coefficients/CDHSW_F3_MATCHING.npy b/nnusf_data/coefficients/CDHSW_F3_MATCHING.npy similarity index 100% rename from coefficients/CDHSW_F3_MATCHING.npy rename to nnusf_data/coefficients/CDHSW_F3_MATCHING.npy diff --git a/coefficients/CDHSW_FW.npy b/nnusf_data/coefficients/CDHSW_FW.npy similarity index 100% rename from coefficients/CDHSW_FW.npy rename to nnusf_data/coefficients/CDHSW_FW.npy diff --git a/coefficients/CDHSW_FW_MATCHING.npy b/nnusf_data/coefficients/CDHSW_FW_MATCHING.npy similarity index 100% rename from coefficients/CDHSW_FW_MATCHING.npy rename to nnusf_data/coefficients/CDHSW_FW_MATCHING.npy diff --git a/coefficients/CHARM_F2.npy b/nnusf_data/coefficients/CHARM_F2.npy similarity index 100% rename from coefficients/CHARM_F2.npy rename to nnusf_data/coefficients/CHARM_F2.npy diff --git a/coefficients/CHARM_F3.npy b/nnusf_data/coefficients/CHARM_F3.npy similarity index 100% rename from coefficients/CHARM_F3.npy rename to nnusf_data/coefficients/CHARM_F3.npy diff --git a/coefficients/CHORUS_DXDYNUB.npy b/nnusf_data/coefficients/CHORUS_DXDYNUB.npy similarity index 100% rename from coefficients/CHORUS_DXDYNUB.npy rename to nnusf_data/coefficients/CHORUS_DXDYNUB.npy diff --git a/coefficients/CHORUS_DXDYNUB_MATCHING.npy b/nnusf_data/coefficients/CHORUS_DXDYNUB_MATCHING.npy similarity index 100% rename from coefficients/CHORUS_DXDYNUB_MATCHING.npy rename to nnusf_data/coefficients/CHORUS_DXDYNUB_MATCHING.npy diff --git a/coefficients/CHORUS_DXDYNUU.npy b/nnusf_data/coefficients/CHORUS_DXDYNUU.npy similarity index 100% rename from coefficients/CHORUS_DXDYNUU.npy rename to nnusf_data/coefficients/CHORUS_DXDYNUU.npy diff --git a/coefficients/CHORUS_DXDYNUU_MATCHING.npy b/nnusf_data/coefficients/CHORUS_DXDYNUU_MATCHING.npy similarity index 100% rename from coefficients/CHORUS_DXDYNUU_MATCHING.npy rename to nnusf_data/coefficients/CHORUS_DXDYNUU_MATCHING.npy diff --git a/coefficients/CHORUS_F2.npy b/nnusf_data/coefficients/CHORUS_F2.npy similarity index 100% rename from coefficients/CHORUS_F2.npy rename to nnusf_data/coefficients/CHORUS_F2.npy diff --git a/coefficients/CHORUS_F2_MATCHING.npy b/nnusf_data/coefficients/CHORUS_F2_MATCHING.npy similarity index 100% rename from coefficients/CHORUS_F2_MATCHING.npy rename to nnusf_data/coefficients/CHORUS_F2_MATCHING.npy diff --git a/coefficients/CHORUS_F3.npy b/nnusf_data/coefficients/CHORUS_F3.npy similarity index 100% rename from coefficients/CHORUS_F3.npy rename to nnusf_data/coefficients/CHORUS_F3.npy diff --git a/coefficients/CHORUS_F3_MATCHING.npy b/nnusf_data/coefficients/CHORUS_F3_MATCHING.npy similarity index 100% rename from coefficients/CHORUS_F3_MATCHING.npy rename to nnusf_data/coefficients/CHORUS_F3_MATCHING.npy diff --git a/coefficients/NUTEV_DXDYNUB.npy b/nnusf_data/coefficients/NUTEV_DXDYNUB.npy similarity index 100% rename from coefficients/NUTEV_DXDYNUB.npy rename to nnusf_data/coefficients/NUTEV_DXDYNUB.npy diff --git a/coefficients/NUTEV_DXDYNUB_MATCHING.npy b/nnusf_data/coefficients/NUTEV_DXDYNUB_MATCHING.npy similarity index 100% rename from coefficients/NUTEV_DXDYNUB_MATCHING.npy rename to nnusf_data/coefficients/NUTEV_DXDYNUB_MATCHING.npy diff --git a/coefficients/NUTEV_DXDYNUU.npy b/nnusf_data/coefficients/NUTEV_DXDYNUU.npy similarity index 100% rename from coefficients/NUTEV_DXDYNUU.npy rename to nnusf_data/coefficients/NUTEV_DXDYNUU.npy diff --git a/coefficients/NUTEV_DXDYNUU_MATCHING.npy b/nnusf_data/coefficients/NUTEV_DXDYNUU_MATCHING.npy similarity index 100% rename from coefficients/NUTEV_DXDYNUU_MATCHING.npy rename to nnusf_data/coefficients/NUTEV_DXDYNUU_MATCHING.npy diff --git a/coefficients/NUTEV_F2.npy b/nnusf_data/coefficients/NUTEV_F2.npy similarity index 100% rename from coefficients/NUTEV_F2.npy rename to nnusf_data/coefficients/NUTEV_F2.npy diff --git a/coefficients/NUTEV_F2_MATCHING.npy b/nnusf_data/coefficients/NUTEV_F2_MATCHING.npy similarity index 100% rename from coefficients/NUTEV_F2_MATCHING.npy rename to nnusf_data/coefficients/NUTEV_F2_MATCHING.npy diff --git a/coefficients/NUTEV_F3.npy b/nnusf_data/coefficients/NUTEV_F3.npy similarity index 100% rename from coefficients/NUTEV_F3.npy rename to nnusf_data/coefficients/NUTEV_F3.npy diff --git a/coefficients/NUTEV_F3_MATCHING.npy b/nnusf_data/coefficients/NUTEV_F3_MATCHING.npy similarity index 100% rename from coefficients/NUTEV_F3_MATCHING.npy rename to nnusf_data/coefficients/NUTEV_F3_MATCHING.npy diff --git a/coefficients/PROTONBC_DXDYNUB_MATCHING.npy b/nnusf_data/coefficients/PROTONBC_DXDYNUB_MATCHING.npy similarity index 100% rename from coefficients/PROTONBC_DXDYNUB_MATCHING.npy rename to nnusf_data/coefficients/PROTONBC_DXDYNUB_MATCHING.npy diff --git a/coefficients/PROTONBC_DXDYNUU_MATCHING.npy b/nnusf_data/coefficients/PROTONBC_DXDYNUU_MATCHING.npy similarity index 100% rename from coefficients/PROTONBC_DXDYNUU_MATCHING.npy rename to nnusf_data/coefficients/PROTONBC_DXDYNUU_MATCHING.npy diff --git a/coefficients/PROTONBC_F2_MATCHING.npy b/nnusf_data/coefficients/PROTONBC_F2_MATCHING.npy similarity index 100% rename from coefficients/PROTONBC_F2_MATCHING.npy rename to nnusf_data/coefficients/PROTONBC_F2_MATCHING.npy diff --git a/coefficients/PROTONBC_F3_MATCHING.npy b/nnusf_data/coefficients/PROTONBC_F3_MATCHING.npy similarity index 100% rename from coefficients/PROTONBC_F3_MATCHING.npy rename to nnusf_data/coefficients/PROTONBC_F3_MATCHING.npy diff --git a/commondata/combined_tables.csv b/nnusf_data/commondata/combined_tables.csv similarity index 100% rename from commondata/combined_tables.csv rename to nnusf_data/commondata/combined_tables.csv diff --git a/commondata/data/DATA_BEBCWA59_F2.csv b/nnusf_data/commondata/data/DATA_BEBCWA59_F2.csv similarity index 100% rename from commondata/data/DATA_BEBCWA59_F2.csv rename to nnusf_data/commondata/data/DATA_BEBCWA59_F2.csv diff --git a/commondata/data/DATA_BEBCWA59_F2_MATCHING.csv b/nnusf_data/commondata/data/DATA_BEBCWA59_F2_MATCHING.csv similarity index 100% rename from commondata/data/DATA_BEBCWA59_F2_MATCHING.csv rename to nnusf_data/commondata/data/DATA_BEBCWA59_F2_MATCHING.csv diff --git a/commondata/data/DATA_BEBCWA59_F3.csv b/nnusf_data/commondata/data/DATA_BEBCWA59_F3.csv similarity index 100% rename from commondata/data/DATA_BEBCWA59_F3.csv rename to nnusf_data/commondata/data/DATA_BEBCWA59_F3.csv diff --git a/commondata/data/DATA_BEBCWA59_F3_MATCHING.csv b/nnusf_data/commondata/data/DATA_BEBCWA59_F3_MATCHING.csv similarity index 100% rename from commondata/data/DATA_BEBCWA59_F3_MATCHING.csv rename to nnusf_data/commondata/data/DATA_BEBCWA59_F3_MATCHING.csv diff --git a/commondata/data/DATA_CCFR_F2.csv b/nnusf_data/commondata/data/DATA_CCFR_F2.csv similarity index 100% rename from commondata/data/DATA_CCFR_F2.csv rename to nnusf_data/commondata/data/DATA_CCFR_F2.csv diff --git a/commondata/data/DATA_CCFR_F2_MATCHING.csv b/nnusf_data/commondata/data/DATA_CCFR_F2_MATCHING.csv similarity index 100% rename from commondata/data/DATA_CCFR_F2_MATCHING.csv rename to nnusf_data/commondata/data/DATA_CCFR_F2_MATCHING.csv diff --git a/commondata/data/DATA_CCFR_F3.csv b/nnusf_data/commondata/data/DATA_CCFR_F3.csv similarity index 100% rename from commondata/data/DATA_CCFR_F3.csv rename to nnusf_data/commondata/data/DATA_CCFR_F3.csv diff --git a/commondata/data/DATA_CCFR_F3_MATCHING.csv b/nnusf_data/commondata/data/DATA_CCFR_F3_MATCHING.csv similarity index 100% rename from commondata/data/DATA_CCFR_F3_MATCHING.csv rename to nnusf_data/commondata/data/DATA_CCFR_F3_MATCHING.csv diff --git a/commondata/data/DATA_CDHSW_DXDYNUB.csv b/nnusf_data/commondata/data/DATA_CDHSW_DXDYNUB.csv similarity index 100% rename from commondata/data/DATA_CDHSW_DXDYNUB.csv rename to nnusf_data/commondata/data/DATA_CDHSW_DXDYNUB.csv diff --git a/commondata/data/DATA_CDHSW_DXDYNUB_MATCHING.csv b/nnusf_data/commondata/data/DATA_CDHSW_DXDYNUB_MATCHING.csv similarity index 100% rename from commondata/data/DATA_CDHSW_DXDYNUB_MATCHING.csv rename to nnusf_data/commondata/data/DATA_CDHSW_DXDYNUB_MATCHING.csv diff --git a/commondata/data/DATA_CDHSW_DXDYNUU.csv b/nnusf_data/commondata/data/DATA_CDHSW_DXDYNUU.csv similarity index 100% rename from commondata/data/DATA_CDHSW_DXDYNUU.csv rename to nnusf_data/commondata/data/DATA_CDHSW_DXDYNUU.csv diff --git a/commondata/data/DATA_CDHSW_DXDYNUU_MATCHING.csv b/nnusf_data/commondata/data/DATA_CDHSW_DXDYNUU_MATCHING.csv similarity index 100% rename from commondata/data/DATA_CDHSW_DXDYNUU_MATCHING.csv rename to nnusf_data/commondata/data/DATA_CDHSW_DXDYNUU_MATCHING.csv diff --git a/commondata/data/DATA_CDHSW_F2.csv b/nnusf_data/commondata/data/DATA_CDHSW_F2.csv similarity index 100% rename from commondata/data/DATA_CDHSW_F2.csv rename to nnusf_data/commondata/data/DATA_CDHSW_F2.csv diff --git a/commondata/data/DATA_CDHSW_F2_MATCHING.csv b/nnusf_data/commondata/data/DATA_CDHSW_F2_MATCHING.csv similarity index 100% rename from commondata/data/DATA_CDHSW_F2_MATCHING.csv rename to nnusf_data/commondata/data/DATA_CDHSW_F2_MATCHING.csv diff --git a/commondata/data/DATA_CDHSW_F3.csv b/nnusf_data/commondata/data/DATA_CDHSW_F3.csv similarity index 100% rename from commondata/data/DATA_CDHSW_F3.csv rename to nnusf_data/commondata/data/DATA_CDHSW_F3.csv diff --git a/commondata/data/DATA_CDHSW_F3_MATCHING.csv b/nnusf_data/commondata/data/DATA_CDHSW_F3_MATCHING.csv similarity index 100% rename from commondata/data/DATA_CDHSW_F3_MATCHING.csv rename to nnusf_data/commondata/data/DATA_CDHSW_F3_MATCHING.csv diff --git a/commondata/data/DATA_CDHSW_FW.csv b/nnusf_data/commondata/data/DATA_CDHSW_FW.csv similarity index 100% rename from commondata/data/DATA_CDHSW_FW.csv rename to nnusf_data/commondata/data/DATA_CDHSW_FW.csv diff --git a/commondata/data/DATA_CDHSW_FW_MATCHING.csv b/nnusf_data/commondata/data/DATA_CDHSW_FW_MATCHING.csv similarity index 100% rename from commondata/data/DATA_CDHSW_FW_MATCHING.csv rename to nnusf_data/commondata/data/DATA_CDHSW_FW_MATCHING.csv diff --git a/commondata/data/DATA_CHARM_F2.csv b/nnusf_data/commondata/data/DATA_CHARM_F2.csv similarity index 100% rename from commondata/data/DATA_CHARM_F2.csv rename to nnusf_data/commondata/data/DATA_CHARM_F2.csv diff --git a/commondata/data/DATA_CHARM_F3.csv b/nnusf_data/commondata/data/DATA_CHARM_F3.csv similarity index 100% rename from commondata/data/DATA_CHARM_F3.csv rename to nnusf_data/commondata/data/DATA_CHARM_F3.csv diff --git a/commondata/data/DATA_CHARM_QBAR.csv b/nnusf_data/commondata/data/DATA_CHARM_QBAR.csv similarity index 100% rename from commondata/data/DATA_CHARM_QBAR.csv rename to nnusf_data/commondata/data/DATA_CHARM_QBAR.csv diff --git a/commondata/data/DATA_CHORUS_DXDYNUB.csv b/nnusf_data/commondata/data/DATA_CHORUS_DXDYNUB.csv similarity index 100% rename from commondata/data/DATA_CHORUS_DXDYNUB.csv rename to nnusf_data/commondata/data/DATA_CHORUS_DXDYNUB.csv diff --git a/commondata/data/DATA_CHORUS_DXDYNUB_MATCHING.csv b/nnusf_data/commondata/data/DATA_CHORUS_DXDYNUB_MATCHING.csv similarity index 100% rename from commondata/data/DATA_CHORUS_DXDYNUB_MATCHING.csv rename to nnusf_data/commondata/data/DATA_CHORUS_DXDYNUB_MATCHING.csv diff --git a/commondata/data/DATA_CHORUS_DXDYNUU.csv b/nnusf_data/commondata/data/DATA_CHORUS_DXDYNUU.csv similarity index 100% rename from commondata/data/DATA_CHORUS_DXDYNUU.csv rename to nnusf_data/commondata/data/DATA_CHORUS_DXDYNUU.csv diff --git a/commondata/data/DATA_CHORUS_DXDYNUU_MATCHING.csv b/nnusf_data/commondata/data/DATA_CHORUS_DXDYNUU_MATCHING.csv similarity index 100% rename from commondata/data/DATA_CHORUS_DXDYNUU_MATCHING.csv rename to nnusf_data/commondata/data/DATA_CHORUS_DXDYNUU_MATCHING.csv diff --git a/commondata/data/DATA_CHORUS_F2.csv b/nnusf_data/commondata/data/DATA_CHORUS_F2.csv similarity index 100% rename from commondata/data/DATA_CHORUS_F2.csv rename to nnusf_data/commondata/data/DATA_CHORUS_F2.csv diff --git a/commondata/data/DATA_CHORUS_F2_MATCHING.csv b/nnusf_data/commondata/data/DATA_CHORUS_F2_MATCHING.csv similarity index 100% rename from commondata/data/DATA_CHORUS_F2_MATCHING.csv rename to nnusf_data/commondata/data/DATA_CHORUS_F2_MATCHING.csv diff --git a/commondata/data/DATA_CHORUS_F3.csv b/nnusf_data/commondata/data/DATA_CHORUS_F3.csv similarity index 100% rename from commondata/data/DATA_CHORUS_F3.csv rename to nnusf_data/commondata/data/DATA_CHORUS_F3.csv diff --git a/commondata/data/DATA_CHORUS_F3_MATCHING.csv b/nnusf_data/commondata/data/DATA_CHORUS_F3_MATCHING.csv similarity index 100% rename from commondata/data/DATA_CHORUS_F3_MATCHING.csv rename to nnusf_data/commondata/data/DATA_CHORUS_F3_MATCHING.csv diff --git a/commondata/data/DATA_NUTEV_DXDYNUB.csv b/nnusf_data/commondata/data/DATA_NUTEV_DXDYNUB.csv similarity index 100% rename from commondata/data/DATA_NUTEV_DXDYNUB.csv rename to nnusf_data/commondata/data/DATA_NUTEV_DXDYNUB.csv diff --git a/commondata/data/DATA_NUTEV_DXDYNUB_MATCHING.csv b/nnusf_data/commondata/data/DATA_NUTEV_DXDYNUB_MATCHING.csv similarity index 100% rename from commondata/data/DATA_NUTEV_DXDYNUB_MATCHING.csv rename to nnusf_data/commondata/data/DATA_NUTEV_DXDYNUB_MATCHING.csv diff --git a/commondata/data/DATA_NUTEV_DXDYNUU.csv b/nnusf_data/commondata/data/DATA_NUTEV_DXDYNUU.csv similarity index 100% rename from commondata/data/DATA_NUTEV_DXDYNUU.csv rename to nnusf_data/commondata/data/DATA_NUTEV_DXDYNUU.csv diff --git a/commondata/data/DATA_NUTEV_DXDYNUU_MATCHING.csv b/nnusf_data/commondata/data/DATA_NUTEV_DXDYNUU_MATCHING.csv similarity index 100% rename from commondata/data/DATA_NUTEV_DXDYNUU_MATCHING.csv rename to nnusf_data/commondata/data/DATA_NUTEV_DXDYNUU_MATCHING.csv diff --git a/commondata/data/DATA_NUTEV_F2.csv b/nnusf_data/commondata/data/DATA_NUTEV_F2.csv similarity index 100% rename from commondata/data/DATA_NUTEV_F2.csv rename to nnusf_data/commondata/data/DATA_NUTEV_F2.csv diff --git a/commondata/data/DATA_NUTEV_F2_MATCHING.csv b/nnusf_data/commondata/data/DATA_NUTEV_F2_MATCHING.csv similarity index 100% rename from commondata/data/DATA_NUTEV_F2_MATCHING.csv rename to nnusf_data/commondata/data/DATA_NUTEV_F2_MATCHING.csv diff --git a/commondata/data/DATA_NUTEV_F3.csv b/nnusf_data/commondata/data/DATA_NUTEV_F3.csv similarity index 100% rename from commondata/data/DATA_NUTEV_F3.csv rename to nnusf_data/commondata/data/DATA_NUTEV_F3.csv diff --git a/commondata/data/DATA_NUTEV_F3_MATCHING.csv b/nnusf_data/commondata/data/DATA_NUTEV_F3_MATCHING.csv similarity index 100% rename from commondata/data/DATA_NUTEV_F3_MATCHING.csv rename to nnusf_data/commondata/data/DATA_NUTEV_F3_MATCHING.csv diff --git a/commondata/data/DATA_PROTONBC_DXDYNUB_MATCHING.csv b/nnusf_data/commondata/data/DATA_PROTONBC_DXDYNUB_MATCHING.csv similarity index 100% rename from commondata/data/DATA_PROTONBC_DXDYNUB_MATCHING.csv rename to nnusf_data/commondata/data/DATA_PROTONBC_DXDYNUB_MATCHING.csv diff --git a/commondata/data/DATA_PROTONBC_DXDYNUU_MATCHING.csv b/nnusf_data/commondata/data/DATA_PROTONBC_DXDYNUU_MATCHING.csv similarity index 100% rename from commondata/data/DATA_PROTONBC_DXDYNUU_MATCHING.csv rename to nnusf_data/commondata/data/DATA_PROTONBC_DXDYNUU_MATCHING.csv diff --git a/commondata/data/DATA_PROTONBC_F2_MATCHING.csv b/nnusf_data/commondata/data/DATA_PROTONBC_F2_MATCHING.csv similarity index 100% rename from commondata/data/DATA_PROTONBC_F2_MATCHING.csv rename to nnusf_data/commondata/data/DATA_PROTONBC_F2_MATCHING.csv diff --git a/commondata/data/DATA_PROTONBC_F3_MATCHING.csv b/nnusf_data/commondata/data/DATA_PROTONBC_F3_MATCHING.csv similarity index 100% rename from commondata/data/DATA_PROTONBC_F3_MATCHING.csv rename to nnusf_data/commondata/data/DATA_PROTONBC_F3_MATCHING.csv diff --git a/commondata/info/BEBCWA59.csv b/nnusf_data/commondata/info/BEBCWA59.csv similarity index 100% rename from commondata/info/BEBCWA59.csv rename to nnusf_data/commondata/info/BEBCWA59.csv diff --git a/commondata/info/CCFR.csv b/nnusf_data/commondata/info/CCFR.csv similarity index 100% rename from commondata/info/CCFR.csv rename to nnusf_data/commondata/info/CCFR.csv diff --git a/commondata/info/CDHSW.csv b/nnusf_data/commondata/info/CDHSW.csv similarity index 100% rename from commondata/info/CDHSW.csv rename to nnusf_data/commondata/info/CDHSW.csv diff --git a/commondata/info/CHARM.csv b/nnusf_data/commondata/info/CHARM.csv similarity index 100% rename from commondata/info/CHARM.csv rename to nnusf_data/commondata/info/CHARM.csv diff --git a/commondata/info/CHORUS.csv b/nnusf_data/commondata/info/CHORUS.csv similarity index 100% rename from commondata/info/CHORUS.csv rename to nnusf_data/commondata/info/CHORUS.csv diff --git a/commondata/info/NUTEV.csv b/nnusf_data/commondata/info/NUTEV.csv similarity index 100% rename from commondata/info/NUTEV.csv rename to nnusf_data/commondata/info/NUTEV.csv diff --git a/commondata/info/PROTONBC.csv b/nnusf_data/commondata/info/PROTONBC.csv similarity index 100% rename from commondata/info/PROTONBC.csv rename to nnusf_data/commondata/info/PROTONBC.csv diff --git a/commondata/kinematics/KIN_BEBCWA59_F2F3.csv b/nnusf_data/commondata/kinematics/KIN_BEBCWA59_F2F3.csv similarity index 100% rename from commondata/kinematics/KIN_BEBCWA59_F2F3.csv rename to nnusf_data/commondata/kinematics/KIN_BEBCWA59_F2F3.csv diff --git a/commondata/kinematics/KIN_BEBCWA59_MATCHING_F2F3.csv b/nnusf_data/commondata/kinematics/KIN_BEBCWA59_MATCHING_F2F3.csv similarity index 100% rename from commondata/kinematics/KIN_BEBCWA59_MATCHING_F2F3.csv rename to nnusf_data/commondata/kinematics/KIN_BEBCWA59_MATCHING_F2F3.csv diff --git a/commondata/kinematics/KIN_CCFR_F2F3.csv b/nnusf_data/commondata/kinematics/KIN_CCFR_F2F3.csv similarity index 100% rename from commondata/kinematics/KIN_CCFR_F2F3.csv rename to nnusf_data/commondata/kinematics/KIN_CCFR_F2F3.csv diff --git a/commondata/kinematics/KIN_CCFR_MATCHING_F2F3.csv b/nnusf_data/commondata/kinematics/KIN_CCFR_MATCHING_F2F3.csv similarity index 100% rename from commondata/kinematics/KIN_CCFR_MATCHING_F2F3.csv rename to nnusf_data/commondata/kinematics/KIN_CCFR_MATCHING_F2F3.csv diff --git a/commondata/kinematics/KIN_CDHSW_DXDYNUB.csv b/nnusf_data/commondata/kinematics/KIN_CDHSW_DXDYNUB.csv similarity index 100% rename from commondata/kinematics/KIN_CDHSW_DXDYNUB.csv rename to nnusf_data/commondata/kinematics/KIN_CDHSW_DXDYNUB.csv diff --git a/commondata/kinematics/KIN_CDHSW_DXDYNUU.csv b/nnusf_data/commondata/kinematics/KIN_CDHSW_DXDYNUU.csv similarity index 100% rename from commondata/kinematics/KIN_CDHSW_DXDYNUU.csv rename to nnusf_data/commondata/kinematics/KIN_CDHSW_DXDYNUU.csv diff --git a/commondata/kinematics/KIN_CDHSW_F2F3.csv b/nnusf_data/commondata/kinematics/KIN_CDHSW_F2F3.csv similarity index 100% rename from commondata/kinematics/KIN_CDHSW_F2F3.csv rename to nnusf_data/commondata/kinematics/KIN_CDHSW_F2F3.csv diff --git a/commondata/kinematics/KIN_CDHSW_FW.csv b/nnusf_data/commondata/kinematics/KIN_CDHSW_FW.csv similarity index 100% rename from commondata/kinematics/KIN_CDHSW_FW.csv rename to nnusf_data/commondata/kinematics/KIN_CDHSW_FW.csv diff --git a/commondata/kinematics/KIN_CDHSW_MATCHING_DXDY.csv b/nnusf_data/commondata/kinematics/KIN_CDHSW_MATCHING_DXDY.csv similarity index 100% rename from commondata/kinematics/KIN_CDHSW_MATCHING_DXDY.csv rename to nnusf_data/commondata/kinematics/KIN_CDHSW_MATCHING_DXDY.csv diff --git a/commondata/kinematics/KIN_CDHSW_MATCHING_F2F3.csv b/nnusf_data/commondata/kinematics/KIN_CDHSW_MATCHING_F2F3.csv similarity index 100% rename from commondata/kinematics/KIN_CDHSW_MATCHING_F2F3.csv rename to nnusf_data/commondata/kinematics/KIN_CDHSW_MATCHING_F2F3.csv diff --git a/commondata/kinematics/KIN_CHARM_F2F3.csv b/nnusf_data/commondata/kinematics/KIN_CHARM_F2F3.csv similarity index 100% rename from commondata/kinematics/KIN_CHARM_F2F3.csv rename to nnusf_data/commondata/kinematics/KIN_CHARM_F2F3.csv diff --git a/commondata/kinematics/KIN_CHARM_QBAR.csv b/nnusf_data/commondata/kinematics/KIN_CHARM_QBAR.csv similarity index 100% rename from commondata/kinematics/KIN_CHARM_QBAR.csv rename to nnusf_data/commondata/kinematics/KIN_CHARM_QBAR.csv diff --git a/commondata/kinematics/KIN_CHORUS_DXDY.csv b/nnusf_data/commondata/kinematics/KIN_CHORUS_DXDY.csv similarity index 100% rename from commondata/kinematics/KIN_CHORUS_DXDY.csv rename to nnusf_data/commondata/kinematics/KIN_CHORUS_DXDY.csv diff --git a/commondata/kinematics/KIN_CHORUS_F2F3.csv b/nnusf_data/commondata/kinematics/KIN_CHORUS_F2F3.csv similarity index 100% rename from commondata/kinematics/KIN_CHORUS_F2F3.csv rename to nnusf_data/commondata/kinematics/KIN_CHORUS_F2F3.csv diff --git a/commondata/kinematics/KIN_CHORUS_MATCHING_DXDY.csv b/nnusf_data/commondata/kinematics/KIN_CHORUS_MATCHING_DXDY.csv similarity index 100% rename from commondata/kinematics/KIN_CHORUS_MATCHING_DXDY.csv rename to nnusf_data/commondata/kinematics/KIN_CHORUS_MATCHING_DXDY.csv diff --git a/commondata/kinematics/KIN_CHORUS_MATCHING_F2F3.csv b/nnusf_data/commondata/kinematics/KIN_CHORUS_MATCHING_F2F3.csv similarity index 100% rename from commondata/kinematics/KIN_CHORUS_MATCHING_F2F3.csv rename to nnusf_data/commondata/kinematics/KIN_CHORUS_MATCHING_F2F3.csv diff --git a/commondata/kinematics/KIN_NUTEV_DXDYNUB.csv b/nnusf_data/commondata/kinematics/KIN_NUTEV_DXDYNUB.csv similarity index 100% rename from commondata/kinematics/KIN_NUTEV_DXDYNUB.csv rename to nnusf_data/commondata/kinematics/KIN_NUTEV_DXDYNUB.csv diff --git a/commondata/kinematics/KIN_NUTEV_DXDYNUU.csv b/nnusf_data/commondata/kinematics/KIN_NUTEV_DXDYNUU.csv similarity index 100% rename from commondata/kinematics/KIN_NUTEV_DXDYNUU.csv rename to nnusf_data/commondata/kinematics/KIN_NUTEV_DXDYNUU.csv diff --git a/commondata/kinematics/KIN_NUTEV_F2.csv b/nnusf_data/commondata/kinematics/KIN_NUTEV_F2.csv similarity index 100% rename from commondata/kinematics/KIN_NUTEV_F2.csv rename to nnusf_data/commondata/kinematics/KIN_NUTEV_F2.csv diff --git a/commondata/kinematics/KIN_NUTEV_F3.csv b/nnusf_data/commondata/kinematics/KIN_NUTEV_F3.csv similarity index 100% rename from commondata/kinematics/KIN_NUTEV_F3.csv rename to nnusf_data/commondata/kinematics/KIN_NUTEV_F3.csv diff --git a/commondata/kinematics/KIN_NUTEV_MATCHING_DXDY.csv b/nnusf_data/commondata/kinematics/KIN_NUTEV_MATCHING_DXDY.csv similarity index 100% rename from commondata/kinematics/KIN_NUTEV_MATCHING_DXDY.csv rename to nnusf_data/commondata/kinematics/KIN_NUTEV_MATCHING_DXDY.csv diff --git a/commondata/kinematics/KIN_NUTEV_MATCHING_F2F3.csv b/nnusf_data/commondata/kinematics/KIN_NUTEV_MATCHING_F2F3.csv similarity index 100% rename from commondata/kinematics/KIN_NUTEV_MATCHING_F2F3.csv rename to nnusf_data/commondata/kinematics/KIN_NUTEV_MATCHING_F2F3.csv diff --git a/commondata/kinematics/KIN_PROTONBC_MATCHING_DXDY.csv b/nnusf_data/commondata/kinematics/KIN_PROTONBC_MATCHING_DXDY.csv similarity index 100% rename from commondata/kinematics/KIN_PROTONBC_MATCHING_DXDY.csv rename to nnusf_data/commondata/kinematics/KIN_PROTONBC_MATCHING_DXDY.csv diff --git a/commondata/kinematics/KIN_PROTONBC_MATCHING_F2F3.csv b/nnusf_data/commondata/kinematics/KIN_PROTONBC_MATCHING_F2F3.csv similarity index 100% rename from commondata/kinematics/KIN_PROTONBC_MATCHING_F2F3.csv rename to nnusf_data/commondata/kinematics/KIN_PROTONBC_MATCHING_F2F3.csv diff --git a/commondata/matching-grids.yml b/nnusf_data/commondata/matching-grids.yml similarity index 100% rename from commondata/matching-grids.yml rename to nnusf_data/commondata/matching-grids.yml diff --git a/commondata/matching/BEBCWA59_F2_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/BEBCWA59_F2_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/BEBCWA59_F2_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/BEBCWA59_F2_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/BEBCWA59_F2_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/BEBCWA59_F2_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/BEBCWA59_F2_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/BEBCWA59_F2_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/BEBCWA59_F2_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/BEBCWA59_F2_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/BEBCWA59_F2_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/BEBCWA59_F2_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/BEBCWA59_F2_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/BEBCWA59_F2_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/BEBCWA59_F2_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/BEBCWA59_F2_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/BEBCWA59_F2_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/BEBCWA59_F2_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/BEBCWA59_F2_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/BEBCWA59_F2_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/BEBCWA59_F2_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/BEBCWA59_F2_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/BEBCWA59_F2_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/BEBCWA59_F2_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/BEBCWA59_F2_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/BEBCWA59_F2_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/BEBCWA59_F2_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/BEBCWA59_F2_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/matching/BEBCWA59_F3_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/BEBCWA59_F3_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/BEBCWA59_F3_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/BEBCWA59_F3_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/BEBCWA59_F3_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/BEBCWA59_F3_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/BEBCWA59_F3_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/BEBCWA59_F3_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/BEBCWA59_F3_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/BEBCWA59_F3_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/BEBCWA59_F3_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/BEBCWA59_F3_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/BEBCWA59_F3_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/BEBCWA59_F3_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/BEBCWA59_F3_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/BEBCWA59_F3_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/BEBCWA59_F3_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/BEBCWA59_F3_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/BEBCWA59_F3_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/BEBCWA59_F3_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/BEBCWA59_F3_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/BEBCWA59_F3_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/BEBCWA59_F3_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/BEBCWA59_F3_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/BEBCWA59_F3_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/BEBCWA59_F3_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/BEBCWA59_F3_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/BEBCWA59_F3_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/matching/CCFR_F2_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/CCFR_F2_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/CCFR_F2_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/CCFR_F2_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/CCFR_F2_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/CCFR_F2_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/CCFR_F2_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/CCFR_F2_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/CCFR_F2_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/CCFR_F2_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/CCFR_F2_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/CCFR_F2_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/CCFR_F2_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/CCFR_F2_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/CCFR_F2_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/CCFR_F2_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/CCFR_F2_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/CCFR_F2_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/CCFR_F2_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/CCFR_F2_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/CCFR_F2_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/CCFR_F2_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/CCFR_F2_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/CCFR_F2_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/CCFR_F2_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/CCFR_F2_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/CCFR_F2_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/CCFR_F2_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/matching/CCFR_F3_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/CCFR_F3_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/CCFR_F3_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/CCFR_F3_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/CCFR_F3_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/CCFR_F3_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/CCFR_F3_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/CCFR_F3_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/CCFR_F3_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/CCFR_F3_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/CCFR_F3_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/CCFR_F3_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/CCFR_F3_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/CCFR_F3_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/CCFR_F3_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/CCFR_F3_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/CCFR_F3_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/CCFR_F3_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/CCFR_F3_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/CCFR_F3_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/CCFR_F3_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/CCFR_F3_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/CCFR_F3_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/CCFR_F3_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/CCFR_F3_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/CCFR_F3_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/CCFR_F3_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/CCFR_F3_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/CDHSW_DXDYNUB_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/CDHSW_DXDYNUB_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/CDHSW_DXDYNUB_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/CDHSW_DXDYNUB_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/CDHSW_DXDYNUB_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/CDHSW_DXDYNUB_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/CDHSW_DXDYNUB_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/CDHSW_DXDYNUB_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/CDHSW_DXDYNUU_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/CDHSW_DXDYNUU_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/CDHSW_DXDYNUU_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/CDHSW_DXDYNUU_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/CDHSW_DXDYNUU_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/CDHSW_DXDYNUU_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/CDHSW_DXDYNUU_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/CDHSW_DXDYNUU_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/matching/CDHSW_F2_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/CDHSW_F2_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/CDHSW_F2_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/CDHSW_F2_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/CDHSW_F2_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/CDHSW_F2_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/CDHSW_F2_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/CDHSW_F2_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/CDHSW_F2_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/CDHSW_F2_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/CDHSW_F2_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/CDHSW_F2_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/CDHSW_F2_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/CDHSW_F2_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/CDHSW_F2_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/CDHSW_F2_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/CDHSW_F2_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/CDHSW_F2_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/CDHSW_F2_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/CDHSW_F2_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/CDHSW_F2_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/CDHSW_F2_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/CDHSW_F2_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/CDHSW_F2_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/CDHSW_F2_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/CDHSW_F2_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/CDHSW_F2_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/CDHSW_F2_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/matching/CDHSW_F3_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/CDHSW_F3_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/CDHSW_F3_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/CDHSW_F3_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/CDHSW_F3_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/CDHSW_F3_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/CDHSW_F3_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/CDHSW_F3_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/CDHSW_F3_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/CDHSW_F3_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/CDHSW_F3_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/CDHSW_F3_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/CDHSW_F3_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/CDHSW_F3_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/CDHSW_F3_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/CDHSW_F3_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/CDHSW_F3_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/CDHSW_F3_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/CDHSW_F3_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/CDHSW_F3_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/CDHSW_F3_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/CDHSW_F3_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/CDHSW_F3_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/CDHSW_F3_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/CDHSW_F3_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/CDHSW_F3_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/CDHSW_F3_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/CDHSW_F3_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/matching/CDHSW_FW_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/CDHSW_FW_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/CDHSW_FW_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/CDHSW_FW_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/CDHSW_FW_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/CDHSW_FW_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/CDHSW_FW_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/CDHSW_FW_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/CDHSW_FW_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/CDHSW_FW_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/CDHSW_FW_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/CDHSW_FW_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/CDHSW_FW_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/CDHSW_FW_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/CDHSW_FW_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/CDHSW_FW_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/CDHSW_FW_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/CDHSW_FW_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/CDHSW_FW_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/CDHSW_FW_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/CDHSW_FW_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/CDHSW_FW_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/CDHSW_FW_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/CDHSW_FW_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/CDHSW_FW_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/CDHSW_FW_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/CDHSW_FW_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/CDHSW_FW_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/CHORUS_DXDYNUB_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/CHORUS_DXDYNUB_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/CHORUS_DXDYNUB_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/CHORUS_DXDYNUB_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/CHORUS_DXDYNUB_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/CHORUS_DXDYNUB_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/CHORUS_DXDYNUB_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/CHORUS_DXDYNUB_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/CHORUS_DXDYNUU_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/CHORUS_DXDYNUU_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/CHORUS_DXDYNUU_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/CHORUS_DXDYNUU_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/CHORUS_DXDYNUU_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/CHORUS_DXDYNUU_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/CHORUS_DXDYNUU_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/CHORUS_DXDYNUU_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/matching/CHORUS_F2_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/CHORUS_F2_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/CHORUS_F2_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/CHORUS_F2_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/CHORUS_F2_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/CHORUS_F2_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/CHORUS_F2_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/CHORUS_F2_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/CHORUS_F2_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/CHORUS_F2_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/CHORUS_F2_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/CHORUS_F2_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/CHORUS_F2_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/CHORUS_F2_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/CHORUS_F2_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/CHORUS_F2_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/CHORUS_F2_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/CHORUS_F2_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/CHORUS_F2_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/CHORUS_F2_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/CHORUS_F2_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/CHORUS_F2_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/CHORUS_F2_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/CHORUS_F2_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/CHORUS_F2_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/CHORUS_F2_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/CHORUS_F2_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/CHORUS_F2_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/matching/CHORUS_F3_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/CHORUS_F3_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/CHORUS_F3_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/CHORUS_F3_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/CHORUS_F3_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/CHORUS_F3_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/CHORUS_F3_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/CHORUS_F3_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/CHORUS_F3_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/CHORUS_F3_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/CHORUS_F3_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/CHORUS_F3_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/CHORUS_F3_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/CHORUS_F3_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/CHORUS_F3_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/CHORUS_F3_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/CHORUS_F3_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/CHORUS_F3_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/CHORUS_F3_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/CHORUS_F3_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/CHORUS_F3_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/CHORUS_F3_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/CHORUS_F3_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/CHORUS_F3_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/CHORUS_F3_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/CHORUS_F3_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/CHORUS_F3_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/CHORUS_F3_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/NUTEV_DXDYNUB_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/NUTEV_DXDYNUB_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/NUTEV_DXDYNUB_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/NUTEV_DXDYNUB_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/NUTEV_DXDYNUB_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/NUTEV_DXDYNUB_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/NUTEV_DXDYNUB_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/NUTEV_DXDYNUB_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/NUTEV_DXDYNUU_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/NUTEV_DXDYNUU_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/NUTEV_DXDYNUU_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/NUTEV_DXDYNUU_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/NUTEV_DXDYNUU_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/NUTEV_DXDYNUU_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/NUTEV_DXDYNUU_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/NUTEV_DXDYNUU_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/matching/NUTEV_F2_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/NUTEV_F2_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/NUTEV_F2_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/NUTEV_F2_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/NUTEV_F2_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/NUTEV_F2_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/NUTEV_F2_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/NUTEV_F2_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/NUTEV_F2_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/NUTEV_F2_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/NUTEV_F2_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/NUTEV_F2_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/NUTEV_F2_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/NUTEV_F2_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/NUTEV_F2_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/NUTEV_F2_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/NUTEV_F2_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/NUTEV_F2_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/NUTEV_F2_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/NUTEV_F2_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/NUTEV_F2_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/NUTEV_F2_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/NUTEV_F2_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/NUTEV_F2_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/NUTEV_F2_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/NUTEV_F2_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/NUTEV_F2_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/NUTEV_F2_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/matching/NUTEV_F3_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/NUTEV_F3_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/NUTEV_F3_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/NUTEV_F3_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/NUTEV_F3_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/NUTEV_F3_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/NUTEV_F3_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/NUTEV_F3_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/NUTEV_F3_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/NUTEV_F3_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/NUTEV_F3_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/NUTEV_F3_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/NUTEV_F3_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/NUTEV_F3_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/NUTEV_F3_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/NUTEV_F3_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/NUTEV_F3_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/NUTEV_F3_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/NUTEV_F3_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/NUTEV_F3_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/NUTEV_F3_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/NUTEV_F3_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/NUTEV_F3_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/NUTEV_F3_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/NUTEV_F3_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/NUTEV_F3_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/NUTEV_F3_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/NUTEV_F3_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/PROTONBC_DXDYNUB_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/PROTONBC_DXDYNUU_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/matching/PROTONBC_F2_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/PROTONBC_F2_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/PROTONBC_F2_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/PROTONBC_F2_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/PROTONBC_F2_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/PROTONBC_F2_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/PROTONBC_F2_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/PROTONBC_F2_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/PROTONBC_F2_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/PROTONBC_F2_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/PROTONBC_F2_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/PROTONBC_F2_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/PROTONBC_F2_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/PROTONBC_F2_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/PROTONBC_F2_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/PROTONBC_F2_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/PROTONBC_F2_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/PROTONBC_F2_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/PROTONBC_F2_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/PROTONBC_F2_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/PROTONBC_F2_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/PROTONBC_F2_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/PROTONBC_F2_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/PROTONBC_F2_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/PROTONBC_F2_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/PROTONBC_F2_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/PROTONBC_F2_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/PROTONBC_F2_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/matching/PROTONBC_F3_MATCHING_xif0.5_xir0.5.npy b/nnusf_data/commondata/matching/PROTONBC_F3_MATCHING_xif0.5_xir0.5.npy similarity index 100% rename from commondata/matching/PROTONBC_F3_MATCHING_xif0.5_xir0.5.npy rename to nnusf_data/commondata/matching/PROTONBC_F3_MATCHING_xif0.5_xir0.5.npy diff --git a/commondata/matching/PROTONBC_F3_MATCHING_xif0.5_xir1.0.npy b/nnusf_data/commondata/matching/PROTONBC_F3_MATCHING_xif0.5_xir1.0.npy similarity index 100% rename from commondata/matching/PROTONBC_F3_MATCHING_xif0.5_xir1.0.npy rename to nnusf_data/commondata/matching/PROTONBC_F3_MATCHING_xif0.5_xir1.0.npy diff --git a/commondata/matching/PROTONBC_F3_MATCHING_xif1.0_xir0.5.npy b/nnusf_data/commondata/matching/PROTONBC_F3_MATCHING_xif1.0_xir0.5.npy similarity index 100% rename from commondata/matching/PROTONBC_F3_MATCHING_xif1.0_xir0.5.npy rename to nnusf_data/commondata/matching/PROTONBC_F3_MATCHING_xif1.0_xir0.5.npy diff --git a/commondata/matching/PROTONBC_F3_MATCHING_xif1.0_xir1.0.npy b/nnusf_data/commondata/matching/PROTONBC_F3_MATCHING_xif1.0_xir1.0.npy similarity index 100% rename from commondata/matching/PROTONBC_F3_MATCHING_xif1.0_xir1.0.npy rename to nnusf_data/commondata/matching/PROTONBC_F3_MATCHING_xif1.0_xir1.0.npy diff --git a/commondata/matching/PROTONBC_F3_MATCHING_xif1.0_xir2.0.npy b/nnusf_data/commondata/matching/PROTONBC_F3_MATCHING_xif1.0_xir2.0.npy similarity index 100% rename from commondata/matching/PROTONBC_F3_MATCHING_xif1.0_xir2.0.npy rename to nnusf_data/commondata/matching/PROTONBC_F3_MATCHING_xif1.0_xir2.0.npy diff --git a/commondata/matching/PROTONBC_F3_MATCHING_xif2.0_xir1.0.npy b/nnusf_data/commondata/matching/PROTONBC_F3_MATCHING_xif2.0_xir1.0.npy similarity index 100% rename from commondata/matching/PROTONBC_F3_MATCHING_xif2.0_xir1.0.npy rename to nnusf_data/commondata/matching/PROTONBC_F3_MATCHING_xif2.0_xir1.0.npy diff --git a/commondata/matching/PROTONBC_F3_MATCHING_xif2.0_xir2.0.npy b/nnusf_data/commondata/matching/PROTONBC_F3_MATCHING_xif2.0_xir2.0.npy similarity index 100% rename from commondata/matching/PROTONBC_F3_MATCHING_xif2.0_xir2.0.npy rename to nnusf_data/commondata/matching/PROTONBC_F3_MATCHING_xif2.0_xir2.0.npy diff --git a/commondata/rawdata/BEBCWA59/Table1.yaml b/nnusf_data/commondata/rawdata/BEBCWA59/Table1.yaml similarity index 100% rename from commondata/rawdata/BEBCWA59/Table1.yaml rename to nnusf_data/commondata/rawdata/BEBCWA59/Table1.yaml diff --git a/commondata/rawdata/BEBCWA59/Table2.yaml b/nnusf_data/commondata/rawdata/BEBCWA59/Table2.yaml similarity index 100% rename from commondata/rawdata/BEBCWA59/Table2.yaml rename to nnusf_data/commondata/rawdata/BEBCWA59/Table2.yaml diff --git a/commondata/rawdata/BEBCWA59/Table3.yaml b/nnusf_data/commondata/rawdata/BEBCWA59/Table3.yaml similarity index 100% rename from commondata/rawdata/BEBCWA59/Table3.yaml rename to nnusf_data/commondata/rawdata/BEBCWA59/Table3.yaml diff --git a/commondata/rawdata/BEBCWA59/Table4.yaml b/nnusf_data/commondata/rawdata/BEBCWA59/Table4.yaml similarity index 100% rename from commondata/rawdata/BEBCWA59/Table4.yaml rename to nnusf_data/commondata/rawdata/BEBCWA59/Table4.yaml diff --git a/commondata/rawdata/BEBCWA59/Table5.yaml b/nnusf_data/commondata/rawdata/BEBCWA59/Table5.yaml similarity index 100% rename from commondata/rawdata/BEBCWA59/Table5.yaml rename to nnusf_data/commondata/rawdata/BEBCWA59/Table5.yaml diff --git a/commondata/rawdata/BEBCWA59/Table6.yaml b/nnusf_data/commondata/rawdata/BEBCWA59/Table6.yaml similarity index 100% rename from commondata/rawdata/BEBCWA59/Table6.yaml rename to nnusf_data/commondata/rawdata/BEBCWA59/Table6.yaml diff --git a/commondata/rawdata/BEBCWA59/Table7.yaml b/nnusf_data/commondata/rawdata/BEBCWA59/Table7.yaml similarity index 100% rename from commondata/rawdata/BEBCWA59/Table7.yaml rename to nnusf_data/commondata/rawdata/BEBCWA59/Table7.yaml diff --git a/commondata/rawdata/BEBCWA59/Table8.yaml b/nnusf_data/commondata/rawdata/BEBCWA59/Table8.yaml similarity index 100% rename from commondata/rawdata/BEBCWA59/Table8.yaml rename to nnusf_data/commondata/rawdata/BEBCWA59/Table8.yaml diff --git a/commondata/rawdata/BEBCWA59/Table9.yaml b/nnusf_data/commondata/rawdata/BEBCWA59/Table9.yaml similarity index 100% rename from commondata/rawdata/BEBCWA59/Table9.yaml rename to nnusf_data/commondata/rawdata/BEBCWA59/Table9.yaml diff --git a/commondata/rawdata/BEBCWA59/submission.yaml b/nnusf_data/commondata/rawdata/BEBCWA59/submission.yaml similarity index 100% rename from commondata/rawdata/BEBCWA59/submission.yaml rename to nnusf_data/commondata/rawdata/BEBCWA59/submission.yaml diff --git a/commondata/rawdata/CCFR/Table1.yaml b/nnusf_data/commondata/rawdata/CCFR/Table1.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table1.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table1.yaml diff --git a/commondata/rawdata/CCFR/Table10.yaml b/nnusf_data/commondata/rawdata/CCFR/Table10.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table10.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table10.yaml diff --git a/commondata/rawdata/CCFR/Table11.yaml b/nnusf_data/commondata/rawdata/CCFR/Table11.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table11.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table11.yaml diff --git a/commondata/rawdata/CCFR/Table12.yaml b/nnusf_data/commondata/rawdata/CCFR/Table12.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table12.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table12.yaml diff --git a/commondata/rawdata/CCFR/Table13.yaml b/nnusf_data/commondata/rawdata/CCFR/Table13.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table13.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table13.yaml diff --git a/commondata/rawdata/CCFR/Table14.yaml b/nnusf_data/commondata/rawdata/CCFR/Table14.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table14.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table14.yaml diff --git a/commondata/rawdata/CCFR/Table15.yaml b/nnusf_data/commondata/rawdata/CCFR/Table15.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table15.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table15.yaml diff --git a/commondata/rawdata/CCFR/Table16.yaml b/nnusf_data/commondata/rawdata/CCFR/Table16.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table16.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table16.yaml diff --git a/commondata/rawdata/CCFR/Table17.yaml b/nnusf_data/commondata/rawdata/CCFR/Table17.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table17.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table17.yaml diff --git a/commondata/rawdata/CCFR/Table18.yaml b/nnusf_data/commondata/rawdata/CCFR/Table18.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table18.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table18.yaml diff --git a/commondata/rawdata/CCFR/Table19.yaml b/nnusf_data/commondata/rawdata/CCFR/Table19.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table19.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table19.yaml diff --git a/commondata/rawdata/CCFR/Table2.yaml b/nnusf_data/commondata/rawdata/CCFR/Table2.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table2.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table2.yaml diff --git a/commondata/rawdata/CCFR/Table20.yaml b/nnusf_data/commondata/rawdata/CCFR/Table20.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table20.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table20.yaml diff --git a/commondata/rawdata/CCFR/Table21.yaml b/nnusf_data/commondata/rawdata/CCFR/Table21.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table21.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table21.yaml diff --git a/commondata/rawdata/CCFR/Table22.yaml b/nnusf_data/commondata/rawdata/CCFR/Table22.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table22.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table22.yaml diff --git a/commondata/rawdata/CCFR/Table3.yaml b/nnusf_data/commondata/rawdata/CCFR/Table3.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table3.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table3.yaml diff --git a/commondata/rawdata/CCFR/Table4.yaml b/nnusf_data/commondata/rawdata/CCFR/Table4.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table4.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table4.yaml diff --git a/commondata/rawdata/CCFR/Table5.yaml b/nnusf_data/commondata/rawdata/CCFR/Table5.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table5.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table5.yaml diff --git a/commondata/rawdata/CCFR/Table6.yaml b/nnusf_data/commondata/rawdata/CCFR/Table6.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table6.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table6.yaml diff --git a/commondata/rawdata/CCFR/Table7.yaml b/nnusf_data/commondata/rawdata/CCFR/Table7.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table7.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table7.yaml diff --git a/commondata/rawdata/CCFR/Table8.yaml b/nnusf_data/commondata/rawdata/CCFR/Table8.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table8.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table8.yaml diff --git a/commondata/rawdata/CCFR/Table9.yaml b/nnusf_data/commondata/rawdata/CCFR/Table9.yaml similarity index 100% rename from commondata/rawdata/CCFR/Table9.yaml rename to nnusf_data/commondata/rawdata/CCFR/Table9.yaml diff --git a/commondata/rawdata/CCFR/submission.yaml b/nnusf_data/commondata/rawdata/CCFR/submission.yaml similarity index 100% rename from commondata/rawdata/CCFR/submission.yaml rename to nnusf_data/commondata/rawdata/CCFR/submission.yaml diff --git a/commondata/rawdata/CDHS/Table1.yaml b/nnusf_data/commondata/rawdata/CDHS/Table1.yaml similarity index 100% rename from commondata/rawdata/CDHS/Table1.yaml rename to nnusf_data/commondata/rawdata/CDHS/Table1.yaml diff --git a/commondata/rawdata/CDHS/Table2.yaml b/nnusf_data/commondata/rawdata/CDHS/Table2.yaml similarity index 100% rename from commondata/rawdata/CDHS/Table2.yaml rename to nnusf_data/commondata/rawdata/CDHS/Table2.yaml diff --git a/commondata/rawdata/CDHS/Table3.yaml b/nnusf_data/commondata/rawdata/CDHS/Table3.yaml similarity index 100% rename from commondata/rawdata/CDHS/Table3.yaml rename to nnusf_data/commondata/rawdata/CDHS/Table3.yaml diff --git a/commondata/rawdata/CDHS/Table4.yaml b/nnusf_data/commondata/rawdata/CDHS/Table4.yaml similarity index 100% rename from commondata/rawdata/CDHS/Table4.yaml rename to nnusf_data/commondata/rawdata/CDHS/Table4.yaml diff --git a/commondata/rawdata/CDHS/Table5.yaml b/nnusf_data/commondata/rawdata/CDHS/Table5.yaml similarity index 100% rename from commondata/rawdata/CDHS/Table5.yaml rename to nnusf_data/commondata/rawdata/CDHS/Table5.yaml diff --git a/commondata/rawdata/CDHS/submission.yaml b/nnusf_data/commondata/rawdata/CDHS/submission.yaml similarity index 100% rename from commondata/rawdata/CDHS/submission.yaml rename to nnusf_data/commondata/rawdata/CDHS/submission.yaml diff --git a/commondata/rawdata/CDHSW/Table1.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table1.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table1.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table1.yaml diff --git a/commondata/rawdata/CDHSW/Table10.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table10.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table10.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table10.yaml diff --git a/commondata/rawdata/CDHSW/Table11.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table11.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table11.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table11.yaml diff --git a/commondata/rawdata/CDHSW/Table12.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table12.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table12.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table12.yaml diff --git a/commondata/rawdata/CDHSW/Table13.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table13.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table13.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table13.yaml diff --git a/commondata/rawdata/CDHSW/Table14.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table14.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table14.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table14.yaml diff --git a/commondata/rawdata/CDHSW/Table15.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table15.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table15.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table15.yaml diff --git a/commondata/rawdata/CDHSW/Table16.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table16.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table16.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table16.yaml diff --git a/commondata/rawdata/CDHSW/Table17.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table17.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table17.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table17.yaml diff --git a/commondata/rawdata/CDHSW/Table18.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table18.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table18.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table18.yaml diff --git a/commondata/rawdata/CDHSW/Table19.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table19.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table19.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table19.yaml diff --git a/commondata/rawdata/CDHSW/Table2.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table2.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table2.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table2.yaml diff --git a/commondata/rawdata/CDHSW/Table20.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table20.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table20.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table20.yaml diff --git a/commondata/rawdata/CDHSW/Table21.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table21.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table21.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table21.yaml diff --git a/commondata/rawdata/CDHSW/Table22.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table22.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table22.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table22.yaml diff --git a/commondata/rawdata/CDHSW/Table23.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table23.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table23.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table23.yaml diff --git a/commondata/rawdata/CDHSW/Table24.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table24.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table24.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table24.yaml diff --git a/commondata/rawdata/CDHSW/Table25.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table25.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table25.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table25.yaml diff --git a/commondata/rawdata/CDHSW/Table26.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table26.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table26.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table26.yaml diff --git a/commondata/rawdata/CDHSW/Table27.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table27.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table27.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table27.yaml diff --git a/commondata/rawdata/CDHSW/Table28.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table28.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table28.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table28.yaml diff --git a/commondata/rawdata/CDHSW/Table29.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table29.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table29.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table29.yaml diff --git a/commondata/rawdata/CDHSW/Table3.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table3.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table3.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table3.yaml diff --git a/commondata/rawdata/CDHSW/Table30.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table30.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table30.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table30.yaml diff --git a/commondata/rawdata/CDHSW/Table31.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table31.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table31.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table31.yaml diff --git a/commondata/rawdata/CDHSW/Table32.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table32.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table32.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table32.yaml diff --git a/commondata/rawdata/CDHSW/Table33.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table33.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table33.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table33.yaml diff --git a/commondata/rawdata/CDHSW/Table34.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table34.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table34.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table34.yaml diff --git a/commondata/rawdata/CDHSW/Table35.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table35.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table35.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table35.yaml diff --git a/commondata/rawdata/CDHSW/Table36.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table36.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table36.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table36.yaml diff --git a/commondata/rawdata/CDHSW/Table37.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table37.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table37.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table37.yaml diff --git a/commondata/rawdata/CDHSW/Table38.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table38.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table38.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table38.yaml diff --git a/commondata/rawdata/CDHSW/Table39.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table39.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table39.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table39.yaml diff --git a/commondata/rawdata/CDHSW/Table4.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table4.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table4.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table4.yaml diff --git a/commondata/rawdata/CDHSW/Table40.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table40.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table40.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table40.yaml diff --git a/commondata/rawdata/CDHSW/Table5.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table5.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table5.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table5.yaml diff --git a/commondata/rawdata/CDHSW/Table6.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table6.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table6.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table6.yaml diff --git a/commondata/rawdata/CDHSW/Table7.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table7.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table7.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table7.yaml diff --git a/commondata/rawdata/CDHSW/Table8.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table8.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table8.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table8.yaml diff --git a/commondata/rawdata/CDHSW/Table9.yaml b/nnusf_data/commondata/rawdata/CDHSW/Table9.yaml similarity index 100% rename from commondata/rawdata/CDHSW/Table9.yaml rename to nnusf_data/commondata/rawdata/CDHSW/Table9.yaml diff --git a/commondata/rawdata/CDHSW/submission.yaml b/nnusf_data/commondata/rawdata/CDHSW/submission.yaml similarity index 100% rename from commondata/rawdata/CDHSW/submission.yaml rename to nnusf_data/commondata/rawdata/CDHSW/submission.yaml diff --git a/commondata/rawdata/CHARM/Table1.yaml b/nnusf_data/commondata/rawdata/CHARM/Table1.yaml similarity index 100% rename from commondata/rawdata/CHARM/Table1.yaml rename to nnusf_data/commondata/rawdata/CHARM/Table1.yaml diff --git a/commondata/rawdata/CHARM/Table2.yaml b/nnusf_data/commondata/rawdata/CHARM/Table2.yaml similarity index 100% rename from commondata/rawdata/CHARM/Table2.yaml rename to nnusf_data/commondata/rawdata/CHARM/Table2.yaml diff --git a/commondata/rawdata/CHARM/submission.yaml b/nnusf_data/commondata/rawdata/CHARM/submission.yaml similarity index 100% rename from commondata/rawdata/CHARM/submission.yaml rename to nnusf_data/commondata/rawdata/CHARM/submission.yaml diff --git a/commondata/rawdata/CHORUS/Table1.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table1.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table1.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table1.yaml diff --git a/commondata/rawdata/CHORUS/Table10.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table10.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table10.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table10.yaml diff --git a/commondata/rawdata/CHORUS/Table100.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table100.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table100.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table100.yaml diff --git a/commondata/rawdata/CHORUS/Table101.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table101.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table101.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table101.yaml diff --git a/commondata/rawdata/CHORUS/Table102.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table102.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table102.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table102.yaml diff --git a/commondata/rawdata/CHORUS/Table103.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table103.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table103.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table103.yaml diff --git a/commondata/rawdata/CHORUS/Table104.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table104.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table104.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table104.yaml diff --git a/commondata/rawdata/CHORUS/Table105.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table105.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table105.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table105.yaml diff --git a/commondata/rawdata/CHORUS/Table106.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table106.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table106.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table106.yaml diff --git a/commondata/rawdata/CHORUS/Table107.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table107.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table107.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table107.yaml diff --git a/commondata/rawdata/CHORUS/Table108.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table108.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table108.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table108.yaml diff --git a/commondata/rawdata/CHORUS/Table109.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table109.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table109.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table109.yaml diff --git a/commondata/rawdata/CHORUS/Table11.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table11.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table11.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table11.yaml diff --git a/commondata/rawdata/CHORUS/Table110.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table110.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table110.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table110.yaml diff --git a/commondata/rawdata/CHORUS/Table111.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table111.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table111.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table111.yaml diff --git a/commondata/rawdata/CHORUS/Table112.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table112.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table112.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table112.yaml diff --git a/commondata/rawdata/CHORUS/Table113.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table113.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table113.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table113.yaml diff --git a/commondata/rawdata/CHORUS/Table114.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table114.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table114.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table114.yaml diff --git a/commondata/rawdata/CHORUS/Table115.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table115.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table115.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table115.yaml diff --git a/commondata/rawdata/CHORUS/Table116.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table116.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table116.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table116.yaml diff --git a/commondata/rawdata/CHORUS/Table117.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table117.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table117.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table117.yaml diff --git a/commondata/rawdata/CHORUS/Table118.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table118.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table118.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table118.yaml diff --git a/commondata/rawdata/CHORUS/Table119.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table119.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table119.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table119.yaml diff --git a/commondata/rawdata/CHORUS/Table12.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table12.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table12.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table12.yaml diff --git a/commondata/rawdata/CHORUS/Table120.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table120.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table120.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table120.yaml diff --git a/commondata/rawdata/CHORUS/Table121.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table121.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table121.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table121.yaml diff --git a/commondata/rawdata/CHORUS/Table13.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table13.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table13.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table13.yaml diff --git a/commondata/rawdata/CHORUS/Table14.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table14.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table14.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table14.yaml diff --git a/commondata/rawdata/CHORUS/Table15.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table15.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table15.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table15.yaml diff --git a/commondata/rawdata/CHORUS/Table16.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table16.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table16.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table16.yaml diff --git a/commondata/rawdata/CHORUS/Table17.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table17.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table17.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table17.yaml diff --git a/commondata/rawdata/CHORUS/Table18.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table18.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table18.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table18.yaml diff --git a/commondata/rawdata/CHORUS/Table19.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table19.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table19.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table19.yaml diff --git a/commondata/rawdata/CHORUS/Table2.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table2.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table2.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table2.yaml diff --git a/commondata/rawdata/CHORUS/Table20.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table20.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table20.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table20.yaml diff --git a/commondata/rawdata/CHORUS/Table21.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table21.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table21.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table21.yaml diff --git a/commondata/rawdata/CHORUS/Table22.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table22.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table22.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table22.yaml diff --git a/commondata/rawdata/CHORUS/Table23.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table23.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table23.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table23.yaml diff --git a/commondata/rawdata/CHORUS/Table24.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table24.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table24.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table24.yaml diff --git a/commondata/rawdata/CHORUS/Table25.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table25.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table25.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table25.yaml diff --git a/commondata/rawdata/CHORUS/Table26.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table26.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table26.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table26.yaml diff --git a/commondata/rawdata/CHORUS/Table27.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table27.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table27.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table27.yaml diff --git a/commondata/rawdata/CHORUS/Table28.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table28.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table28.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table28.yaml diff --git a/commondata/rawdata/CHORUS/Table29.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table29.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table29.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table29.yaml diff --git a/commondata/rawdata/CHORUS/Table3.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table3.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table3.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table3.yaml diff --git a/commondata/rawdata/CHORUS/Table30.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table30.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table30.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table30.yaml diff --git a/commondata/rawdata/CHORUS/Table31.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table31.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table31.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table31.yaml diff --git a/commondata/rawdata/CHORUS/Table32.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table32.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table32.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table32.yaml diff --git a/commondata/rawdata/CHORUS/Table33.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table33.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table33.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table33.yaml diff --git a/commondata/rawdata/CHORUS/Table34.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table34.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table34.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table34.yaml diff --git a/commondata/rawdata/CHORUS/Table35.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table35.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table35.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table35.yaml diff --git a/commondata/rawdata/CHORUS/Table36.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table36.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table36.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table36.yaml diff --git a/commondata/rawdata/CHORUS/Table37.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table37.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table37.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table37.yaml diff --git a/commondata/rawdata/CHORUS/Table38.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table38.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table38.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table38.yaml diff --git a/commondata/rawdata/CHORUS/Table39.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table39.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table39.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table39.yaml diff --git a/commondata/rawdata/CHORUS/Table4.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table4.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table4.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table4.yaml diff --git a/commondata/rawdata/CHORUS/Table40.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table40.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table40.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table40.yaml diff --git a/commondata/rawdata/CHORUS/Table41.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table41.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table41.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table41.yaml diff --git a/commondata/rawdata/CHORUS/Table42.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table42.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table42.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table42.yaml diff --git a/commondata/rawdata/CHORUS/Table43.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table43.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table43.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table43.yaml diff --git a/commondata/rawdata/CHORUS/Table44.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table44.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table44.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table44.yaml diff --git a/commondata/rawdata/CHORUS/Table45.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table45.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table45.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table45.yaml diff --git a/commondata/rawdata/CHORUS/Table46.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table46.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table46.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table46.yaml diff --git a/commondata/rawdata/CHORUS/Table47.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table47.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table47.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table47.yaml diff --git a/commondata/rawdata/CHORUS/Table48.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table48.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table48.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table48.yaml diff --git a/commondata/rawdata/CHORUS/Table49.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table49.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table49.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table49.yaml diff --git a/commondata/rawdata/CHORUS/Table5.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table5.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table5.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table5.yaml diff --git a/commondata/rawdata/CHORUS/Table50.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table50.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table50.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table50.yaml diff --git a/commondata/rawdata/CHORUS/Table51.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table51.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table51.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table51.yaml diff --git a/commondata/rawdata/CHORUS/Table52.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table52.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table52.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table52.yaml diff --git a/commondata/rawdata/CHORUS/Table53.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table53.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table53.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table53.yaml diff --git a/commondata/rawdata/CHORUS/Table54.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table54.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table54.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table54.yaml diff --git a/commondata/rawdata/CHORUS/Table55.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table55.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table55.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table55.yaml diff --git a/commondata/rawdata/CHORUS/Table56.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table56.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table56.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table56.yaml diff --git a/commondata/rawdata/CHORUS/Table57.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table57.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table57.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table57.yaml diff --git a/commondata/rawdata/CHORUS/Table58.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table58.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table58.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table58.yaml diff --git a/commondata/rawdata/CHORUS/Table59.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table59.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table59.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table59.yaml diff --git a/commondata/rawdata/CHORUS/Table6.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table6.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table6.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table6.yaml diff --git a/commondata/rawdata/CHORUS/Table60.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table60.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table60.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table60.yaml diff --git a/commondata/rawdata/CHORUS/Table61.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table61.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table61.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table61.yaml diff --git a/commondata/rawdata/CHORUS/Table62.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table62.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table62.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table62.yaml diff --git a/commondata/rawdata/CHORUS/Table63.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table63.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table63.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table63.yaml diff --git a/commondata/rawdata/CHORUS/Table64.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table64.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table64.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table64.yaml diff --git a/commondata/rawdata/CHORUS/Table65.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table65.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table65.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table65.yaml diff --git a/commondata/rawdata/CHORUS/Table66.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table66.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table66.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table66.yaml diff --git a/commondata/rawdata/CHORUS/Table67.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table67.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table67.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table67.yaml diff --git a/commondata/rawdata/CHORUS/Table68.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table68.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table68.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table68.yaml diff --git a/commondata/rawdata/CHORUS/Table69.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table69.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table69.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table69.yaml diff --git a/commondata/rawdata/CHORUS/Table7.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table7.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table7.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table7.yaml diff --git a/commondata/rawdata/CHORUS/Table70.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table70.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table70.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table70.yaml diff --git a/commondata/rawdata/CHORUS/Table71.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table71.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table71.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table71.yaml diff --git a/commondata/rawdata/CHORUS/Table72.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table72.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table72.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table72.yaml diff --git a/commondata/rawdata/CHORUS/Table73.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table73.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table73.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table73.yaml diff --git a/commondata/rawdata/CHORUS/Table74.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table74.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table74.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table74.yaml diff --git a/commondata/rawdata/CHORUS/Table75.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table75.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table75.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table75.yaml diff --git a/commondata/rawdata/CHORUS/Table76.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table76.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table76.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table76.yaml diff --git a/commondata/rawdata/CHORUS/Table77.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table77.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table77.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table77.yaml diff --git a/commondata/rawdata/CHORUS/Table78.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table78.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table78.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table78.yaml diff --git a/commondata/rawdata/CHORUS/Table79.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table79.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table79.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table79.yaml diff --git a/commondata/rawdata/CHORUS/Table8.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table8.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table8.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table8.yaml diff --git a/commondata/rawdata/CHORUS/Table80.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table80.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table80.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table80.yaml diff --git a/commondata/rawdata/CHORUS/Table81.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table81.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table81.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table81.yaml diff --git a/commondata/rawdata/CHORUS/Table82.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table82.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table82.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table82.yaml diff --git a/commondata/rawdata/CHORUS/Table83.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table83.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table83.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table83.yaml diff --git a/commondata/rawdata/CHORUS/Table84.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table84.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table84.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table84.yaml diff --git a/commondata/rawdata/CHORUS/Table85.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table85.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table85.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table85.yaml diff --git a/commondata/rawdata/CHORUS/Table86.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table86.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table86.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table86.yaml diff --git a/commondata/rawdata/CHORUS/Table87.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table87.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table87.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table87.yaml diff --git a/commondata/rawdata/CHORUS/Table88.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table88.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table88.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table88.yaml diff --git a/commondata/rawdata/CHORUS/Table89.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table89.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table89.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table89.yaml diff --git a/commondata/rawdata/CHORUS/Table9.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table9.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table9.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table9.yaml diff --git a/commondata/rawdata/CHORUS/Table90.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table90.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table90.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table90.yaml diff --git a/commondata/rawdata/CHORUS/Table91.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table91.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table91.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table91.yaml diff --git a/commondata/rawdata/CHORUS/Table92.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table92.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table92.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table92.yaml diff --git a/commondata/rawdata/CHORUS/Table93.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table93.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table93.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table93.yaml diff --git a/commondata/rawdata/CHORUS/Table94.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table94.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table94.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table94.yaml diff --git a/commondata/rawdata/CHORUS/Table95.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table95.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table95.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table95.yaml diff --git a/commondata/rawdata/CHORUS/Table96.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table96.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table96.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table96.yaml diff --git a/commondata/rawdata/CHORUS/Table97.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table97.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table97.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table97.yaml diff --git a/commondata/rawdata/CHORUS/Table98.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table98.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table98.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table98.yaml diff --git a/commondata/rawdata/CHORUS/Table99.yaml b/nnusf_data/commondata/rawdata/CHORUS/Table99.yaml similarity index 100% rename from commondata/rawdata/CHORUS/Table99.yaml rename to nnusf_data/commondata/rawdata/CHORUS/Table99.yaml diff --git a/commondata/rawdata/CHORUS/submission.yaml b/nnusf_data/commondata/rawdata/CHORUS/submission.yaml similarity index 100% rename from commondata/rawdata/CHORUS/submission.yaml rename to nnusf_data/commondata/rawdata/CHORUS/submission.yaml diff --git a/commondata/rawdata/NUTEV/Table1.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table1.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table1.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table1.yaml diff --git a/commondata/rawdata/NUTEV/Table10.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table10.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table10.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table10.yaml diff --git a/commondata/rawdata/NUTEV/Table100.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table100.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table100.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table100.yaml diff --git a/commondata/rawdata/NUTEV/Table101.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table101.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table101.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table101.yaml diff --git a/commondata/rawdata/NUTEV/Table102.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table102.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table102.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table102.yaml diff --git a/commondata/rawdata/NUTEV/Table103.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table103.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table103.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table103.yaml diff --git a/commondata/rawdata/NUTEV/Table104.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table104.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table104.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table104.yaml diff --git a/commondata/rawdata/NUTEV/Table105.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table105.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table105.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table105.yaml diff --git a/commondata/rawdata/NUTEV/Table106.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table106.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table106.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table106.yaml diff --git a/commondata/rawdata/NUTEV/Table107.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table107.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table107.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table107.yaml diff --git a/commondata/rawdata/NUTEV/Table108.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table108.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table108.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table108.yaml diff --git a/commondata/rawdata/NUTEV/Table109.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table109.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table109.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table109.yaml diff --git a/commondata/rawdata/NUTEV/Table11.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table11.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table11.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table11.yaml diff --git a/commondata/rawdata/NUTEV/Table110.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table110.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table110.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table110.yaml diff --git a/commondata/rawdata/NUTEV/Table111.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table111.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table111.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table111.yaml diff --git a/commondata/rawdata/NUTEV/Table112.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table112.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table112.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table112.yaml diff --git a/commondata/rawdata/NUTEV/Table113.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table113.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table113.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table113.yaml diff --git a/commondata/rawdata/NUTEV/Table114.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table114.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table114.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table114.yaml diff --git a/commondata/rawdata/NUTEV/Table115.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table115.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table115.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table115.yaml diff --git a/commondata/rawdata/NUTEV/Table116.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table116.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table116.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table116.yaml diff --git a/commondata/rawdata/NUTEV/Table117.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table117.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table117.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table117.yaml diff --git a/commondata/rawdata/NUTEV/Table118.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table118.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table118.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table118.yaml diff --git a/commondata/rawdata/NUTEV/Table119.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table119.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table119.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table119.yaml diff --git a/commondata/rawdata/NUTEV/Table12.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table12.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table12.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table12.yaml diff --git a/commondata/rawdata/NUTEV/Table120.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table120.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table120.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table120.yaml diff --git a/commondata/rawdata/NUTEV/Table121.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table121.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table121.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table121.yaml diff --git a/commondata/rawdata/NUTEV/Table122.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table122.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table122.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table122.yaml diff --git a/commondata/rawdata/NUTEV/Table123.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table123.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table123.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table123.yaml diff --git a/commondata/rawdata/NUTEV/Table124.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table124.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table124.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table124.yaml diff --git a/commondata/rawdata/NUTEV/Table125.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table125.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table125.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table125.yaml diff --git a/commondata/rawdata/NUTEV/Table126.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table126.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table126.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table126.yaml diff --git a/commondata/rawdata/NUTEV/Table127.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table127.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table127.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table127.yaml diff --git a/commondata/rawdata/NUTEV/Table128.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table128.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table128.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table128.yaml diff --git a/commondata/rawdata/NUTEV/Table129.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table129.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table129.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table129.yaml diff --git a/commondata/rawdata/NUTEV/Table13.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table13.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table13.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table13.yaml diff --git a/commondata/rawdata/NUTEV/Table130.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table130.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table130.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table130.yaml diff --git a/commondata/rawdata/NUTEV/Table131.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table131.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table131.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table131.yaml diff --git a/commondata/rawdata/NUTEV/Table132.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table132.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table132.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table132.yaml diff --git a/commondata/rawdata/NUTEV/Table133.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table133.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table133.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table133.yaml diff --git a/commondata/rawdata/NUTEV/Table134.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table134.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table134.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table134.yaml diff --git a/commondata/rawdata/NUTEV/Table135.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table135.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table135.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table135.yaml diff --git a/commondata/rawdata/NUTEV/Table136.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table136.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table136.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table136.yaml diff --git a/commondata/rawdata/NUTEV/Table137.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table137.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table137.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table137.yaml diff --git a/commondata/rawdata/NUTEV/Table138.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table138.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table138.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table138.yaml diff --git a/commondata/rawdata/NUTEV/Table139.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table139.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table139.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table139.yaml diff --git a/commondata/rawdata/NUTEV/Table14.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table14.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table14.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table14.yaml diff --git a/commondata/rawdata/NUTEV/Table140.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table140.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table140.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table140.yaml diff --git a/commondata/rawdata/NUTEV/Table141.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table141.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table141.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table141.yaml diff --git a/commondata/rawdata/NUTEV/Table142.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table142.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table142.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table142.yaml diff --git a/commondata/rawdata/NUTEV/Table143.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table143.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table143.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table143.yaml diff --git a/commondata/rawdata/NUTEV/Table144.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table144.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table144.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table144.yaml diff --git a/commondata/rawdata/NUTEV/Table145.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table145.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table145.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table145.yaml diff --git a/commondata/rawdata/NUTEV/Table146.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table146.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table146.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table146.yaml diff --git a/commondata/rawdata/NUTEV/Table147.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table147.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table147.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table147.yaml diff --git a/commondata/rawdata/NUTEV/Table148.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table148.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table148.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table148.yaml diff --git a/commondata/rawdata/NUTEV/Table149.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table149.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table149.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table149.yaml diff --git a/commondata/rawdata/NUTEV/Table15.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table15.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table15.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table15.yaml diff --git a/commondata/rawdata/NUTEV/Table150.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table150.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table150.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table150.yaml diff --git a/commondata/rawdata/NUTEV/Table151.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table151.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table151.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table151.yaml diff --git a/commondata/rawdata/NUTEV/Table152.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table152.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table152.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table152.yaml diff --git a/commondata/rawdata/NUTEV/Table153.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table153.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table153.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table153.yaml diff --git a/commondata/rawdata/NUTEV/Table154.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table154.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table154.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table154.yaml diff --git a/commondata/rawdata/NUTEV/Table155.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table155.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table155.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table155.yaml diff --git a/commondata/rawdata/NUTEV/Table156.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table156.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table156.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table156.yaml diff --git a/commondata/rawdata/NUTEV/Table157.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table157.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table157.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table157.yaml diff --git a/commondata/rawdata/NUTEV/Table158.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table158.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table158.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table158.yaml diff --git a/commondata/rawdata/NUTEV/Table159.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table159.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table159.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table159.yaml diff --git a/commondata/rawdata/NUTEV/Table16.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table16.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table16.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table16.yaml diff --git a/commondata/rawdata/NUTEV/Table17.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table17.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table17.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table17.yaml diff --git a/commondata/rawdata/NUTEV/Table18.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table18.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table18.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table18.yaml diff --git a/commondata/rawdata/NUTEV/Table19.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table19.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table19.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table19.yaml diff --git a/commondata/rawdata/NUTEV/Table2.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table2.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table2.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table2.yaml diff --git a/commondata/rawdata/NUTEV/Table20.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table20.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table20.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table20.yaml diff --git a/commondata/rawdata/NUTEV/Table21.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table21.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table21.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table21.yaml diff --git a/commondata/rawdata/NUTEV/Table22.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table22.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table22.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table22.yaml diff --git a/commondata/rawdata/NUTEV/Table23.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table23.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table23.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table23.yaml diff --git a/commondata/rawdata/NUTEV/Table24.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table24.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table24.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table24.yaml diff --git a/commondata/rawdata/NUTEV/Table25.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table25.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table25.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table25.yaml diff --git a/commondata/rawdata/NUTEV/Table26.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table26.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table26.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table26.yaml diff --git a/commondata/rawdata/NUTEV/Table27.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table27.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table27.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table27.yaml diff --git a/commondata/rawdata/NUTEV/Table28.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table28.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table28.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table28.yaml diff --git a/commondata/rawdata/NUTEV/Table29.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table29.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table29.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table29.yaml diff --git a/commondata/rawdata/NUTEV/Table3.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table3.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table3.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table3.yaml diff --git a/commondata/rawdata/NUTEV/Table30.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table30.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table30.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table30.yaml diff --git a/commondata/rawdata/NUTEV/Table31.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table31.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table31.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table31.yaml diff --git a/commondata/rawdata/NUTEV/Table32.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table32.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table32.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table32.yaml diff --git a/commondata/rawdata/NUTEV/Table33.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table33.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table33.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table33.yaml diff --git a/commondata/rawdata/NUTEV/Table34.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table34.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table34.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table34.yaml diff --git a/commondata/rawdata/NUTEV/Table35.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table35.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table35.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table35.yaml diff --git a/commondata/rawdata/NUTEV/Table36.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table36.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table36.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table36.yaml diff --git a/commondata/rawdata/NUTEV/Table37.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table37.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table37.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table37.yaml diff --git a/commondata/rawdata/NUTEV/Table38.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table38.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table38.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table38.yaml diff --git a/commondata/rawdata/NUTEV/Table39.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table39.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table39.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table39.yaml diff --git a/commondata/rawdata/NUTEV/Table4.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table4.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table4.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table4.yaml diff --git a/commondata/rawdata/NUTEV/Table40.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table40.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table40.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table40.yaml diff --git a/commondata/rawdata/NUTEV/Table41.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table41.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table41.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table41.yaml diff --git a/commondata/rawdata/NUTEV/Table42.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table42.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table42.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table42.yaml diff --git a/commondata/rawdata/NUTEV/Table43.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table43.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table43.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table43.yaml diff --git a/commondata/rawdata/NUTEV/Table44.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table44.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table44.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table44.yaml diff --git a/commondata/rawdata/NUTEV/Table45.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table45.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table45.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table45.yaml diff --git a/commondata/rawdata/NUTEV/Table46.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table46.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table46.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table46.yaml diff --git a/commondata/rawdata/NUTEV/Table47.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table47.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table47.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table47.yaml diff --git a/commondata/rawdata/NUTEV/Table48.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table48.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table48.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table48.yaml diff --git a/commondata/rawdata/NUTEV/Table49.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table49.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table49.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table49.yaml diff --git a/commondata/rawdata/NUTEV/Table5.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table5.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table5.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table5.yaml diff --git a/commondata/rawdata/NUTEV/Table50.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table50.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table50.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table50.yaml diff --git a/commondata/rawdata/NUTEV/Table51.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table51.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table51.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table51.yaml diff --git a/commondata/rawdata/NUTEV/Table52.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table52.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table52.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table52.yaml diff --git a/commondata/rawdata/NUTEV/Table53.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table53.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table53.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table53.yaml diff --git a/commondata/rawdata/NUTEV/Table54.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table54.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table54.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table54.yaml diff --git a/commondata/rawdata/NUTEV/Table55.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table55.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table55.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table55.yaml diff --git a/commondata/rawdata/NUTEV/Table56.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table56.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table56.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table56.yaml diff --git a/commondata/rawdata/NUTEV/Table57.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table57.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table57.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table57.yaml diff --git a/commondata/rawdata/NUTEV/Table58.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table58.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table58.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table58.yaml diff --git a/commondata/rawdata/NUTEV/Table59.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table59.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table59.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table59.yaml diff --git a/commondata/rawdata/NUTEV/Table6.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table6.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table6.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table6.yaml diff --git a/commondata/rawdata/NUTEV/Table60.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table60.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table60.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table60.yaml diff --git a/commondata/rawdata/NUTEV/Table61.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table61.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table61.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table61.yaml diff --git a/commondata/rawdata/NUTEV/Table62.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table62.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table62.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table62.yaml diff --git a/commondata/rawdata/NUTEV/Table63.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table63.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table63.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table63.yaml diff --git a/commondata/rawdata/NUTEV/Table64.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table64.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table64.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table64.yaml diff --git a/commondata/rawdata/NUTEV/Table65.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table65.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table65.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table65.yaml diff --git a/commondata/rawdata/NUTEV/Table66.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table66.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table66.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table66.yaml diff --git a/commondata/rawdata/NUTEV/Table67.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table67.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table67.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table67.yaml diff --git a/commondata/rawdata/NUTEV/Table68.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table68.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table68.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table68.yaml diff --git a/commondata/rawdata/NUTEV/Table69.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table69.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table69.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table69.yaml diff --git a/commondata/rawdata/NUTEV/Table7.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table7.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table7.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table7.yaml diff --git a/commondata/rawdata/NUTEV/Table70.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table70.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table70.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table70.yaml diff --git a/commondata/rawdata/NUTEV/Table71.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table71.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table71.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table71.yaml diff --git a/commondata/rawdata/NUTEV/Table72.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table72.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table72.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table72.yaml diff --git a/commondata/rawdata/NUTEV/Table73.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table73.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table73.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table73.yaml diff --git a/commondata/rawdata/NUTEV/Table74.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table74.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table74.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table74.yaml diff --git a/commondata/rawdata/NUTEV/Table75.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table75.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table75.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table75.yaml diff --git a/commondata/rawdata/NUTEV/Table76.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table76.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table76.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table76.yaml diff --git a/commondata/rawdata/NUTEV/Table77.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table77.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table77.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table77.yaml diff --git a/commondata/rawdata/NUTEV/Table78.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table78.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table78.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table78.yaml diff --git a/commondata/rawdata/NUTEV/Table79.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table79.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table79.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table79.yaml diff --git a/commondata/rawdata/NUTEV/Table8.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table8.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table8.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table8.yaml diff --git a/commondata/rawdata/NUTEV/Table80.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table80.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table80.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table80.yaml diff --git a/commondata/rawdata/NUTEV/Table81.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table81.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table81.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table81.yaml diff --git a/commondata/rawdata/NUTEV/Table82.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table82.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table82.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table82.yaml diff --git a/commondata/rawdata/NUTEV/Table83.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table83.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table83.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table83.yaml diff --git a/commondata/rawdata/NUTEV/Table84.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table84.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table84.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table84.yaml diff --git a/commondata/rawdata/NUTEV/Table85.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table85.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table85.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table85.yaml diff --git a/commondata/rawdata/NUTEV/Table86.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table86.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table86.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table86.yaml diff --git a/commondata/rawdata/NUTEV/Table87.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table87.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table87.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table87.yaml diff --git a/commondata/rawdata/NUTEV/Table88.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table88.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table88.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table88.yaml diff --git a/commondata/rawdata/NUTEV/Table89.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table89.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table89.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table89.yaml diff --git a/commondata/rawdata/NUTEV/Table9.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table9.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table9.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table9.yaml diff --git a/commondata/rawdata/NUTEV/Table90.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table90.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table90.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table90.yaml diff --git a/commondata/rawdata/NUTEV/Table91.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table91.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table91.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table91.yaml diff --git a/commondata/rawdata/NUTEV/Table92.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table92.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table92.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table92.yaml diff --git a/commondata/rawdata/NUTEV/Table93.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table93.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table93.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table93.yaml diff --git a/commondata/rawdata/NUTEV/Table94.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table94.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table94.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table94.yaml diff --git a/commondata/rawdata/NUTEV/Table95.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table95.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table95.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table95.yaml diff --git a/commondata/rawdata/NUTEV/Table96.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table96.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table96.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table96.yaml diff --git a/commondata/rawdata/NUTEV/Table97.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table97.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table97.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table97.yaml diff --git a/commondata/rawdata/NUTEV/Table98.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table98.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table98.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table98.yaml diff --git a/commondata/rawdata/NUTEV/Table99.yaml b/nnusf_data/commondata/rawdata/NUTEV/Table99.yaml similarity index 100% rename from commondata/rawdata/NUTEV/Table99.yaml rename to nnusf_data/commondata/rawdata/NUTEV/Table99.yaml diff --git a/commondata/rawdata/NUTEV/submission.yaml b/nnusf_data/commondata/rawdata/NUTEV/submission.yaml similarity index 100% rename from commondata/rawdata/NUTEV/submission.yaml rename to nnusf_data/commondata/rawdata/NUTEV/submission.yaml diff --git a/commondata/uncertainties/UNC_BEBCWA59_F2.csv b/nnusf_data/commondata/uncertainties/UNC_BEBCWA59_F2.csv similarity index 100% rename from commondata/uncertainties/UNC_BEBCWA59_F2.csv rename to nnusf_data/commondata/uncertainties/UNC_BEBCWA59_F2.csv diff --git a/commondata/uncertainties/UNC_BEBCWA59_F2_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_BEBCWA59_F2_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_BEBCWA59_F2_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_BEBCWA59_F2_MATCHING.csv diff --git a/commondata/uncertainties/UNC_BEBCWA59_F3.csv b/nnusf_data/commondata/uncertainties/UNC_BEBCWA59_F3.csv similarity index 100% rename from commondata/uncertainties/UNC_BEBCWA59_F3.csv rename to nnusf_data/commondata/uncertainties/UNC_BEBCWA59_F3.csv diff --git a/commondata/uncertainties/UNC_BEBCWA59_F3_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_BEBCWA59_F3_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_BEBCWA59_F3_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_BEBCWA59_F3_MATCHING.csv diff --git a/commondata/uncertainties/UNC_CCFR_F2.csv b/nnusf_data/commondata/uncertainties/UNC_CCFR_F2.csv similarity index 100% rename from commondata/uncertainties/UNC_CCFR_F2.csv rename to nnusf_data/commondata/uncertainties/UNC_CCFR_F2.csv diff --git a/commondata/uncertainties/UNC_CCFR_F2_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_CCFR_F2_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_CCFR_F2_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_CCFR_F2_MATCHING.csv diff --git a/commondata/uncertainties/UNC_CCFR_F3.csv b/nnusf_data/commondata/uncertainties/UNC_CCFR_F3.csv similarity index 100% rename from commondata/uncertainties/UNC_CCFR_F3.csv rename to nnusf_data/commondata/uncertainties/UNC_CCFR_F3.csv diff --git a/commondata/uncertainties/UNC_CCFR_F3_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_CCFR_F3_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_CCFR_F3_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_CCFR_F3_MATCHING.csv diff --git a/commondata/uncertainties/UNC_CDHSW_DXDYNUB.csv b/nnusf_data/commondata/uncertainties/UNC_CDHSW_DXDYNUB.csv similarity index 100% rename from commondata/uncertainties/UNC_CDHSW_DXDYNUB.csv rename to nnusf_data/commondata/uncertainties/UNC_CDHSW_DXDYNUB.csv diff --git a/commondata/uncertainties/UNC_CDHSW_DXDYNUB_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_CDHSW_DXDYNUB_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_CDHSW_DXDYNUB_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_CDHSW_DXDYNUB_MATCHING.csv diff --git a/commondata/uncertainties/UNC_CDHSW_DXDYNUU.csv b/nnusf_data/commondata/uncertainties/UNC_CDHSW_DXDYNUU.csv similarity index 100% rename from commondata/uncertainties/UNC_CDHSW_DXDYNUU.csv rename to nnusf_data/commondata/uncertainties/UNC_CDHSW_DXDYNUU.csv diff --git a/commondata/uncertainties/UNC_CDHSW_DXDYNUU_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_CDHSW_DXDYNUU_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_CDHSW_DXDYNUU_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_CDHSW_DXDYNUU_MATCHING.csv diff --git a/commondata/uncertainties/UNC_CDHSW_F2.csv b/nnusf_data/commondata/uncertainties/UNC_CDHSW_F2.csv similarity index 100% rename from commondata/uncertainties/UNC_CDHSW_F2.csv rename to nnusf_data/commondata/uncertainties/UNC_CDHSW_F2.csv diff --git a/commondata/uncertainties/UNC_CDHSW_F2_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_CDHSW_F2_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_CDHSW_F2_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_CDHSW_F2_MATCHING.csv diff --git a/commondata/uncertainties/UNC_CDHSW_F3.csv b/nnusf_data/commondata/uncertainties/UNC_CDHSW_F3.csv similarity index 100% rename from commondata/uncertainties/UNC_CDHSW_F3.csv rename to nnusf_data/commondata/uncertainties/UNC_CDHSW_F3.csv diff --git a/commondata/uncertainties/UNC_CDHSW_F3_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_CDHSW_F3_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_CDHSW_F3_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_CDHSW_F3_MATCHING.csv diff --git a/commondata/uncertainties/UNC_CDHSW_FW.csv b/nnusf_data/commondata/uncertainties/UNC_CDHSW_FW.csv similarity index 100% rename from commondata/uncertainties/UNC_CDHSW_FW.csv rename to nnusf_data/commondata/uncertainties/UNC_CDHSW_FW.csv diff --git a/commondata/uncertainties/UNC_CDHSW_FW_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_CDHSW_FW_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_CDHSW_FW_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_CDHSW_FW_MATCHING.csv diff --git a/commondata/uncertainties/UNC_CHARM_F2.csv b/nnusf_data/commondata/uncertainties/UNC_CHARM_F2.csv similarity index 100% rename from commondata/uncertainties/UNC_CHARM_F2.csv rename to nnusf_data/commondata/uncertainties/UNC_CHARM_F2.csv diff --git a/commondata/uncertainties/UNC_CHARM_F3.csv b/nnusf_data/commondata/uncertainties/UNC_CHARM_F3.csv similarity index 100% rename from commondata/uncertainties/UNC_CHARM_F3.csv rename to nnusf_data/commondata/uncertainties/UNC_CHARM_F3.csv diff --git a/commondata/uncertainties/UNC_CHARM_QBAR.csv b/nnusf_data/commondata/uncertainties/UNC_CHARM_QBAR.csv similarity index 100% rename from commondata/uncertainties/UNC_CHARM_QBAR.csv rename to nnusf_data/commondata/uncertainties/UNC_CHARM_QBAR.csv diff --git a/commondata/uncertainties/UNC_CHORUS_DXDYNUB.csv b/nnusf_data/commondata/uncertainties/UNC_CHORUS_DXDYNUB.csv similarity index 100% rename from commondata/uncertainties/UNC_CHORUS_DXDYNUB.csv rename to nnusf_data/commondata/uncertainties/UNC_CHORUS_DXDYNUB.csv diff --git a/commondata/uncertainties/UNC_CHORUS_DXDYNUB_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_CHORUS_DXDYNUB_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_CHORUS_DXDYNUB_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_CHORUS_DXDYNUB_MATCHING.csv diff --git a/commondata/uncertainties/UNC_CHORUS_DXDYNUU.csv b/nnusf_data/commondata/uncertainties/UNC_CHORUS_DXDYNUU.csv similarity index 100% rename from commondata/uncertainties/UNC_CHORUS_DXDYNUU.csv rename to nnusf_data/commondata/uncertainties/UNC_CHORUS_DXDYNUU.csv diff --git a/commondata/uncertainties/UNC_CHORUS_DXDYNUU_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_CHORUS_DXDYNUU_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_CHORUS_DXDYNUU_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_CHORUS_DXDYNUU_MATCHING.csv diff --git a/commondata/uncertainties/UNC_CHORUS_F2.csv b/nnusf_data/commondata/uncertainties/UNC_CHORUS_F2.csv similarity index 100% rename from commondata/uncertainties/UNC_CHORUS_F2.csv rename to nnusf_data/commondata/uncertainties/UNC_CHORUS_F2.csv diff --git a/commondata/uncertainties/UNC_CHORUS_F2_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_CHORUS_F2_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_CHORUS_F2_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_CHORUS_F2_MATCHING.csv diff --git a/commondata/uncertainties/UNC_CHORUS_F3.csv b/nnusf_data/commondata/uncertainties/UNC_CHORUS_F3.csv similarity index 100% rename from commondata/uncertainties/UNC_CHORUS_F3.csv rename to nnusf_data/commondata/uncertainties/UNC_CHORUS_F3.csv diff --git a/commondata/uncertainties/UNC_CHORUS_F3_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_CHORUS_F3_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_CHORUS_F3_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_CHORUS_F3_MATCHING.csv diff --git a/commondata/uncertainties/UNC_NUTEV_DXDYNUB.csv b/nnusf_data/commondata/uncertainties/UNC_NUTEV_DXDYNUB.csv similarity index 100% rename from commondata/uncertainties/UNC_NUTEV_DXDYNUB.csv rename to nnusf_data/commondata/uncertainties/UNC_NUTEV_DXDYNUB.csv diff --git a/commondata/uncertainties/UNC_NUTEV_DXDYNUB_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_NUTEV_DXDYNUB_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_NUTEV_DXDYNUB_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_NUTEV_DXDYNUB_MATCHING.csv diff --git a/commondata/uncertainties/UNC_NUTEV_DXDYNUU.csv b/nnusf_data/commondata/uncertainties/UNC_NUTEV_DXDYNUU.csv similarity index 100% rename from commondata/uncertainties/UNC_NUTEV_DXDYNUU.csv rename to nnusf_data/commondata/uncertainties/UNC_NUTEV_DXDYNUU.csv diff --git a/commondata/uncertainties/UNC_NUTEV_DXDYNUU_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_NUTEV_DXDYNUU_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_NUTEV_DXDYNUU_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_NUTEV_DXDYNUU_MATCHING.csv diff --git a/commondata/uncertainties/UNC_NUTEV_F2.csv b/nnusf_data/commondata/uncertainties/UNC_NUTEV_F2.csv similarity index 100% rename from commondata/uncertainties/UNC_NUTEV_F2.csv rename to nnusf_data/commondata/uncertainties/UNC_NUTEV_F2.csv diff --git a/commondata/uncertainties/UNC_NUTEV_F2_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_NUTEV_F2_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_NUTEV_F2_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_NUTEV_F2_MATCHING.csv diff --git a/commondata/uncertainties/UNC_NUTEV_F3.csv b/nnusf_data/commondata/uncertainties/UNC_NUTEV_F3.csv similarity index 100% rename from commondata/uncertainties/UNC_NUTEV_F3.csv rename to nnusf_data/commondata/uncertainties/UNC_NUTEV_F3.csv diff --git a/commondata/uncertainties/UNC_NUTEV_F3_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_NUTEV_F3_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_NUTEV_F3_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_NUTEV_F3_MATCHING.csv diff --git a/commondata/uncertainties/UNC_PROTONBC_DXDYNUB_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_PROTONBC_DXDYNUB_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_PROTONBC_DXDYNUB_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_PROTONBC_DXDYNUB_MATCHING.csv diff --git a/commondata/uncertainties/UNC_PROTONBC_DXDYNUU_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_PROTONBC_DXDYNUU_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_PROTONBC_DXDYNUU_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_PROTONBC_DXDYNUU_MATCHING.csv diff --git a/commondata/uncertainties/UNC_PROTONBC_F2_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_PROTONBC_F2_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_PROTONBC_F2_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_PROTONBC_F2_MATCHING.csv diff --git a/commondata/uncertainties/UNC_PROTONBC_F3_MATCHING.csv b/nnusf_data/commondata/uncertainties/UNC_PROTONBC_F3_MATCHING.csv similarity index 100% rename from commondata/uncertainties/UNC_PROTONBC_F3_MATCHING.csv rename to nnusf_data/commondata/uncertainties/UNC_PROTONBC_F3_MATCHING.csv diff --git a/pyproject.toml b/pyproject.toml index 37ab86bf..a1d0900f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,9 +24,7 @@ classifiers = [ ] repository = "https://github.com/NNPDF/nnusf" include = [ - { path = "tests", format = "sdist" }, - { path = "commondata", format = ["sdist", "wheel"] }, - { path = "coefficients", format = ["sdist", "wheel"] } + { path = "tests", format = "sdist" } ] packages = [{ include = "nnusf", from = "src" },] @@ -63,6 +61,7 @@ pdbpp = "^0.10.3" [tool.poetry.scripts] nnu = "nnusf.cli:command" +nns = "nnusf.get:command" [tool.poetry-dynamic-versioning] enable = true diff --git a/runcards/bot_runcard.yml b/runcards/bot_runcard.yml index 85723f37..75b3c2e7 100644 --- a/runcards/bot_runcard.yml +++ b/runcards/bot_runcard.yml @@ -18,20 +18,6 @@ experiments: - {dataset: CHORUS_DXDYNUU, frac: 0.75} - {dataset: NUTEV_DXDYNUB, frac: 0.75} - {dataset: NUTEV_DXDYNUU, frac: 0.75} -# -- PROTON BC DATASETS (Matching A=1) -- -- {dataset: PROTONBC_DXDYNUU_MATCHING, frac: 0.75} -- {dataset: PROTONBC_DXDYNUB_MATCHING, frac: 0.75} -# -- MATCHING AT HIGH Q2 -- -- {dataset: BEBCWA59_F2_MATCHING, frac: 0.75} -- {dataset: BEBCWA59_F3_MATCHING, frac: 0.75} -- {dataset: CCFR_F2_MATCHING, frac: 0.75} -- {dataset: CCFR_F3_MATCHING, frac: 0.75} -- {dataset: CDHSW_DXDYNUU_MATCHING, frac: 0.75} -- {dataset: CDHSW_DXDYNUB_MATCHING, frac: 0.75} -- {dataset: CHORUS_DXDYNUB_MATCHING, frac: 0.75} -- {dataset: CHORUS_DXDYNUU_MATCHING, frac: 0.75} -- {dataset: NUTEV_DXDYNUB_MATCHING, frac: 0.75} -- {dataset: NUTEV_DXDYNUU_MATCHING, frac: 0.75} # Datasets not included in the fit but whose Chi2 # should be evaluated when generating the report @@ -64,8 +50,8 @@ global_seeds: 1865683875 # Define Neural Network Parameters fit_parameters: - epochs: 50_000 - stopping_patience: 2_000 + epochs: 5_000 + stopping_patience: 200 units_per_layer: [70, 55, 40, 20, 20] activation_per_layer: [tanh, tanh, tanh, tanh, selu] optimizer_parameters: diff --git a/src/nnusf/cli/__init__.py b/src/nnusf/cli/__init__.py index 516ff92a..c4708e3e 100644 --- a/src/nnusf/cli/__init__.py +++ b/src/nnusf/cli/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- """Provide 'nnu' CLI.""" -from . import data, extra, fit, log, plot, report, theory +from . import extra, data, fit, log, plot, report, theory from .base import command diff --git a/src/nnusf/cli/data.py b/src/nnusf/cli/data.py index 554fdb70..683b532d 100644 --- a/src/nnusf/cli/data.py +++ b/src/nnusf/cli/data.py @@ -6,13 +6,16 @@ from ..data import coefficients, combine_tables, filters, matching_grids from . import base +from appdirs import user_data_dir + +USERDIR = pathlib.Path(user_data_dir()) dataset_path = click.argument( - "data", nargs=-1, type=click.Path(exists=True, path_type=pathlib.Path) + "data", nargs=-1, type=click.Path(exists=True, path_type=pathlib.Path), ) grid_path = click.argument( - "data", type=click.Path(exists=True, path_type=pathlib.Path) + "data", type=click.Path(exists=True, path_type=pathlib.Path), ) obs_type = click.argument("obstype", type=str) @@ -22,10 +25,17 @@ "-d", "--destination", type=click.Path(exists=True, path_type=pathlib.Path), - default=pathlib.Path.cwd().absolute() / "commondata", - help="Alternative destination path (default: $PWD/commondata)", + default=USERDIR.joinpath("nnusf/commondata"), + help="Alternative destination path (default: ${NNUSF}/commondata)", ) +destination_coefficients = click.option( + "-d", + "--destination", + type=click.Path(exists=True, path_type=pathlib.Path), + default=USERDIR.joinpath("nnusf/coefficients"), + help="Alternative destination path (default: ${NNUSF}/coefficients", +) @base.command.group("data") def subcommand(): @@ -38,13 +48,17 @@ def subcommand(): def sub_combine(data, destination): """Combine data tables into a unique one. - The operation is repeated for each DATA path provided (multiple values allowed), + The operation is repeated for each DATA path provided + (multiple values allowed), e.g.: - nnu data combine commondata/data/* + nnu data combine ${NNUSF}/commondata/data/* to repeat the operation for all dataset stored in `data`. + To know the ${NNUSF} path, just run the following: + + nns get print_userdir_path """ combine_tables.main(data, destination) @@ -59,15 +73,18 @@ def filter_all_data(data): The command is run as follows: - nnu data filter commondata/rawdata/* + nnu data filter ${NNUSF}/commondata/rawdata/* + + To know the ${NNUSF} path, just run the following: + nns get print_userdir_path """ filters.main(data) @subcommand.command("coefficients") @dataset_path -@destination_path +@destination_coefficients def sub_coefficients(data, destination): """Provide coefficients for the observables. @@ -77,10 +94,13 @@ def sub_coefficients(data, destination): The operation is repeated for each DATA path provided (multiple values allowed), e.g.: - nnu data coefficients commondata/data/* + nnu data coefficients ${NNUSF}/commondata/data/* to repeat the operation for all dataset stored in `data`. + To know the ${NNUSF} path, just run the following: + + nns get print_userdir_path """ coefficients.main(data, destination) diff --git a/src/nnusf/data/filters.py b/src/nnusf/data/filters.py index faf13405..62ac8881 100644 --- a/src/nnusf/data/filters.py +++ b/src/nnusf/data/filters.py @@ -1,18 +1,22 @@ # -*- coding: utf-8 -*- """Filter data from original raw tables. -Data are then provided in a custom "CommonData" format (specific to this -structure function project). +Data are then provided in a custom "CommonData" format +(specific to this structure function project). """ import importlib import logging import sys + from pathlib import Path +from appdirs import user_data_dir _logger = logging.getLogger(__name__) +USERDIR = Path(user_data_dir()) + def main(list_of_datasets: list[Path]) -> None: """Filter all the datasets at once. @@ -30,11 +34,12 @@ def main(list_of_datasets: list[Path]) -> None: exp = dataset.stem.strip("DATA_").lower() _logger.info(f"Filter dataset from the '{exp}' experiment") - path_to_commondata = dataset.parents[1] + path_to_commondata = USERDIR.joinpath("nnusf/commondata") mod_name = f"filter_{exp}" try: - sys.path.insert(0, str((path_to_commondata / "filters").absolute())) + path_to_filter = Path(__file__).parents[1].absolute() + sys.path.insert(0, str((path_to_filter / "filters").absolute())) mod = importlib.import_module(mod_name) mod.main(path_to_commondata) # We do not really want to fail at this point diff --git a/src/nnusf/data/matching_grids.py b/src/nnusf/data/matching_grids.py index fae73bb2..ab6beb24 100644 --- a/src/nnusf/data/matching_grids.py +++ b/src/nnusf/data/matching_grids.py @@ -23,9 +23,11 @@ dump_info_file, write_to_csv, ) +from appdirs import user_data_dir _logger = logging.getLogger(__name__) -PARRENT_PATH = pathlib.Path(__file__).parents[3].joinpath("commondata") + +PARRENT_PATH = pathlib.Path(user_data_dir()).joinpath("nnusf/commondata") GRID_SPECS_PATH = PARRENT_PATH.joinpath("matching-grids.yml") GRID_SPECS_DICT = yaml.safe_load(GRID_SPECS_PATH.read_text()) diff --git a/commondata/filters/filter_bebcwa59.py b/src/nnusf/filters/filter_bebcwa59.py similarity index 100% rename from commondata/filters/filter_bebcwa59.py rename to src/nnusf/filters/filter_bebcwa59.py diff --git a/commondata/filters/filter_ccfr.py b/src/nnusf/filters/filter_ccfr.py similarity index 100% rename from commondata/filters/filter_ccfr.py rename to src/nnusf/filters/filter_ccfr.py diff --git a/commondata/filters/filter_cdhsw.py b/src/nnusf/filters/filter_cdhsw.py similarity index 100% rename from commondata/filters/filter_cdhsw.py rename to src/nnusf/filters/filter_cdhsw.py diff --git a/commondata/filters/filter_charm.py b/src/nnusf/filters/filter_charm.py similarity index 100% rename from commondata/filters/filter_charm.py rename to src/nnusf/filters/filter_charm.py diff --git a/commondata/filters/filter_chorus.py b/src/nnusf/filters/filter_chorus.py similarity index 100% rename from commondata/filters/filter_chorus.py rename to src/nnusf/filters/filter_chorus.py diff --git a/commondata/filters/filter_nutev.py b/src/nnusf/filters/filter_nutev.py similarity index 100% rename from commondata/filters/filter_nutev.py rename to src/nnusf/filters/filter_nutev.py diff --git a/src/nnusf/get/__init__.py b/src/nnusf/get/__init__.py new file mode 100644 index 00000000..de4f3b34 --- /dev/null +++ b/src/nnusf/get/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +"""Provide 'nnu' CLI.""" +from . import gettheory, log +from .base import command diff --git a/src/nnusf/get/base.py b/src/nnusf/get/base.py new file mode 100644 index 00000000..4b0991d4 --- /dev/null +++ b/src/nnusf/get/base.py @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- +import click + +CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"]) + + +@click.group(context_settings=CONTEXT_SETTINGS) +def command(): + pass diff --git a/src/nnusf/get/gettheory.py b/src/nnusf/get/gettheory.py new file mode 100644 index 00000000..4286aea6 --- /dev/null +++ b/src/nnusf/get/gettheory.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +"""Provide extra scripts subcommand.""" +import click + +from ..scripts import gettheory +from . import base +from appdirs import user_data_dir +from pathlib import Path +from rich.console import Console + +console = Console() + + +@base.command.group("get") +def subcommand(): + """Commands to download commondata theory.""" + + +@subcommand.command("theory") +def sub_get_theory(): + """Download the theory and store in user directory.""" + gettheory.main() + + +@subcommand.command("print_userdir_path") +def sub_print_userdir(): + """Print the user directory path.""" + path = Path(user_data_dir()).joinpath("nnusf") + console.print(f"NNUSF USERDIR: '{path}'", style="bold red") diff --git a/src/nnusf/get/log.py b/src/nnusf/get/log.py new file mode 100644 index 00000000..37fd73c3 --- /dev/null +++ b/src/nnusf/get/log.py @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- +import logging + +from rich.logging import RichHandler + +logging.basicConfig( + level=logging.INFO, + format="%(message)s", + datefmt="[%X]", + handlers=[RichHandler()], +) diff --git a/src/nnusf/scripts/gettheory.py b/src/nnusf/scripts/gettheory.py new file mode 100644 index 00000000..67c0adb8 --- /dev/null +++ b/src/nnusf/scripts/gettheory.py @@ -0,0 +1,94 @@ +# -*- coding: utf-8 -*- +import logging +import requests +import tarfile +import tempfile + +from appdirs import AppDirs +from pathlib import Path +from typing import Optional + +_logger = logging.getLogger(__name__) + + +def setup_directory(dirname: str) -> Path: + """Set up the user data directories. + + Parameters: + ----------- + dirname: str + Name of the App directory + + Returns: + -------- + pathlib.Path: + Path to the user data folder + """ + dirs = AppDirs(dirname, "nnsfnu") + return Path(dirs.user_data_dir) + + +def extract_tar(tempath: Path, userpath: Path) -> None: + """Extract the .tar.gz file from the temporary directory + and copy the resulting file to the user directory. + + Parameters: + ---------- + tempath: Path + Path to the temporary folder containing the compressed + file + userpath: Path + Path to the user data folder + """ + with tarfile.open(tempath, "r") as targz: + targz.extractall(path=userpath) + + +def download_targz(response, tempdir: Path, filename: str) -> None: + """Download the .tar.gz file and store the file in the + specified temporary directory. + + Parameters: + ---------- + tempdir: Path + Path to the temporary directory + filename: str + Name of the .tar.gz file + """ + with open(tempdir.joinpath(filename), 'wb') as ofile: + ofile.write(response.raw.read()) + _logger.info(f"Theory downloaded succesfully in '{tempdir}'") + + +def get_theory(userdir: Path) -> None: + """Download the theory in a temporary directory and + extract it to the user data folder. + + Parameters: + ----------- + userdir: Path + Path to the user data folder + """ + name = "nnusf_data.tar.gz" + url = f"https://data.nnpdf.science/NNSFnu/data/{name}" + + try: + response = requests.get(url, stream=True) + response.raise_for_status() + except requests.exceptions.HTTPError as err: + _logger.error(err) + + with tempfile.TemporaryDirectory() as tmpdir: + tmpdir = Path(tmpdir) + + download_targz(response, tmpdir, name) + + with tarfile.open(tmpdir.joinpath(name), "r") as trf: + trf.extractall(path=userdir) + + _logger.info(f"Theory extracted succesfully in '{userdir}'") + + +def main(): + user_dir = setup_directory(dirname="nnusf") + get_theory(userdir=user_dir) diff --git a/src/nnusf/sffit/load_data.py b/src/nnusf/sffit/load_data.py index ab6a6643..a35ca0d5 100644 --- a/src/nnusf/sffit/load_data.py +++ b/src/nnusf/sffit/load_data.py @@ -9,12 +9,14 @@ from ..data.loader import Loader from .scaling import rescale_inputs +from appdirs import user_data_dir _logger = logging.getLogger(__name__) -curr_path = pathlib.Path(__file__) -path_to_commondata = curr_path.parents[3].joinpath("commondata") -path_to_coefficients = curr_path.parents[3].joinpath("coefficients") +USERDIR = pathlib.Path(user_data_dir()) + +path_to_commondata = USERDIR.joinpath("nnusf/commondata") +path_to_coefficients = USERDIR.joinpath("nnusf/coefficients") def construct_expdata_instance(experiment_list, kincuts, verbose=True): diff --git a/tests/test_loader.py b/tests/test_loader.py index fd977303..604dbd25 100644 --- a/tests/test_loader.py +++ b/tests/test_loader.py @@ -1,12 +1,11 @@ # -*- coding: utf-8 -*- -import pathlib - +from pathlib import Path +from appdirs import user_data_dir from nnusf.data.loader import Loader -path_to_commondata = pathlib.Path(__file__).parents[1].joinpath("commondata") -path_to_coefficients = ( - pathlib.Path(__file__).parents[1].joinpath("coefficients") -) +USERDIR = Path(user_data_dir()) +path_to_commondata = USERDIR.joinpath("nnusf/commondata") +path_to_coefficients = USERDIR.joinpath("nnusf/coefficients") class TestLoader: