diff --git a/.github/workflows/python_installation.yml b/.github/workflows/python_installation.yml new file mode 100644 index 0000000000..35c7b209e7 --- /dev/null +++ b/.github/workflows/python_installation.yml @@ -0,0 +1,44 @@ +name: Test the python installation + +on: [push] + +jobs: + build: + strategy: + matrix: + os: [ubuntu-latest] + python-version: ["3.10", "3.11"] + include: + - os: ubuntu-latest + CONDA_OS: linux-64 + fail-fast: false + runs-on: ${{ matrix.os }} + env: + NETRC_FILE: ${{ secrets.NETRC_FILE }} + NNPDF_SSH_KEY: ${{ secrets.NNPDF_SSH_KEY }} + steps: + - uses: actions/checkout@v4 + - uses: conda-incubator/setup-miniconda@v3 + with: + python-version: ${{ matrix.python-version }} + - name: Setup conda and install LHAPDF and pandoc + shell: bash -l {0} + run: | + echo "$NETRC_FILE" | base64 --decode > ~/.netrc + conda install -n base conda-libmamba-solver + conda config --set solver libmamba + conda config --append channels conda-forge + conda config --prepend channels https://packages.nnpdf.science/public + conda config --set show_channel_urls true + conda install lhapdf pandoc + conda activate test + - name: Install nnpdf with testing and qed extras + shell: bash -l {0} + run: | + conda activate test + pip install .[qed,tests] + - name: Test n3fit and validphys + shell: bash -l {0} + run: | + conda activate test + pytest --pyargs --mpl validphys n3fit diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a78fc04b0b..82cbf54522 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,7 +4,7 @@ name: Tests on: [push] concurrency: - group: ${{ github.ref }} + group: ${{ github.head_ref || github.ref }} cancel-in-progress: true jobs: diff --git a/.gitignore b/.gitignore index 0fbe0bcd81..066d2a6b01 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,13 @@ +# extra files created to hold the versioning information +validphys2/src/validphys/_version.py + # extra files created by cmake libnnpdf/nnprofile.yaml +libnnpdf/REAMDE.md libnnpdf/scripts/nnpdf.pc libnnpdf/src/NNPDF/common.h libnnpdf/src/NNPDF/config.h +evolven3fit/evolven3fit.cc # Created by https://www.gitignore.io/api/macos diff --git a/CMakeLists.txt b/CMakeLists.txt index f04bd55248..2dd7b4e4ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,6 +28,7 @@ set(VERSION "\"4.0\"") set(nnpdfcpp_VERSION 4.0) # check for dependencies +find_package(PythonInterp 3 REQUIRED) find_package(PkgConfig REQUIRED) pkg_search_module(LIBARCHIVE REQUIRED libarchive) pkg_search_module(SQLITE3 REQUIRED sqlite3) @@ -35,14 +36,7 @@ pkg_search_module(GSL REQUIRED gsl) pkg_search_module(YAML REQUIRED yaml-cpp) -option(ENABLE_OPENMP "Enable openmp parallelism." OFF) -option(ENABLE_OPENMPI "Enable openMPI parallelism." OFF) -option(ENABLE_TESTS "Enable unit test" OFF) -option(ENABLE_ASAN "Enable ASAN" OFF) -option(ENABLE_DEAD_STRIP "Enable use of flag `-dead_strip-dylibs`" OFF) -option(VP_DEV "validphys in developer mode" ON) -option(N3_DEV "n3fit in developer mode" ON) -option(BURN_TAG "burn down the git tag in vp and n3fit (only local non-dev installation)" ON) +option(NNPDF_DEV "n3fit and validphys in developer mode" ON) set(PROFILE_PREFIX "" CACHE STRING "Where you store the 'data' folder. Default empty uses CMAKE_INSTALL_PREFIX/share/NNPDF.") if (PROFILE_PREFIX) @@ -51,19 +45,6 @@ else (PROFILE_PREFIX) set(PROFILE_PREFIX "${CMAKE_INSTALL_PREFIX}/share/NNPDF") endif() -if (ENABLE_OPENMPI) - set(LIBNNPDF_HAVE_MPI "#define OPENMPI") -endif() - -set(LIBNNPDF_HAVE_SSE "#define SSE_CONV") - - -if(ENABLE_OPENMP) - find_package(OpenMP REQUIRED) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") -endif(ENABLE_OPENMP) - # LHAPDF find_program(LHAPDF_CONFIG lhapdf-config REQUIRED) if (LHAPDF_CONFIG) @@ -101,7 +82,7 @@ if (APFEL_CONFIG) set(APFEL_LIBRARIES ${APFEL_LIBRARIES} CACHE STRING INTERNAL) endif(APFEL_CONFIG) -set(DEFAULT_CXX_OPTIONS "-Wall -Wextra -march=nocona -mtune=haswell -fvisibility-inlines-hidden -fmessage-length=0 -ftree-vectorize -fPIC -fstack-protector-strong -O2 -pipe") +set(DEFAULT_CXX_OPTIONS "-Wall -Wextra -fvisibility-inlines-hidden -fmessage-length=0 -ftree-vectorize -fPIC -fstack-protector-strong -O2 -pipe") #strip linker flags to avoid duplication of asan flags string(REPLACE "-fsanitize=address" "" CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}") @@ -109,93 +90,20 @@ string(REPLACE "-fsanitize=address" "" CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE set(CMAKE_ALL_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_MODULE_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS}") -#dead_strip_dylibs can cause issues, warn if we remove it -if(ENABLE_DEAD_STRIP) - if(NOT ${CMAKE_ALL_LINKER_FLAGS} MATCHES "-Wl,-dead_strip_dylibs") - message(WARNING "ENABLE_DEAD_STRIP was set true but there were no occurences of the flag `dead_strip_dylibs` found") - endif(NOT ${CMAKE_ALL_LINKER_FLAGS} MATCHES "-Wl,-dead_strip_dylibs") -else(ENABLE_DEAD_STRIP) - if(CMAKE_ALL_LINKER_FLAGS MATCHES "-Wl,-dead_strip_dylibs") - message(WARNING "removing all occurence of flag: `dead_strip_dylibs` (default behaviour). If you are sure this flag is required then ENABLE_DEAD_STRIP") - string(REPLACE "-Wl,-dead_strip_dylibs" "" CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}") - string(REPLACE "-Wl,-dead_strip_dylibs" "" CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}") - string(REPLACE "-Wl,-dead_strip_dylibs" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") - #executable linker flags get set later - set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}" CACHE STRING "Flags used by the linker during the creation of modules during all build types" FORCE) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}" CACHE STRING "Flags used by the linker during the creation of shared libraries during all build types" FORCE) - endif(CMAKE_ALL_LINKER_FLAGS MATCHES "-Wl,-dead_strip_dylibs") -endif(ENABLE_DEAD_STRIP) - -# Flags for ASAN -if(ENABLE_ASAN) - set(CMAKE_CXX_FLAGS "-fsanitize=address ${DEFAULT_CXX_OPTIONS} ${LHAPDF_CXX_FLAGS} ${APFEL_CXX_FLAGS} ${YAML_CFLAGS} ${SQLITE3_CFLAGS} ${GSL_CFLAGS} ${LIBARCHIVE_CFLAGS}" CACHE STRING "compile flags" FORCE) - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -g" CACHE STRING "debug compile flags" FORCE) - set(CMAKE_EXE_LINKER_FLAGS "-fsanitize=address ${CMAKE_EXE_LINKER_FLAGS}" CACHE STRING "linker flags" FORCE) - set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-fsanitize=address ${CMAKE_EXE_LINKER_FLAGS_DEBUG}" CACHE STRING "debug linker flags" FORCE) -else(ENABLE_ASAN) - set(CMAKE_CXX_FLAGS "${DEFAULT_CXX_OPTIONS} ${LHAPDF_CXX_FLAGS} ${APFEL_CXX_FLAGS} ${YAML_CFLAGS} ${SQLITE3_CFLAGS} ${GSL_CFLAGS} ${LIBARCHIVE_CFLAGS}" CACHE STRING "compile flags" FORCE) - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -g" CACHE STRING "debug compile flags" FORCE) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}" CACHE STRING "linker flags" FORCE) - set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG}" CACHE STRING "debug linker flags" FORCE) -endif(ENABLE_ASAN) +set(CMAKE_CXX_FLAGS "${DEFAULT_CXX_OPTIONS} ${LHAPDF_CXX_FLAGS} ${APFEL_CXX_FLAGS} ${YAML_CFLAGS} ${SQLITE3_CFLAGS} ${GSL_CFLAGS} ${LIBARCHIVE_CFLAGS}" CACHE STRING "compile flags" FORCE) +set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -g" CACHE STRING "debug compile flags" FORCE) +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}" CACHE STRING "linker flags" FORCE) +set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG}" CACHE STRING "debug linker flags" FORCE) # libnnpdf configuration add_subdirectory(libnnpdf) -# nnpdfcpp configuration -add_subdirectory(nnpdfcpp) - # evolven3fit -add_subdirectory(n3fit/evolven3fit) - -if((BURN_TAG) AND (NOT (VP_DEV) OR NOT (N3_DEV))) - # Find out where is the root of the git repository (if available) and finds the correct tag to burn down - # in the package. This just sets the variable, the actual burning is done down below by the validphys - # or n3fit installation and is found in the version.cmake file as it needs to be done post-installation - set(GIT_DIR "--git-dir=${PROJECT_SOURCE_DIR}/.git") - # get the current tag (ex: 3.4) and check at the same time whether git is available and the .git folder found - execute_process(COMMAND git ${GIT_DIR} describe --abbrev=0 --tags OUTPUT_VARIABLE GIT_TAG ERROR_VARIABLE GIT_ERROR) - if(GIT_ERROR STREQUAL "") - string(STRIP ${GIT_TAG} GIT_TAG) - # get the number of revisions since tag happened - execute_process(COMMAND git ${GIT_DIR} rev-list ${GIT_TAG}..HEAD --count OUTPUT_VARIABLE GIT_REVN) - string(STRIP ${GIT_REVN} GIT_REVN) - # get the shortname for the hash - execute_process(COMMAND git ${GIT_DIR} rev-parse --short HEAD OUTPUT_VARIABLE GIT_HASH) - string(STRIP ${GIT_HASH} GIT_HASH) - # find out whether the repository is in a dirty state - # (this returns ${GIT_TAG}-dev so we have to remove the tag) - execute_process(COMMAND git ${GIT_DIR} describe --abbrev=0 --tags --dirty=-dev OUTPUT_VARIABLE GIT_DIRTY) - string(STRIP ${GIT_DIRTY} GIT_DIRTY) - string(REPLACE "${GIT_TAG}" "" GIT_DIRTY ${GIT_DIRTY}) - # now concatenate everything - # with the format ex: 3.4.1880+g00b1741c-dev - set(GIT_VERSION "build_version='${GIT_TAG}.${GIT_REVN}+g${GIT_HASH}${GIT_DIRTY}'") - # now set the variable at install time - install(CODE "set(GIT_VERSION \"${GIT_VERSION}\")") - else(GIT_ERROR STREQUAL "") - set(BURN_TAG OFF) - endif(GIT_ERROR STREQUAL "") -endif() - -# install validphys2 -if(VP_DEV) - install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install -e ${PROJECT_SOURCE_DIR}/validphys2)") -else(VP_DEV) - install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install --no-deps --ignore-installed ${PROJECT_SOURCE_DIR}/validphys2)") - if(BURN_TAG) - install(CODE "set(LIBRARY \"validphys\")") - install(SCRIPT ${PROJECT_SOURCE_DIR}/version.cmake) - endif(BURN_TAG) -endif(VP_DEV) - -# install n3fit -if(N3_DEV) - install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install -e ${PROJECT_SOURCE_DIR}/n3fit)") -else(N3_DEV) - install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install --no-deps --ignore-installed ${PROJECT_SOURCE_DIR}/n3fit)") - if(BURN_TAG) - install(CODE "set(LIBRARY \"n3fit\")") - install(SCRIPT ${PROJECT_SOURCE_DIR}/version.cmake) - endif(BURN_TAG) -endif(N3_DEV) +add_subdirectory(evolven3fit) +install(FILES ${PROJECT_SOURCE_DIR}/validphys2/src/validphys/datafiles/theory.db DESTINATION ${PROFILE_PREFIX}/) + +if(NNPDF_DEV) + install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install --no-deps -e ${PROJECT_SOURCE_DIR})") +else(NNPDF_DEV) + install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install --no-deps --ignore-installed ${PROJECT_SOURCE_DIR})") +endif(NNPDF_DEV) diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh index 28965fa171..a8f21fde68 100644 --- a/conda-recipe/build.sh +++ b/conda-recipe/build.sh @@ -2,9 +2,6 @@ mkdir build cd build -echo "build_version=\"${PKG_VERSION}\"" > ../n3fit/src/n3fit/version.py -echo "build_version=\"${PKG_VERSION}\"" > ../validphys2/src/validphys/version.py - -cmake .. -DCMAKE_INSTALL_PREFIX=${PREFIX} -DVP_DEV=OFF -DN3_DEV=OFF -DBURN_TAG=OFF +cmake .. -DCMAKE_INSTALL_PREFIX=${PREFIX} -DNNPDF_DEV=OFF make -j${CPU_COUNT} make install diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 60cd770671..877431f21d 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -23,6 +23,8 @@ requirements: - apfel >=3 # see https://github.com/scarrazza/apfel - python - numpy + - poetry-core >=1.0.0 + - poetry-dynamic-versioning >=1.1.0 run: - tensorflow >=2.10 - tensorflow >=2.10 *eigen* # [py < 311] @@ -50,10 +52,10 @@ requirements: - recommonmark - sphinx_rtd_theme >0.5 - sphinxcontrib-bibtex - - curio >=1.0 - pineappl >=0.6.2 - eko >=0.14.1 - fiatlux + - curio >=1.0 # reportengine uses it but it's not in its dependencies test: requires: @@ -61,12 +63,6 @@ test: - pytest - coverage - pytest-mpl - #Build dependencies for catch tests - - {{ compiler("cxx") }} - - {{ compiler("c") }} - - sysroot_linux-64==2.17 # [linux] - - swig ==3.0.10 - - cmake source_files: - "*" diff --git a/doc/sphinx/source/data/data-config.rst b/doc/sphinx/source/data/data-config.rst index 97d8de880e..86c6d65539 100644 --- a/doc/sphinx/source/data/data-config.rst +++ b/doc/sphinx/source/data/data-config.rst @@ -4,22 +4,22 @@ Organisation of data files ========================== -The ``nnpdf++`` code needs to be able to handle a great deal of different +The ``nnpdf`` code needs to be able to handle a great deal of different options with regard to the treatment of both experimental data and theoretical choices. In the code, every effort has been made to keep experimental and theoretical parameters strictly separate. -In this section we shall specify the layout of the various ``nnpdf++`` data +In this section we shall specify the layout of the ``nnpdf`` data directory. It is in this directory that all of the read-only data to be used in -the fit are accessed. The data directory is located in the ``nnpdfcpp`` git -repository, under the path ``/nnpdfcpp/data/``. +the fit are accessed. The data directory is located in the ``nnpdf`` git +repository, under the path ``validphys/src/validphys2/datafiles``. Experimental data storage ========================= -The central repository for ``CommonData`` in use by ``nnpdf++`` projects is -located in the ``nnpdfcpp`` git repository at +The central repository for ``CommonData`` in use by ``nnpdf`` projects is +located in the ``nnpdf`` git repository at - ``/nnpdfcpp/data/commondata/`` + ``validphys/src/validphys2/datafiles/commondata`` where a separate ``CommonData`` file is stored for each *Dataset* with the filename format @@ -29,7 +29,7 @@ filename format Information on the treatment of systematic uncertainties, provided in ``SYSTYPE`` files, is located in the subdirectory - ``/nnpdfcpp/data/commondata/systypes`` + ``commondata/systypes`` Here several ``SYSTYPE`` files may be supplied for each *Dataset*. The various options are enumerated by suffix to the filename. The filename format @@ -47,16 +47,16 @@ Theory lookup table In order to organise the various different theoretical treatments available, a lookup table is provided in ``sqlite3`` format. This lookup table can be found -in the ``nnpdfcpp`` repository data directory at: +in the ``nnpdf`` repository data directory at: - ``/nnpdfcpp/data/theory.db`` + ``validphys/src/validphys2/datafiles/theory.db`` This file should only be edited in order to add new theory options. It may be edited with any appropriate ``sqlite3``-supported software. A script is provided to give a brief overview of the various theory options available. It can be found at - ``/nnpdfcpp/data/disp_theory.py`` + ``validphys/src/validphys2/datafiles/disp_theory.py`` and should be run without any arguments. diff --git a/doc/sphinx/source/get-started/installation.rst b/doc/sphinx/source/get-started/installation.rst index 51845fc4c6..a2be8fd015 100644 --- a/doc/sphinx/source/get-started/installation.rst +++ b/doc/sphinx/source/get-started/installation.rst @@ -244,8 +244,9 @@ explained above, if the user has not already done so. Installation from source on M1/M2 Macs -------------------------------------- -Installation on M1/M2 Macs is not directly supported, so everything needs to be -built manually. The following steps are required: +Installation on M1/M2 Macs directly with cmake is not directly supported. +If you install following this tutorial PDFs will need to be evolved with ``evolven3fit_new``. +Make sure you have a valid installation of ``pandoc`` available in your system: 1. Clone the repositories @@ -255,153 +256,47 @@ built manually. The following steps are required: cd nnpdfgit git clone git@github.com:NNPDF/nnpdf.git git clone git@github.com:NNPDF/binary-bootstrap.git - git clone https://github.com/scarrazza/apfel.git -2. Execute binary bootstrap to set the channels in ``.condarc`` +2. Execute binary bootstrap to set the channels in ``.condarc`` and install miniconda. +Note: if you want to install some specific version of `miniconda`_ instead it should work just the same. .. code:: ./binary-bootstrap/bootstrap.sh -3. Setup conda environment using python 3.9 +3. Setup conda environment using python (we use in this example 3.10) and, if you don't have them yet, install ``lhapdf``, ``pandoc`` and ``sccache`` (for rust). .. code:: - conda create -n nnpdf-dev python=3.9 + conda create -n nnpdf-dev python=3.10 conda activate nnpdf-dev + conda install lhapdf pandoc sccache -4. Install ARM compiler + Test that everything is ok: .. code:: - conda install clangxx_osx-arm64 - -5. LHAPDF - - Download version 6.4.0 and decompress - - .. code:: - - wget -O LHAPDF-6.4.0.tar.gz https://lhapdf.hepforge.org/downloads/?f=LHAPDF-6.4.0.tar.gz - tar -xzvf LHAPDF-6.4.0.tar.gz - rm LHAPDF-6.4.0.tar.gz - cd LHAPDF-6.4.0 - - Regenerate the configuration files, configure the build with python disabled, compile and - install. You may need to `brew install automake` first: - - .. code:: - - autoreconf -f -i - ./configure --prefix=$CONDA_PREFIX --disable-python - make -j - make install - - Install the python wrapper - - .. code:: - - cd wrappers/python - pip install -e . - - Test - - .. code:: - - lhapdf install CT18NNLO + lhapdf install NNPDF40_nnlo_as_01180 python -c "import lhapdf" -6. Apfel - - - First, we need to install some dependencies: +4. Note for tensorflow - .. code:: - - conda install pkg-config swig cmake - - Then build it + At the time of writing, it is necessary to follow this extra step in order to install ``tensorflow`` which works only for python < 3.12. + Other versions of ``tensorflow-macos`` and ``tensorflow-metal`` might also work, but these are the ones we tested. .. code:: - cd ../../../apfel - autoreconf -f -i - PYTHON=$(which python) ./configure --prefix=$CONDA_PREFIX - make clean - make -j - make install - -7. validphys + conda install -c apple tensorflow-deps + pip install tensorflow-macos==2.9.2 + pip install tensorflow-metal==0.5.0 - First install reportengine and validobj, then validphys itself: +5. Install NNPDF packages (``validphys``, ``n3fit`` and ``evolven3fit_new``) and its dependencies .. code:: - pip install reportengine validobj - cd ../nnpdf/validphys2 pip install -e . -8. nnpdf - - Install other dependencies - - .. code:: - - conda install libarchive sqlite gsl yaml-cpp - - Run cmake in nnpdf/build directory: - - .. code:: - - cd .. - mkdir build - cd build - cmake .. -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX - - Edit the file ``nnpdfgit/nnpdf/CMakeLists.txt`` : - - - on line 8 change the option to true, so it says: - - .. code:: - - SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) - - - comment out line 58 (:code:`set(LIBNNPDF_HAVE_SSE "#define SSE_CONV")`) - - - line 104 should read: - - .. code:: - - set(DEFAULT_CXX_OPTIONS "-Wall -Wextra -fvisibility-inlines-hidden -fmessage-length=0 -ftree-vectorize -fPIC -fstack-protector-strong -O2 -pipe") - - (so delete ``-march=nocona -mtune=haswell``). - - Then make: - - .. code:: - - make -j - make install - - Install remaining packages - - .. code:: - - pip install seaborn prompt_toolkit scipy psutil hyperopt - -9. Install tensorflow - - Not specifying versions will install at the time of writing macos 2.12.0 and metal 0.8.0, which both work. - They only give warnings on the optimizers, that the legacy versions are faster. - If you want an older version, macos 2.9.2 and metal 0.5.0 are also tested to work. - - .. code:: - - conda install -c apple tensorflow-deps - pip install tensorflow-macos==2.9.2 - pip install tensorflow-metal==0.5.0 - -10. Test +6. Test .. code:: diff --git a/doc/sphinx/source/theory/theoryparamsinfo.md b/doc/sphinx/source/theory/theoryparamsinfo.md index bd2d063826..162dd99cc7 100644 --- a/doc/sphinx/source/theory/theoryparamsinfo.md +++ b/doc/sphinx/source/theory/theoryparamsinfo.md @@ -3,9 +3,9 @@ ``` # Looking up the parameters of a theory -The parameters for all of the theories can be found in the `theory.db` file, -located in the `/share/NNPDF/data` directory. This is an -sqlite database file. The information contained within this file can also be +The parameters for all of the theories can be found in the `theory.db` file. +The `theory.db` file is installed together as part of the validphys package. +This is an sqlite database file. The information contained within this file can also be viewed [within the docs](theory-indexes). The tools required to extract the parameters for a given theory are already in diff --git a/doc/sphinx/source/vp/nnprofile.md b/doc/sphinx/source/vp/nnprofile.md index 6a4806feb1..10bfde066d 100644 --- a/doc/sphinx/source/vp/nnprofile.md +++ b/doc/sphinx/source/vp/nnprofile.md @@ -5,30 +5,28 @@ The `nnprofile.yaml` file ========================= -The NNPDF code (both `libnnpdf` and `validphys`) stores some configuration -options (mostly various URLs and paths) in an `nnprofile.yaml` file, which is -installed with the code. +The NNPDF code stores some configuration options (mostly various URLs and paths) in a `.yaml` file +which is installed alongside the code. +The default values can be consulted in ``validphys/default_nnprofile.yaml``. -In particular this configuration is used by `validphys` to locate, +This configuration is used by `validphys` to locate, [upload](upload) and [download](download) resources. Altering profile settings -------------------------- -The default settings are computed based on the install prefix, from the input -file `libnnpdf/nnprofile.yaml.in`. Changes with the intention to affect all uses -(such as adding a new repository for PDF sets) should be made there. - -The default location of the profile file is computed at install time as -`$(INSTALL_PREFIX)/share/NNPDF/nnprofile.yaml`. The default profile is written -in that location and the code loads it from there. Users should not override -that installed file since changes to it will be lost the next time the code is -installed. However it is possible to alter the profile search location locally -by defining the environment variable ``NNPDF_PROFILE_PATH`` to point to a -different profile file, which will be loaded instead by the code. Specifying a -custom profile could be useful to add repositories for specific projects or +It is possible to set up a custom profile file in: +``` + ${XDG_CONFIG_HOME}/NNPDF/nnprofile.yaml +``` +such that it will be used by every NNPDF installation (note that `${XDG_CONFIG_HOME}` defaults to `~/.config`) +or by defining the environment variable ``NNPDF_PROFILE_PATH`` to point to a +different profile file, which will be loaded instead by the code. +Specifying a custom profile could be useful to add repositories for specific projects or change the paths based on the local filesystem characteristics. +If a custom profile is used, the values defined there will take precedence over the default values defined by NNPDF. + Options ------- @@ -37,13 +35,22 @@ the code. These should be specified in YAML format. ```eval_rst -``data_path`` - The path in the user's system where input data such as CommonData files and - FKtables are to be found, and stored when :ref:`downloaded `. +``nnpdf_share``` + Main folder for NNPDF shared resources: theories, fits, hyperscans, etc. + Ex: ``nnpdf_share: ~/.local/share/NNPDF``. + All other paths are defined relative to ``nnpdf_share``. + It is possible to set the special key ``RELATIVE_TO_PYTHON``, in this case the code + will use as share folder the share folder of the current environment (for instance ``${CONDA_PREFIX}/share/NNPDF``). + +``theories_path`` + The path in the user's system where the theory files (FKtables and ekos) + are to be found, and stored when :ref:`downloaded `. + Defaults to ``nnpdf_share/theories``. ``results_path`` A path where completed fits are to be retrieved from, and stored when :ref:`downloaded `. + Defaults to ``nnpdf_share/results``. ``validphys_cache_path`` A path where to store downloaded validphys resources. diff --git a/doc/sphinx/source/vp/scripts.rst b/doc/sphinx/source/vp/scripts.rst index 6e9c91fc52..a35e636b82 100644 --- a/doc/sphinx/source/vp/scripts.rst +++ b/doc/sphinx/source/vp/scripts.rst @@ -116,9 +116,10 @@ Will result in a fit named :code:`181109-si-nlo-central_DISonly` and a copy name in the original directory. However, by default, fits that are download with :code:`vp-get fit` will be located in the NNPDF -results directory. This is usually located in -:code:`~/miniconda3/envs//share/NNPDF/results`. Fits located in this directory can be -renamed with the :code:`-r` flag. +results directory. +The results directory is defined by the ``results_path`` key in the ``nnprofile.yaml`` configuration file +(usually located in ``~/.config/NNPDF/nnprofile.yaml``). +Fits located in this directory can be renamed with the :code:`-r` flag. As an example, suppose the fit :code:`181109-si-nlo-central_DISonly` is located in the NNPDF results directory. It can be renamed, irrespective of the current working directory, using diff --git a/n3fit/evolven3fit/CMakeLists.txt b/evolven3fit/CMakeLists.txt similarity index 55% rename from n3fit/evolven3fit/CMakeLists.txt rename to evolven3fit/CMakeLists.txt index 417de24e7c..f4e8d09787 100644 --- a/n3fit/evolven3fit/CMakeLists.txt +++ b/evolven3fit/CMakeLists.txt @@ -1,20 +1,17 @@ # Include files (should this information not be known at this point?) -include_directories(${PROJECT_SOURCE_DIR}/nnpdfcpp/src/common/inc) -include_directories(${PROJECT_SOURCE_DIR}/nnpdfcpp/src/nnfit/inc) -include_directories(${PROJECT_SOURCE_DIR}/n3fit/evolven3fit) +include_directories(${PROJECT_SOURCE_DIR}/evolven3fit) include_directories(${PROJECT_SOURCE_DIR}/libnnpdf/src/) set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/binaries) configure_file( - "${PROJECT_SOURCE_DIR}/libnnpdf/src/NNPDF/common.h.in" - "${PROJECT_SOURCE_DIR}/libnnpdf/src/NNPDF/common.h" - ) + "${PROJECT_SOURCE_DIR}/evolven3fit/evolven3fit.cc.in" + "${PROJECT_SOURCE_DIR}/evolven3fit/evolven3fit.cc" +) # Add files to the make -add_executable(evolven3fit ${PROJECT_SOURCE_DIR}/n3fit/evolven3fit/evolven3fit.cc - ${PROJECT_SOURCE_DIR}/nnpdfcpp/src/common/src/md5.cc - ${PROJECT_SOURCE_DIR}/nnpdfcpp/src/common/src/exportgrid.cc - ${PROJECT_SOURCE_DIR}/nnpdfcpp/src/nnfit/src/evolgrid.cc ) +add_executable(evolven3fit ${PROJECT_SOURCE_DIR}/evolven3fit/evolven3fit.cc + ${PROJECT_SOURCE_DIR}/evolven3fit/exportgrid.cc + ${PROJECT_SOURCE_DIR}/evolven3fit/evolgrid.cc ) # Set all flags set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${NNPDF_LDFLAGS} ${GSL_LDFLAGS} ${APFEL_LIBRARIES} ${YAML_LDFLAGS}") @@ -26,4 +23,3 @@ target_link_libraries(evolven3fit nnpdf ${YAML_LDFLAGS} ${APFEL_LIBRARIES} ${GSL install(TARGETS evolven3fit DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - diff --git a/nnpdfcpp/src/nnfit/src/evolgrid.cc b/evolven3fit/evolgrid.cc similarity index 100% rename from nnpdfcpp/src/nnfit/src/evolgrid.cc rename to evolven3fit/evolgrid.cc diff --git a/nnpdfcpp/src/nnfit/inc/evolgrid.h b/evolven3fit/evolgrid.h similarity index 100% rename from nnpdfcpp/src/nnfit/inc/evolgrid.h rename to evolven3fit/evolgrid.h diff --git a/n3fit/evolven3fit/evolven3fit.cc b/evolven3fit/evolven3fit.cc.in similarity index 97% rename from n3fit/evolven3fit/evolven3fit.cc rename to evolven3fit/evolven3fit.cc.in index 5b29f2bd58..e01eee48d1 100644 --- a/n3fit/evolven3fit/evolven3fit.cc +++ b/evolven3fit/evolven3fit.cc.in @@ -13,7 +13,6 @@ #include #include #include -#include #include #include "exportgrid.h" @@ -27,6 +26,8 @@ using std::string; using std::stringstream; using std::stoi; +#define DBPATH "@PROFILE_PREFIX@/theory.db" + // Check if folder exists bool CheckConsistency(string const& folder, string const& exportfile) { @@ -96,7 +97,7 @@ int main(int argc, char **argv) // load theory from db std::map theory_map; - NNPDF::IndexDB db(get_data_path() + "/theory.db", "theoryIndex"); + NNPDF::IndexDB db(DBPATH, "theoryIndex"); auto keys = APFEL::kValues; keys.push_back("EScaleVar"); db.ExtractMap(theory_id, keys, theory_map); diff --git a/nnpdfcpp/src/common/src/exportgrid.cc b/evolven3fit/exportgrid.cc similarity index 100% rename from nnpdfcpp/src/common/src/exportgrid.cc rename to evolven3fit/exportgrid.cc diff --git a/nnpdfcpp/src/common/inc/exportgrid.h b/evolven3fit/exportgrid.h similarity index 100% rename from nnpdfcpp/src/common/inc/exportgrid.h rename to evolven3fit/exportgrid.h diff --git a/n3fit/evolven3fit/varflavors.py b/evolven3fit/varflavors.py similarity index 100% rename from n3fit/evolven3fit/varflavors.py rename to evolven3fit/varflavors.py diff --git a/libnnpdf/CMakeLists.txt b/libnnpdf/CMakeLists.txt index 27200b82bd..9fbf64e4ee 100644 --- a/libnnpdf/CMakeLists.txt +++ b/libnnpdf/CMakeLists.txt @@ -3,11 +3,6 @@ set(exec_prefix "${prefix}") set(includedir "${prefix}/include") set(libdir "${prefix}/lib") -configure_file( - "${PROJECT_SOURCE_DIR}/libnnpdf/nnprofile.yaml.in" - "${PROJECT_SOURCE_DIR}/libnnpdf/nnprofile.yaml" - ) - configure_file( "${PROJECT_SOURCE_DIR}/libnnpdf/src/NNPDF/config.h.in" "${PROJECT_SOURCE_DIR}/libnnpdf/src/NNPDF/config.h" @@ -58,11 +53,6 @@ target_link_libraries(nnpdf ${LHAPDF_LIBRARIES} ${GSL_LDFLAGS} ${SQLITE3_LDFLAGS install(FILES ${PROJECT_SOURCE_DIR}/libnnpdf/scripts/nnpdf.pc DESTINATION lib/pkgconfig) install(DIRECTORY src/NNPDF DESTINATION include) -install(FILES ${PROJECT_SOURCE_DIR}/libnnpdf/nnprofile.yaml DESTINATION share/NNPDF) +file(WRITE ${PROJECT_SOURCE_DIR}/libnnpdf/REAMDE.md "The share folder of NNPDF has been moved, see: https://github.com/NNPDF/nnpdf/pull/1861\n") +install(FILES ${PROJECT_SOURCE_DIR}/libnnpdf/REAMDE.md DESTINATION share/NNPDF) install(TARGETS nnpdf DESTINATION lib) - -add_subdirectory(wrapper) - -if(ENABLE_TESTS) - add_subdirectory(tests) -endif() diff --git a/libnnpdf/README.md b/libnnpdf/README.md deleted file mode 100644 index 610a2c2d88..0000000000 --- a/libnnpdf/README.md +++ /dev/null @@ -1,22 +0,0 @@ -# libnnpdf -Library for core NNPDF utilities. - -## Project summary and aim - -The aim of `libnnpdf` is to provide a set of common tools shared between multiple -projects for the NNPDF Collaboration. The output of this repository is a C++ library -which can be imported and shared to other native C++ programs and python codes through -the SWIG wrapper. - -The library implements the following principle components: -- Data I/O -- PDF parametrisation -- FK tables parser -- Theoretical prediction convolutions -- PDF set handling - -### Testing - -Basic testing is implemented through two interfaces: -- c++ using catch: it tests c++ specific features, like copy constructors memory allocation, etc. -- swig+vp2 using pytests: it tests the python wrapper, provides utilities to dump results to disk and use a reference in future tests. diff --git a/libnnpdf/nnprofile.yaml.in b/libnnpdf/nnprofile.yaml.in index 4765fbe5e9..e3f5486208 100644 --- a/libnnpdf/nnprofile.yaml.in +++ b/libnnpdf/nnprofile.yaml.in @@ -1,9 +1,5 @@ # Local resource locations -data_path: '@PROFILE_PREFIX@/data/' -results_path: '@PROFILE_PREFIX@/results/' -hyperscan_path: '@PROFILE_PREFIX@/hyperscan_results/' -validphys_cache_path: '@PROFILE_PREFIX@/vp-cache/' -config_path: '@PROFILE_PREFIX@/config/' +data_path: '@PROFILE_PREFIX@' # Remote resource locations fit_urls: diff --git a/libnnpdf/tests/CMakeLists.txt b/libnnpdf/tests/CMakeLists.txt deleted file mode 100644 index a4cb08bab1..0000000000 --- a/libnnpdf/tests/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_executable(catch_test EXCLUDE_FROM_ALL main.cc experiment_test.cc test_utils.cc) -target_link_libraries(catch_test nnpdf ${LibArchive_LIBRARIES}) diff --git a/libnnpdf/tests/catch.hpp b/libnnpdf/tests/catch.hpp deleted file mode 100644 index f7681f49ea..0000000000 --- a/libnnpdf/tests/catch.hpp +++ /dev/null @@ -1,11545 +0,0 @@ -/* - * Catch v1.9.6 - * Generated: 2017-06-27 12:19:54.557875 - * ---------------------------------------------------------- - * This file has been merged from multiple headers. Please don't edit it directly - * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. - * - * Distributed under the Boost Software License, Version 1.0. (See accompanying - * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - */ -#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED -#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED - -#define TWOBLUECUBES_CATCH_HPP_INCLUDED - -#ifdef __clang__ -# pragma clang system_header -#elif defined __GNUC__ -# pragma GCC system_header -#endif - -// #included from: internal/catch_suppress_warnings.h - -#ifdef __clang__ -# ifdef __ICC // icpc defines the __clang__ macro -# pragma warning(push) -# pragma warning(disable: 161 1682) -# else // __ICC -# pragma clang diagnostic ignored "-Wglobal-constructors" -# pragma clang diagnostic ignored "-Wvariadic-macros" -# pragma clang diagnostic ignored "-Wc99-extensions" -# pragma clang diagnostic ignored "-Wunused-variable" -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wpadded" -# pragma clang diagnostic ignored "-Wc++98-compat" -# pragma clang diagnostic ignored "-Wc++98-compat-pedantic" -# pragma clang diagnostic ignored "-Wswitch-enum" -# pragma clang diagnostic ignored "-Wcovered-switch-default" -# endif -#elif defined __GNUC__ -# pragma GCC diagnostic ignored "-Wvariadic-macros" -# pragma GCC diagnostic ignored "-Wunused-variable" -# pragma GCC diagnostic ignored "-Wparentheses" - -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wpadded" -#endif -#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER) -# define CATCH_IMPL -#endif - -#ifdef CATCH_IMPL -# ifndef CLARA_CONFIG_MAIN -# define CLARA_CONFIG_MAIN_NOT_DEFINED -# define CLARA_CONFIG_MAIN -# endif -#endif - -// #included from: internal/catch_notimplemented_exception.h -#define TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_H_INCLUDED - -// #included from: catch_common.h -#define TWOBLUECUBES_CATCH_COMMON_H_INCLUDED - -// #included from: catch_compiler_capabilities.h -#define TWOBLUECUBES_CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED - -// Detect a number of compiler features - mostly C++11/14 conformance - by compiler -// The following features are defined: -// -// CATCH_CONFIG_CPP11_NULLPTR : is nullptr supported? -// CATCH_CONFIG_CPP11_NOEXCEPT : is noexcept supported? -// CATCH_CONFIG_CPP11_GENERATED_METHODS : The delete and default keywords for compiler generated methods -// CATCH_CONFIG_CPP11_IS_ENUM : std::is_enum is supported? -// CATCH_CONFIG_CPP11_TUPLE : std::tuple is supported -// CATCH_CONFIG_CPP11_LONG_LONG : is long long supported? -// CATCH_CONFIG_CPP11_OVERRIDE : is override supported? -// CATCH_CONFIG_CPP11_UNIQUE_PTR : is unique_ptr supported (otherwise use auto_ptr) -// CATCH_CONFIG_CPP11_SHUFFLE : is std::shuffle supported? -// CATCH_CONFIG_CPP11_TYPE_TRAITS : are type_traits and enable_if supported? - -// CATCH_CONFIG_CPP11_OR_GREATER : Is C++11 supported? - -// CATCH_CONFIG_VARIADIC_MACROS : are variadic macros supported? -// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported? -// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported? -// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported? -// **************** -// Note to maintainers: if new toggles are added please document them -// in configuration.md, too -// **************** - -// In general each macro has a _NO_ form -// (e.g. CATCH_CONFIG_CPP11_NO_NULLPTR) which disables the feature. -// Many features, at point of detection, define an _INTERNAL_ macro, so they -// can be combined, en-mass, with the _NO_ forms later. - -// All the C++11 features can be disabled with CATCH_CONFIG_NO_CPP11 - -#ifdef __cplusplus - -# if __cplusplus >= 201103L -# define CATCH_CPP11_OR_GREATER -# endif - -# if __cplusplus >= 201402L -# define CATCH_CPP14_OR_GREATER -# endif - -#endif - -#ifdef __clang__ - -# if __has_feature(cxx_nullptr) -# define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR -# endif - -# if __has_feature(cxx_noexcept) -# define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT -# endif - -# if defined(CATCH_CPP11_OR_GREATER) -# define CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ - _Pragma( "clang diagnostic push" ) \ - _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) -# define CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS \ - _Pragma( "clang diagnostic pop" ) - -# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \ - _Pragma( "clang diagnostic push" ) \ - _Pragma( "clang diagnostic ignored \"-Wparentheses\"" ) -# define CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \ - _Pragma( "clang diagnostic pop" ) -# endif - -#endif // __clang__ - -//////////////////////////////////////////////////////////////////////////////// -// We know some environments not to support full POSIX signals -#if defined(__CYGWIN__) || defined(__QNX__) - -# if !defined(CATCH_CONFIG_POSIX_SIGNALS) -# define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS -# endif - -#endif - -//////////////////////////////////////////////////////////////////////////////// -// Cygwin -#ifdef __CYGWIN__ - -// Required for some versions of Cygwin to declare gettimeofday -// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin -# define _BSD_SOURCE - -#endif // __CYGWIN__ - -//////////////////////////////////////////////////////////////////////////////// -// Borland -#ifdef __BORLANDC__ - -#endif // __BORLANDC__ - -//////////////////////////////////////////////////////////////////////////////// -// EDG -#ifdef __EDG_VERSION__ - -#endif // __EDG_VERSION__ - -//////////////////////////////////////////////////////////////////////////////// -// Digital Mars -#ifdef __DMC__ - -#endif // __DMC__ - -//////////////////////////////////////////////////////////////////////////////// -// GCC -#ifdef __GNUC__ - -# if __GNUC__ == 4 && __GNUC_MINOR__ >= 6 && defined(__GXX_EXPERIMENTAL_CXX0X__) -# define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR -# endif - -// - otherwise more recent versions define __cplusplus >= 201103L -// and will get picked up below - -#endif // __GNUC__ - -//////////////////////////////////////////////////////////////////////////////// -// Visual C++ -#ifdef _MSC_VER - -#define CATCH_INTERNAL_CONFIG_WINDOWS_SEH - -#if (_MSC_VER >= 1600) -# define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR -# define CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR -#endif - -#if (_MSC_VER >= 1900 ) // (VC++ 13 (VS2015)) -#define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT -#define CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS -#define CATCH_INTERNAL_CONFIG_CPP11_SHUFFLE -#define CATCH_INTERNAL_CONFIG_CPP11_TYPE_TRAITS -#endif - -#endif // _MSC_VER - -//////////////////////////////////////////////////////////////////////////////// - -// Use variadic macros if the compiler supports them -#if ( defined _MSC_VER && _MSC_VER > 1400 && !defined __EDGE__) || \ - ( defined __WAVE__ && __WAVE_HAS_VARIADICS ) || \ - ( defined __GNUC__ && __GNUC__ >= 3 ) || \ - ( !defined __cplusplus && __STDC_VERSION__ >= 199901L || __cplusplus >= 201103L ) - -#define CATCH_INTERNAL_CONFIG_VARIADIC_MACROS - -#endif - -// Use __COUNTER__ if the compiler supports it -#if ( defined _MSC_VER && _MSC_VER >= 1300 ) || \ - ( defined __GNUC__ && ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3 )) ) || \ - ( defined __clang__ && __clang_major__ >= 3 ) - -#define CATCH_INTERNAL_CONFIG_COUNTER - -#endif - -//////////////////////////////////////////////////////////////////////////////// -// C++ language feature support - -// catch all support for C++11 -#if defined(CATCH_CPP11_OR_GREATER) - -# if !defined(CATCH_INTERNAL_CONFIG_CPP11_NULLPTR) -# define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR -# endif - -# ifndef CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT -# define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT -# endif - -# ifndef CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS -# define CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS -# endif - -# ifndef CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM -# define CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM -# endif - -# ifndef CATCH_INTERNAL_CONFIG_CPP11_TUPLE -# define CATCH_INTERNAL_CONFIG_CPP11_TUPLE -# endif - -# ifndef CATCH_INTERNAL_CONFIG_VARIADIC_MACROS -# define CATCH_INTERNAL_CONFIG_VARIADIC_MACROS -# endif - -# if !defined(CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG) -# define CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG -# endif - -# if !defined(CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE) -# define CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE -# endif -# if !defined(CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) -# define CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR -# endif -# if !defined(CATCH_INTERNAL_CONFIG_CPP11_SHUFFLE) -# define CATCH_INTERNAL_CONFIG_CPP11_SHUFFLE -# endif -# if !defined(CATCH_INTERNAL_CONFIG_CPP11_TYPE_TRAITS) -# define CATCH_INTERNAL_CONFIG_CPP11_TYPE_TRAITS -# endif - -#endif // __cplusplus >= 201103L - -// Now set the actual defines based on the above + anything the user has configured -#if defined(CATCH_INTERNAL_CONFIG_CPP11_NULLPTR) && !defined(CATCH_CONFIG_CPP11_NO_NULLPTR) && !defined(CATCH_CONFIG_CPP11_NULLPTR) && !defined(CATCH_CONFIG_NO_CPP11) -# define CATCH_CONFIG_CPP11_NULLPTR -#endif -#if defined(CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_CONFIG_CPP11_NO_NOEXCEPT) && !defined(CATCH_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_CONFIG_NO_CPP11) -# define CATCH_CONFIG_CPP11_NOEXCEPT -#endif -#if defined(CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS) && !defined(CATCH_CONFIG_CPP11_NO_GENERATED_METHODS) && !defined(CATCH_CONFIG_CPP11_GENERATED_METHODS) && !defined(CATCH_CONFIG_NO_CPP11) -# define CATCH_CONFIG_CPP11_GENERATED_METHODS -#endif -#if defined(CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM) && !defined(CATCH_CONFIG_CPP11_NO_IS_ENUM) && !defined(CATCH_CONFIG_CPP11_IS_ENUM) && !defined(CATCH_CONFIG_NO_CPP11) -# define CATCH_CONFIG_CPP11_IS_ENUM -#endif -#if defined(CATCH_INTERNAL_CONFIG_CPP11_TUPLE) && !defined(CATCH_CONFIG_CPP11_NO_TUPLE) && !defined(CATCH_CONFIG_CPP11_TUPLE) && !defined(CATCH_CONFIG_NO_CPP11) -# define CATCH_CONFIG_CPP11_TUPLE -#endif -#if defined(CATCH_INTERNAL_CONFIG_VARIADIC_MACROS) && !defined(CATCH_CONFIG_NO_VARIADIC_MACROS) && !defined(CATCH_CONFIG_VARIADIC_MACROS) -# define CATCH_CONFIG_VARIADIC_MACROS -#endif -#if defined(CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG) && !defined(CATCH_CONFIG_CPP11_NO_LONG_LONG) && !defined(CATCH_CONFIG_CPP11_LONG_LONG) && !defined(CATCH_CONFIG_NO_CPP11) -# define CATCH_CONFIG_CPP11_LONG_LONG -#endif -#if defined(CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE) && !defined(CATCH_CONFIG_CPP11_NO_OVERRIDE) && !defined(CATCH_CONFIG_CPP11_OVERRIDE) && !defined(CATCH_CONFIG_NO_CPP11) -# define CATCH_CONFIG_CPP11_OVERRIDE -#endif -#if defined(CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) && !defined(CATCH_CONFIG_CPP11_NO_UNIQUE_PTR) && !defined(CATCH_CONFIG_CPP11_UNIQUE_PTR) && !defined(CATCH_CONFIG_NO_CPP11) -# define CATCH_CONFIG_CPP11_UNIQUE_PTR -#endif -// Use of __COUNTER__ is suppressed if __JETBRAINS_IDE__ is #defined (meaning we're being parsed by a JetBrains IDE for -// analytics) because, at time of writing, __COUNTER__ is not properly handled by it. -// This does not affect compilation -#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER) && !defined(__JETBRAINS_IDE__) -# define CATCH_CONFIG_COUNTER -#endif -#if defined(CATCH_INTERNAL_CONFIG_CPP11_SHUFFLE) && !defined(CATCH_CONFIG_CPP11_NO_SHUFFLE) && !defined(CATCH_CONFIG_CPP11_SHUFFLE) && !defined(CATCH_CONFIG_NO_CPP11) -# define CATCH_CONFIG_CPP11_SHUFFLE -#endif -# if defined(CATCH_INTERNAL_CONFIG_CPP11_TYPE_TRAITS) && !defined(CATCH_CONFIG_CPP11_NO_TYPE_TRAITS) && !defined(CATCH_CONFIG_CPP11_TYPE_TRAITS) && !defined(CATCH_CONFIG_NO_CPP11) -# define CATCH_CONFIG_CPP11_TYPE_TRAITS -# endif -#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) -# define CATCH_CONFIG_WINDOWS_SEH -#endif -// This is set by default, because we assume that unix compilers are posix-signal-compatible by default. -#if !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS) -# define CATCH_CONFIG_POSIX_SIGNALS -#endif - -#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS -# define CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS -#endif -#if !defined(CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS -# define CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS -#endif - -// noexcept support: -#if defined(CATCH_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_NOEXCEPT) -# define CATCH_NOEXCEPT noexcept -# define CATCH_NOEXCEPT_IS(x) noexcept(x) -#else -# define CATCH_NOEXCEPT throw() -# define CATCH_NOEXCEPT_IS(x) -#endif - -// nullptr support -#ifdef CATCH_CONFIG_CPP11_NULLPTR -# define CATCH_NULL nullptr -#else -# define CATCH_NULL NULL -#endif - -// override support -#ifdef CATCH_CONFIG_CPP11_OVERRIDE -# define CATCH_OVERRIDE override -#else -# define CATCH_OVERRIDE -#endif - -// unique_ptr support -#ifdef CATCH_CONFIG_CPP11_UNIQUE_PTR -# define CATCH_AUTO_PTR( T ) std::unique_ptr -#else -# define CATCH_AUTO_PTR( T ) std::auto_ptr -#endif - -#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line -#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) -#ifdef CATCH_CONFIG_COUNTER -# define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ ) -#else -# define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ ) -#endif - -#define INTERNAL_CATCH_STRINGIFY2( expr ) #expr -#define INTERNAL_CATCH_STRINGIFY( expr ) INTERNAL_CATCH_STRINGIFY2( expr ) - -#include -#include - -namespace Catch { - - struct IConfig; - - struct CaseSensitive { enum Choice { - Yes, - No - }; }; - - class NonCopyable { -#ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - NonCopyable( NonCopyable const& ) = delete; - NonCopyable( NonCopyable && ) = delete; - NonCopyable& operator = ( NonCopyable const& ) = delete; - NonCopyable& operator = ( NonCopyable && ) = delete; -#else - NonCopyable( NonCopyable const& info ); - NonCopyable& operator = ( NonCopyable const& ); -#endif - - protected: - NonCopyable() {} - virtual ~NonCopyable(); - }; - - class SafeBool { - public: - typedef void (SafeBool::*type)() const; - - static type makeSafe( bool value ) { - return value ? &SafeBool::trueValue : 0; - } - private: - void trueValue() const {} - }; - - template - inline void deleteAll( ContainerT& container ) { - typename ContainerT::const_iterator it = container.begin(); - typename ContainerT::const_iterator itEnd = container.end(); - for(; it != itEnd; ++it ) - delete *it; - } - template - inline void deleteAllValues( AssociativeContainerT& container ) { - typename AssociativeContainerT::const_iterator it = container.begin(); - typename AssociativeContainerT::const_iterator itEnd = container.end(); - for(; it != itEnd; ++it ) - delete it->second; - } - - bool startsWith( std::string const& s, std::string const& prefix ); - bool startsWith( std::string const& s, char prefix ); - bool endsWith( std::string const& s, std::string const& suffix ); - bool endsWith( std::string const& s, char suffix ); - bool contains( std::string const& s, std::string const& infix ); - void toLowerInPlace( std::string& s ); - std::string toLower( std::string const& s ); - std::string trim( std::string const& str ); - bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ); - - struct pluralise { - pluralise( std::size_t count, std::string const& label ); - - friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ); - - std::size_t m_count; - std::string m_label; - }; - - struct SourceLineInfo { - - SourceLineInfo(); - SourceLineInfo( char const* _file, std::size_t _line ); -# ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - SourceLineInfo(SourceLineInfo const& other) = default; - SourceLineInfo( SourceLineInfo && ) = default; - SourceLineInfo& operator = ( SourceLineInfo const& ) = default; - SourceLineInfo& operator = ( SourceLineInfo && ) = default; -# endif - bool empty() const; - bool operator == ( SourceLineInfo const& other ) const; - bool operator < ( SourceLineInfo const& other ) const; - - char const* file; - std::size_t line; - }; - - std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ); - - // This is just here to avoid compiler warnings with macro constants and boolean literals - inline bool isTrue( bool value ){ return value; } - inline bool alwaysTrue() { return true; } - inline bool alwaysFalse() { return false; } - - void throwLogicError( std::string const& message, SourceLineInfo const& locationInfo ); - - void seedRng( IConfig const& config ); - unsigned int rngSeed(); - - // Use this in variadic streaming macros to allow - // >> +StreamEndStop - // as well as - // >> stuff +StreamEndStop - struct StreamEndStop { - std::string operator+() { - return std::string(); - } - }; - template - T const& operator + ( T const& value, StreamEndStop ) { - return value; - } -} - -#define CATCH_INTERNAL_LINEINFO ::Catch::SourceLineInfo( __FILE__, static_cast( __LINE__ ) ) -#define CATCH_INTERNAL_ERROR( msg ) ::Catch::throwLogicError( msg, CATCH_INTERNAL_LINEINFO ); - -namespace Catch { - - class NotImplementedException : public std::exception - { - public: - NotImplementedException( SourceLineInfo const& lineInfo ); - NotImplementedException( NotImplementedException const& ) {} - - virtual ~NotImplementedException() CATCH_NOEXCEPT {} - - virtual const char* what() const CATCH_NOEXCEPT; - - private: - std::string m_what; - SourceLineInfo m_lineInfo; - }; - -} // end namespace Catch - -/////////////////////////////////////////////////////////////////////////////// -#define CATCH_NOT_IMPLEMENTED throw Catch::NotImplementedException( CATCH_INTERNAL_LINEINFO ) - -// #included from: internal/catch_context.h -#define TWOBLUECUBES_CATCH_CONTEXT_H_INCLUDED - -// #included from: catch_interfaces_generators.h -#define TWOBLUECUBES_CATCH_INTERFACES_GENERATORS_H_INCLUDED - -#include - -namespace Catch { - - struct IGeneratorInfo { - virtual ~IGeneratorInfo(); - virtual bool moveNext() = 0; - virtual std::size_t getCurrentIndex() const = 0; - }; - - struct IGeneratorsForTest { - virtual ~IGeneratorsForTest(); - - virtual IGeneratorInfo& getGeneratorInfo( std::string const& fileInfo, std::size_t size ) = 0; - virtual bool moveNext() = 0; - }; - - IGeneratorsForTest* createGeneratorsForTest(); - -} // end namespace Catch - -// #included from: catch_ptr.hpp -#define TWOBLUECUBES_CATCH_PTR_HPP_INCLUDED - -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wpadded" -#endif - -namespace Catch { - - // An intrusive reference counting smart pointer. - // T must implement addRef() and release() methods - // typically implementing the IShared interface - template - class Ptr { - public: - Ptr() : m_p( CATCH_NULL ){} - Ptr( T* p ) : m_p( p ){ - if( m_p ) - m_p->addRef(); - } - Ptr( Ptr const& other ) : m_p( other.m_p ){ - if( m_p ) - m_p->addRef(); - } - ~Ptr(){ - if( m_p ) - m_p->release(); - } - void reset() { - if( m_p ) - m_p->release(); - m_p = CATCH_NULL; - } - Ptr& operator = ( T* p ){ - Ptr temp( p ); - swap( temp ); - return *this; - } - Ptr& operator = ( Ptr const& other ){ - Ptr temp( other ); - swap( temp ); - return *this; - } - void swap( Ptr& other ) { std::swap( m_p, other.m_p ); } - T* get() const{ return m_p; } - T& operator*() const { return *m_p; } - T* operator->() const { return m_p; } - bool operator !() const { return m_p == CATCH_NULL; } - operator SafeBool::type() const { return SafeBool::makeSafe( m_p != CATCH_NULL ); } - - private: - T* m_p; - }; - - struct IShared : NonCopyable { - virtual ~IShared(); - virtual void addRef() const = 0; - virtual void release() const = 0; - }; - - template - struct SharedImpl : T { - - SharedImpl() : m_rc( 0 ){} - - virtual void addRef() const { - ++m_rc; - } - virtual void release() const { - if( --m_rc == 0 ) - delete this; - } - - mutable unsigned int m_rc; - }; - -} // end namespace Catch - -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - -namespace Catch { - - class TestCase; - class Stream; - struct IResultCapture; - struct IRunner; - struct IGeneratorsForTest; - struct IConfig; - - struct IContext - { - virtual ~IContext(); - - virtual IResultCapture* getResultCapture() = 0; - virtual IRunner* getRunner() = 0; - virtual size_t getGeneratorIndex( std::string const& fileInfo, size_t totalSize ) = 0; - virtual bool advanceGeneratorsForCurrentTest() = 0; - virtual Ptr getConfig() const = 0; - }; - - struct IMutableContext : IContext - { - virtual ~IMutableContext(); - virtual void setResultCapture( IResultCapture* resultCapture ) = 0; - virtual void setRunner( IRunner* runner ) = 0; - virtual void setConfig( Ptr const& config ) = 0; - }; - - IContext& getCurrentContext(); - IMutableContext& getCurrentMutableContext(); - void cleanUpContext(); - Stream createStream( std::string const& streamName ); - -} - -// #included from: internal/catch_test_registry.hpp -#define TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED - -// #included from: catch_interfaces_testcase.h -#define TWOBLUECUBES_CATCH_INTERFACES_TESTCASE_H_INCLUDED - -#include - -namespace Catch { - - class TestSpec; - - struct ITestCase : IShared { - virtual void invoke () const = 0; - protected: - virtual ~ITestCase(); - }; - - class TestCase; - struct IConfig; - - struct ITestCaseRegistry { - virtual ~ITestCaseRegistry(); - virtual std::vector const& getAllTests() const = 0; - virtual std::vector const& getAllTestsSorted( IConfig const& config ) const = 0; - }; - - bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ); - std::vector filterTests( std::vector const& testCases, TestSpec const& testSpec, IConfig const& config ); - std::vector const& getAllTestCasesSorted( IConfig const& config ); - -} - -namespace Catch { - -template -class MethodTestCase : public SharedImpl { - -public: - MethodTestCase( void (C::*method)() ) : m_method( method ) {} - - virtual void invoke() const { - C obj; - (obj.*m_method)(); - } - -private: - virtual ~MethodTestCase() {} - - void (C::*m_method)(); -}; - -typedef void(*TestFunction)(); - -struct NameAndDesc { - NameAndDesc( const char* _name = "", const char* _description= "" ) - : name( _name ), description( _description ) - {} - - const char* name; - const char* description; -}; - -void registerTestCase - ( ITestCase* testCase, - char const* className, - NameAndDesc const& nameAndDesc, - SourceLineInfo const& lineInfo ); - -struct AutoReg { - - AutoReg - ( TestFunction function, - SourceLineInfo const& lineInfo, - NameAndDesc const& nameAndDesc ); - - template - AutoReg - ( void (C::*method)(), - char const* className, - NameAndDesc const& nameAndDesc, - SourceLineInfo const& lineInfo ) { - - registerTestCase - ( new MethodTestCase( method ), - className, - nameAndDesc, - lineInfo ); - } - - ~AutoReg(); - -private: - AutoReg( AutoReg const& ); - void operator= ( AutoReg const& ); -}; - -void registerTestCaseFunction - ( TestFunction function, - SourceLineInfo const& lineInfo, - NameAndDesc const& nameAndDesc ); - -} // end namespace Catch - -#ifdef CATCH_CONFIG_VARIADIC_MACROS - /////////////////////////////////////////////////////////////////////////////// - #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \ - static void TestName(); \ - CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ - namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &TestName, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( __VA_ARGS__ ) ); } \ - CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS \ - static void TestName() - #define INTERNAL_CATCH_TESTCASE( ... ) \ - INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), __VA_ARGS__ ) - - /////////////////////////////////////////////////////////////////////////////// - #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \ - CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ - namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &QualifiedMethod, "&" #QualifiedMethod, Catch::NameAndDesc( __VA_ARGS__ ), CATCH_INTERNAL_LINEINFO ); } \ - CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS - - /////////////////////////////////////////////////////////////////////////////// - #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\ - CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ - namespace{ \ - struct TestName : ClassName{ \ - void test(); \ - }; \ - Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( &TestName::test, #ClassName, Catch::NameAndDesc( __VA_ARGS__ ), CATCH_INTERNAL_LINEINFO ); \ - } \ - CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS \ - void TestName::test() - #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \ - INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, __VA_ARGS__ ) - - /////////////////////////////////////////////////////////////////////////////// - #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \ - CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ - Catch::AutoReg( Function, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( __VA_ARGS__ ) ); \ - CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS - -#else - /////////////////////////////////////////////////////////////////////////////// - #define INTERNAL_CATCH_TESTCASE2( TestName, Name, Desc ) \ - static void TestName(); \ - CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ - namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &TestName, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( Name, Desc ) ); }\ - CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS \ - static void TestName() - #define INTERNAL_CATCH_TESTCASE( Name, Desc ) \ - INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), Name, Desc ) - - /////////////////////////////////////////////////////////////////////////////// - #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, Name, Desc ) \ - CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ - namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &QualifiedMethod, "&" #QualifiedMethod, Catch::NameAndDesc( Name, Desc ), CATCH_INTERNAL_LINEINFO ); } \ - CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS - - /////////////////////////////////////////////////////////////////////////////// - #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestCaseName, ClassName, TestName, Desc )\ - CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ - namespace{ \ - struct TestCaseName : ClassName{ \ - void test(); \ - }; \ - Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( &TestCaseName::test, #ClassName, Catch::NameAndDesc( TestName, Desc ), CATCH_INTERNAL_LINEINFO ); \ - } \ - CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS \ - void TestCaseName::test() - #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, TestName, Desc )\ - INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, TestName, Desc ) - - /////////////////////////////////////////////////////////////////////////////// - #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, Name, Desc ) \ - CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ - Catch::AutoReg( Function, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( Name, Desc ) ); \ - CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS - -#endif - -// #included from: internal/catch_capture.hpp -#define TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED - -// #included from: catch_result_builder.h -#define TWOBLUECUBES_CATCH_RESULT_BUILDER_H_INCLUDED - -// #included from: catch_result_type.h -#define TWOBLUECUBES_CATCH_RESULT_TYPE_H_INCLUDED - -namespace Catch { - - // ResultWas::OfType enum - struct ResultWas { enum OfType { - Unknown = -1, - Ok = 0, - Info = 1, - Warning = 2, - - FailureBit = 0x10, - - ExpressionFailed = FailureBit | 1, - ExplicitFailure = FailureBit | 2, - - Exception = 0x100 | FailureBit, - - ThrewException = Exception | 1, - DidntThrowException = Exception | 2, - - FatalErrorCondition = 0x200 | FailureBit - - }; }; - - inline bool isOk( ResultWas::OfType resultType ) { - return ( resultType & ResultWas::FailureBit ) == 0; - } - inline bool isJustInfo( int flags ) { - return flags == ResultWas::Info; - } - - // ResultDisposition::Flags enum - struct ResultDisposition { enum Flags { - Normal = 0x01, - - ContinueOnFailure = 0x02, // Failures fail test, but execution continues - FalseTest = 0x04, // Prefix expression with ! - SuppressFail = 0x08 // Failures are reported but do not fail the test - }; }; - - inline ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) { - return static_cast( static_cast( lhs ) | static_cast( rhs ) ); - } - - inline bool shouldContinueOnFailure( int flags ) { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; } - inline bool isFalseTest( int flags ) { return ( flags & ResultDisposition::FalseTest ) != 0; } - inline bool shouldSuppressFailure( int flags ) { return ( flags & ResultDisposition::SuppressFail ) != 0; } - -} // end namespace Catch - -// #included from: catch_assertionresult.h -#define TWOBLUECUBES_CATCH_ASSERTIONRESULT_H_INCLUDED - -#include - -namespace Catch { - - struct STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison; - - struct DecomposedExpression - { - virtual ~DecomposedExpression() {} - virtual bool isBinaryExpression() const { - return false; - } - virtual void reconstructExpression( std::string& dest ) const = 0; - - // Only simple binary comparisons can be decomposed. - // If more complex check is required then wrap sub-expressions in parentheses. - template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator + ( T const& ); - template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator - ( T const& ); - template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator * ( T const& ); - template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator / ( T const& ); - template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator % ( T const& ); - template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator && ( T const& ); - template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator || ( T const& ); - - private: - DecomposedExpression& operator = (DecomposedExpression const&); - }; - - struct AssertionInfo - { - AssertionInfo() {} - AssertionInfo( char const * _macroName, - SourceLineInfo const& _lineInfo, - char const * _capturedExpression, - ResultDisposition::Flags _resultDisposition, - char const * _secondArg = ""); - - char const * macroName; - SourceLineInfo lineInfo; - char const * capturedExpression; - ResultDisposition::Flags resultDisposition; - char const * secondArg; - }; - - struct AssertionResultData - { - AssertionResultData() : decomposedExpression( CATCH_NULL ) - , resultType( ResultWas::Unknown ) - , negated( false ) - , parenthesized( false ) {} - - void negate( bool parenthesize ) { - negated = !negated; - parenthesized = parenthesize; - if( resultType == ResultWas::Ok ) - resultType = ResultWas::ExpressionFailed; - else if( resultType == ResultWas::ExpressionFailed ) - resultType = ResultWas::Ok; - } - - std::string const& reconstructExpression() const { - if( decomposedExpression != CATCH_NULL ) { - decomposedExpression->reconstructExpression( reconstructedExpression ); - if( parenthesized ) { - reconstructedExpression.insert( 0, 1, '(' ); - reconstructedExpression.append( 1, ')' ); - } - if( negated ) { - reconstructedExpression.insert( 0, 1, '!' ); - } - decomposedExpression = CATCH_NULL; - } - return reconstructedExpression; - } - - mutable DecomposedExpression const* decomposedExpression; - mutable std::string reconstructedExpression; - std::string message; - ResultWas::OfType resultType; - bool negated; - bool parenthesized; - }; - - class AssertionResult { - public: - AssertionResult(); - AssertionResult( AssertionInfo const& info, AssertionResultData const& data ); - ~AssertionResult(); -# ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - AssertionResult( AssertionResult const& ) = default; - AssertionResult( AssertionResult && ) = default; - AssertionResult& operator = ( AssertionResult const& ) = default; - AssertionResult& operator = ( AssertionResult && ) = default; -# endif - - bool isOk() const; - bool succeeded() const; - ResultWas::OfType getResultType() const; - bool hasExpression() const; - bool hasMessage() const; - std::string getExpression() const; - std::string getExpressionInMacro() const; - bool hasExpandedExpression() const; - std::string getExpandedExpression() const; - std::string getMessage() const; - SourceLineInfo getSourceInfo() const; - std::string getTestMacroName() const; - void discardDecomposedExpression() const; - void expandDecomposedExpression() const; - - protected: - AssertionInfo m_info; - AssertionResultData m_resultData; - }; - -} // end namespace Catch - -// #included from: catch_matchers.hpp -#define TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED - -namespace Catch { -namespace Matchers { - namespace Impl { - - template struct MatchAllOf; - template struct MatchAnyOf; - template struct MatchNotOf; - - class MatcherUntypedBase { - public: - std::string toString() const { - if( m_cachedToString.empty() ) - m_cachedToString = describe(); - return m_cachedToString; - } - - protected: - virtual ~MatcherUntypedBase(); - virtual std::string describe() const = 0; - mutable std::string m_cachedToString; - private: - MatcherUntypedBase& operator = ( MatcherUntypedBase const& ); - }; - - template - struct MatcherMethod { - virtual bool match( ObjectT const& arg ) const = 0; - }; - template - struct MatcherMethod { - virtual bool match( PtrT* arg ) const = 0; - }; - - template - struct MatcherBase : MatcherUntypedBase, MatcherMethod { - - MatchAllOf operator && ( MatcherBase const& other ) const; - MatchAnyOf operator || ( MatcherBase const& other ) const; - MatchNotOf operator ! () const; - }; - - template - struct MatchAllOf : MatcherBase { - virtual bool match( ArgT const& arg ) const CATCH_OVERRIDE { - for( std::size_t i = 0; i < m_matchers.size(); ++i ) { - if (!m_matchers[i]->match(arg)) - return false; - } - return true; - } - virtual std::string describe() const CATCH_OVERRIDE { - std::string description; - description.reserve( 4 + m_matchers.size()*32 ); - description += "( "; - for( std::size_t i = 0; i < m_matchers.size(); ++i ) { - if( i != 0 ) - description += " and "; - description += m_matchers[i]->toString(); - } - description += " )"; - return description; - } - - MatchAllOf& operator && ( MatcherBase const& other ) { - m_matchers.push_back( &other ); - return *this; - } - - std::vector const*> m_matchers; - }; - template - struct MatchAnyOf : MatcherBase { - - virtual bool match( ArgT const& arg ) const CATCH_OVERRIDE { - for( std::size_t i = 0; i < m_matchers.size(); ++i ) { - if (m_matchers[i]->match(arg)) - return true; - } - return false; - } - virtual std::string describe() const CATCH_OVERRIDE { - std::string description; - description.reserve( 4 + m_matchers.size()*32 ); - description += "( "; - for( std::size_t i = 0; i < m_matchers.size(); ++i ) { - if( i != 0 ) - description += " or "; - description += m_matchers[i]->toString(); - } - description += " )"; - return description; - } - - MatchAnyOf& operator || ( MatcherBase const& other ) { - m_matchers.push_back( &other ); - return *this; - } - - std::vector const*> m_matchers; - }; - - template - struct MatchNotOf : MatcherBase { - - MatchNotOf( MatcherBase const& underlyingMatcher ) : m_underlyingMatcher( underlyingMatcher ) {} - - virtual bool match( ArgT const& arg ) const CATCH_OVERRIDE { - return !m_underlyingMatcher.match( arg ); - } - - virtual std::string describe() const CATCH_OVERRIDE { - return "not " + m_underlyingMatcher.toString(); - } - MatcherBase const& m_underlyingMatcher; - }; - - template - MatchAllOf MatcherBase::operator && ( MatcherBase const& other ) const { - return MatchAllOf() && *this && other; - } - template - MatchAnyOf MatcherBase::operator || ( MatcherBase const& other ) const { - return MatchAnyOf() || *this || other; - } - template - MatchNotOf MatcherBase::operator ! () const { - return MatchNotOf( *this ); - } - - } // namespace Impl - - // The following functions create the actual matcher objects. - // This allows the types to be inferred - // - deprecated: prefer ||, && and ! - template - inline Impl::MatchNotOf Not( Impl::MatcherBase const& underlyingMatcher ) { - return Impl::MatchNotOf( underlyingMatcher ); - } - template - inline Impl::MatchAllOf AllOf( Impl::MatcherBase const& m1, Impl::MatcherBase const& m2 ) { - return Impl::MatchAllOf() && m1 && m2; - } - template - inline Impl::MatchAllOf AllOf( Impl::MatcherBase const& m1, Impl::MatcherBase const& m2, Impl::MatcherBase const& m3 ) { - return Impl::MatchAllOf() && m1 && m2 && m3; - } - template - inline Impl::MatchAnyOf AnyOf( Impl::MatcherBase const& m1, Impl::MatcherBase const& m2 ) { - return Impl::MatchAnyOf() || m1 || m2; - } - template - inline Impl::MatchAnyOf AnyOf( Impl::MatcherBase const& m1, Impl::MatcherBase const& m2, Impl::MatcherBase const& m3 ) { - return Impl::MatchAnyOf() || m1 || m2 || m3; - } - -} // namespace Matchers - -using namespace Matchers; -using Matchers::Impl::MatcherBase; - -} // namespace Catch - -namespace Catch { - - struct TestFailureException{}; - - template class ExpressionLhs; - - struct CopyableStream { - CopyableStream() {} - CopyableStream( CopyableStream const& other ) { - oss << other.oss.str(); - } - CopyableStream& operator=( CopyableStream const& other ) { - oss.str(std::string()); - oss << other.oss.str(); - return *this; - } - std::ostringstream oss; - }; - - class ResultBuilder : public DecomposedExpression { - public: - ResultBuilder( char const* macroName, - SourceLineInfo const& lineInfo, - char const* capturedExpression, - ResultDisposition::Flags resultDisposition, - char const* secondArg = "" ); - ~ResultBuilder(); - - template - ExpressionLhs operator <= ( T const& operand ); - ExpressionLhs operator <= ( bool value ); - - template - ResultBuilder& operator << ( T const& value ) { - m_stream().oss << value; - return *this; - } - - ResultBuilder& setResultType( ResultWas::OfType result ); - ResultBuilder& setResultType( bool result ); - - void endExpression( DecomposedExpression const& expr ); - - virtual void reconstructExpression( std::string& dest ) const CATCH_OVERRIDE; - - AssertionResult build() const; - AssertionResult build( DecomposedExpression const& expr ) const; - - void useActiveException( ResultDisposition::Flags resultDisposition = ResultDisposition::Normal ); - void captureResult( ResultWas::OfType resultType ); - void captureExpression(); - void captureExpectedException( std::string const& expectedMessage ); - void captureExpectedException( Matchers::Impl::MatcherBase const& matcher ); - void handleResult( AssertionResult const& result ); - void react(); - bool shouldDebugBreak() const; - bool allowThrows() const; - - template - void captureMatch( ArgT const& arg, MatcherT const& matcher, char const* matcherString ); - - void setExceptionGuard(); - void unsetExceptionGuard(); - - private: - AssertionInfo m_assertionInfo; - AssertionResultData m_data; - - static CopyableStream &m_stream() - { - static CopyableStream s; - return s; - } - - bool m_shouldDebugBreak; - bool m_shouldThrow; - bool m_guardException; - }; - -} // namespace Catch - -// Include after due to circular dependency: -// #included from: catch_expression_lhs.hpp -#define TWOBLUECUBES_CATCH_EXPRESSION_LHS_HPP_INCLUDED - -// #included from: catch_evaluate.hpp -#define TWOBLUECUBES_CATCH_EVALUATE_HPP_INCLUDED - -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable:4389) // '==' : signed/unsigned mismatch -#pragma warning(disable:4312) // Converting int to T* using reinterpret_cast (issue on x64 platform) -#endif - -#include - -namespace Catch { -namespace Internal { - - enum Operator { - IsEqualTo, - IsNotEqualTo, - IsLessThan, - IsGreaterThan, - IsLessThanOrEqualTo, - IsGreaterThanOrEqualTo - }; - - template struct OperatorTraits { static const char* getName(){ return "*error*"; } }; - template<> struct OperatorTraits { static const char* getName(){ return "=="; } }; - template<> struct OperatorTraits { static const char* getName(){ return "!="; } }; - template<> struct OperatorTraits { static const char* getName(){ return "<"; } }; - template<> struct OperatorTraits { static const char* getName(){ return ">"; } }; - template<> struct OperatorTraits { static const char* getName(){ return "<="; } }; - template<> struct OperatorTraits{ static const char* getName(){ return ">="; } }; - - template - inline T& opCast(T const& t) { return const_cast(t); } - -// nullptr_t support based on pull request #154 from Konstantin Baumann -#ifdef CATCH_CONFIG_CPP11_NULLPTR - inline std::nullptr_t opCast(std::nullptr_t) { return nullptr; } -#endif // CATCH_CONFIG_CPP11_NULLPTR - - // So the compare overloads can be operator agnostic we convey the operator as a template - // enum, which is used to specialise an Evaluator for doing the comparison. - template - class Evaluator{}; - - template - struct Evaluator { - static bool evaluate( T1 const& lhs, T2 const& rhs) { - return bool( opCast( lhs ) == opCast( rhs ) ); - } - }; - template - struct Evaluator { - static bool evaluate( T1 const& lhs, T2 const& rhs ) { - return bool( opCast( lhs ) != opCast( rhs ) ); - } - }; - template - struct Evaluator { - static bool evaluate( T1 const& lhs, T2 const& rhs ) { - return bool( opCast( lhs ) < opCast( rhs ) ); - } - }; - template - struct Evaluator { - static bool evaluate( T1 const& lhs, T2 const& rhs ) { - return bool( opCast( lhs ) > opCast( rhs ) ); - } - }; - template - struct Evaluator { - static bool evaluate( T1 const& lhs, T2 const& rhs ) { - return bool( opCast( lhs ) >= opCast( rhs ) ); - } - }; - template - struct Evaluator { - static bool evaluate( T1 const& lhs, T2 const& rhs ) { - return bool( opCast( lhs ) <= opCast( rhs ) ); - } - }; - - template - bool applyEvaluator( T1 const& lhs, T2 const& rhs ) { - return Evaluator::evaluate( lhs, rhs ); - } - - // This level of indirection allows us to specialise for integer types - // to avoid signed/ unsigned warnings - - // "base" overload - template - bool compare( T1 const& lhs, T2 const& rhs ) { - return Evaluator::evaluate( lhs, rhs ); - } - - // unsigned X to int - template bool compare( unsigned int lhs, int rhs ) { - return applyEvaluator( lhs, static_cast( rhs ) ); - } - template bool compare( unsigned long lhs, int rhs ) { - return applyEvaluator( lhs, static_cast( rhs ) ); - } - template bool compare( unsigned char lhs, int rhs ) { - return applyEvaluator( lhs, static_cast( rhs ) ); - } - - // unsigned X to long - template bool compare( unsigned int lhs, long rhs ) { - return applyEvaluator( lhs, static_cast( rhs ) ); - } - template bool compare( unsigned long lhs, long rhs ) { - return applyEvaluator( lhs, static_cast( rhs ) ); - } - template bool compare( unsigned char lhs, long rhs ) { - return applyEvaluator( lhs, static_cast( rhs ) ); - } - - // int to unsigned X - template bool compare( int lhs, unsigned int rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - template bool compare( int lhs, unsigned long rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - template bool compare( int lhs, unsigned char rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - - // long to unsigned X - template bool compare( long lhs, unsigned int rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - template bool compare( long lhs, unsigned long rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - template bool compare( long lhs, unsigned char rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - - // pointer to long (when comparing against NULL) - template bool compare( long lhs, T* rhs ) { - return Evaluator::evaluate( reinterpret_cast( lhs ), rhs ); - } - template bool compare( T* lhs, long rhs ) { - return Evaluator::evaluate( lhs, reinterpret_cast( rhs ) ); - } - - // pointer to int (when comparing against NULL) - template bool compare( int lhs, T* rhs ) { - return Evaluator::evaluate( reinterpret_cast( lhs ), rhs ); - } - template bool compare( T* lhs, int rhs ) { - return Evaluator::evaluate( lhs, reinterpret_cast( rhs ) ); - } - -#ifdef CATCH_CONFIG_CPP11_LONG_LONG - // long long to unsigned X - template bool compare( long long lhs, unsigned int rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - template bool compare( long long lhs, unsigned long rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - template bool compare( long long lhs, unsigned long long rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - template bool compare( long long lhs, unsigned char rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - - // unsigned long long to X - template bool compare( unsigned long long lhs, int rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - template bool compare( unsigned long long lhs, long rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - template bool compare( unsigned long long lhs, long long rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - template bool compare( unsigned long long lhs, char rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - - // pointer to long long (when comparing against NULL) - template bool compare( long long lhs, T* rhs ) { - return Evaluator::evaluate( reinterpret_cast( lhs ), rhs ); - } - template bool compare( T* lhs, long long rhs ) { - return Evaluator::evaluate( lhs, reinterpret_cast( rhs ) ); - } -#endif // CATCH_CONFIG_CPP11_LONG_LONG - -#ifdef CATCH_CONFIG_CPP11_NULLPTR - // pointer to nullptr_t (when comparing against nullptr) - template bool compare( std::nullptr_t, T* rhs ) { - return Evaluator::evaluate( nullptr, rhs ); - } - template bool compare( T* lhs, std::nullptr_t ) { - return Evaluator::evaluate( lhs, nullptr ); - } -#endif // CATCH_CONFIG_CPP11_NULLPTR - -} // end of namespace Internal -} // end of namespace Catch - -#ifdef _MSC_VER -#pragma warning(pop) -#endif - -// #included from: catch_tostring.h -#define TWOBLUECUBES_CATCH_TOSTRING_H_INCLUDED - -#include -#include -#include -#include -#include - -#ifdef __OBJC__ -// #included from: catch_objc_arc.hpp -#define TWOBLUECUBES_CATCH_OBJC_ARC_HPP_INCLUDED - -#import - -#ifdef __has_feature -#define CATCH_ARC_ENABLED __has_feature(objc_arc) -#else -#define CATCH_ARC_ENABLED 0 -#endif - -void arcSafeRelease( NSObject* obj ); -id performOptionalSelector( id obj, SEL sel ); - -#if !CATCH_ARC_ENABLED -inline void arcSafeRelease( NSObject* obj ) { - [obj release]; -} -inline id performOptionalSelector( id obj, SEL sel ) { - if( [obj respondsToSelector: sel] ) - return [obj performSelector: sel]; - return nil; -} -#define CATCH_UNSAFE_UNRETAINED -#define CATCH_ARC_STRONG -#else -inline void arcSafeRelease( NSObject* ){} -inline id performOptionalSelector( id obj, SEL sel ) { -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Warc-performSelector-leaks" -#endif - if( [obj respondsToSelector: sel] ) - return [obj performSelector: sel]; -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - return nil; -} -#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained -#define CATCH_ARC_STRONG __strong -#endif - -#endif - -#ifdef CATCH_CONFIG_CPP11_TUPLE -#include -#endif - -#ifdef CATCH_CONFIG_CPP11_IS_ENUM -#include -#endif - -namespace Catch { - -// Why we're here. -template -std::string toString( T const& value ); - -// Built in overloads - -std::string toString( std::string const& value ); -std::string toString( std::wstring const& value ); -std::string toString( const char* const value ); -std::string toString( char* const value ); -std::string toString( const wchar_t* const value ); -std::string toString( wchar_t* const value ); -std::string toString( int value ); -std::string toString( unsigned long value ); -std::string toString( unsigned int value ); -std::string toString( const double value ); -std::string toString( const float value ); -std::string toString( bool value ); -std::string toString( char value ); -std::string toString( signed char value ); -std::string toString( unsigned char value ); - -#ifdef CATCH_CONFIG_CPP11_LONG_LONG -std::string toString( long long value ); -std::string toString( unsigned long long value ); -#endif - -#ifdef CATCH_CONFIG_CPP11_NULLPTR -std::string toString( std::nullptr_t ); -#endif - -#ifdef __OBJC__ - std::string toString( NSString const * const& nsstring ); - std::string toString( NSString * CATCH_ARC_STRONG & nsstring ); - std::string toString( NSObject* const& nsObject ); -#endif - -namespace Detail { - - extern const std::string unprintableString; - - #if !defined(CATCH_CONFIG_CPP11_STREAM_INSERTABLE_CHECK) - struct BorgType { - template BorgType( T const& ); - }; - - struct TrueType { char sizer[1]; }; - struct FalseType { char sizer[2]; }; - - TrueType& testStreamable( std::ostream& ); - FalseType testStreamable( FalseType ); - - FalseType operator<<( std::ostream const&, BorgType const& ); - - template - struct IsStreamInsertable { - static std::ostream &s; - static T const&t; - enum { value = sizeof( testStreamable(s << t) ) == sizeof( TrueType ) }; - }; -#else - template - class IsStreamInsertable { - template - static auto test(int) - -> decltype( std::declval() << std::declval(), std::true_type() ); - - template - static auto test(...) -> std::false_type; - - public: - static const bool value = decltype(test(0))::value; - }; -#endif - -#if defined(CATCH_CONFIG_CPP11_IS_ENUM) - template::value - > - struct EnumStringMaker - { - static std::string convert( T const& ) { return unprintableString; } - }; - - template - struct EnumStringMaker - { - static std::string convert( T const& v ) - { - return ::Catch::toString( - static_cast::type>(v) - ); - } - }; -#endif - template - struct StringMakerBase { -#if defined(CATCH_CONFIG_CPP11_IS_ENUM) - template - static std::string convert( T const& v ) - { - return EnumStringMaker::convert( v ); - } -#else - template - static std::string convert( T const& ) { return unprintableString; } -#endif - }; - - template<> - struct StringMakerBase { - template - static std::string convert( T const& _value ) { - std::ostringstream oss; - oss << _value; - return oss.str(); - } - }; - - std::string rawMemoryToString( const void *object, std::size_t size ); - - template - inline std::string rawMemoryToString( const T& object ) { - return rawMemoryToString( &object, sizeof(object) ); - } - -} // end namespace Detail - -template -struct StringMaker : - Detail::StringMakerBase::value> {}; - -template -struct StringMaker { - template - static std::string convert( U* p ) { - if( !p ) - return "NULL"; - else - return Detail::rawMemoryToString( p ); - } -}; - -template -struct StringMaker { - static std::string convert( R C::* p ) { - if( !p ) - return "NULL"; - else - return Detail::rawMemoryToString( p ); - } -}; - -namespace Detail { - template - std::string rangeToString( InputIterator first, InputIterator last ); -} - -//template -//struct StringMaker > { -// static std::string convert( std::vector const& v ) { -// return Detail::rangeToString( v.begin(), v.end() ); -// } -//}; - -template -std::string toString( std::vector const& v ) { - return Detail::rangeToString( v.begin(), v.end() ); -} - -#ifdef CATCH_CONFIG_CPP11_TUPLE - -// toString for tuples -namespace TupleDetail { - template< - typename Tuple, - std::size_t N = 0, - bool = (N < std::tuple_size::value) - > - struct ElementPrinter { - static void print( const Tuple& tuple, std::ostream& os ) - { - os << ( N ? ", " : " " ) - << Catch::toString(std::get(tuple)); - ElementPrinter::print(tuple,os); - } - }; - - template< - typename Tuple, - std::size_t N - > - struct ElementPrinter { - static void print( const Tuple&, std::ostream& ) {} - }; - -} - -template -struct StringMaker> { - - static std::string convert( const std::tuple& tuple ) - { - std::ostringstream os; - os << '{'; - TupleDetail::ElementPrinter>::print( tuple, os ); - os << " }"; - return os.str(); - } -}; -#endif // CATCH_CONFIG_CPP11_TUPLE - -namespace Detail { - template - std::string makeString( T const& value ) { - return StringMaker::convert( value ); - } -} // end namespace Detail - -/// \brief converts any type to a string -/// -/// The default template forwards on to ostringstream - except when an -/// ostringstream overload does not exist - in which case it attempts to detect -/// that and writes {?}. -/// Overload (not specialise) this template for custom typs that you don't want -/// to provide an ostream overload for. -template -std::string toString( T const& value ) { - return StringMaker::convert( value ); -} - - namespace Detail { - template - std::string rangeToString( InputIterator first, InputIterator last ) { - std::ostringstream oss; - oss << "{ "; - if( first != last ) { - oss << Catch::toString( *first ); - for( ++first ; first != last ; ++first ) - oss << ", " << Catch::toString( *first ); - } - oss << " }"; - return oss.str(); - } -} - -} // end namespace Catch - -namespace Catch { - -template -class BinaryExpression; - -template -class MatchExpression; - -// Wraps the LHS of an expression and overloads comparison operators -// for also capturing those and RHS (if any) -template -class ExpressionLhs : public DecomposedExpression { -public: - ExpressionLhs( ResultBuilder& rb, T lhs ) : m_rb( rb ), m_lhs( lhs ), m_truthy(false) {} - - ExpressionLhs& operator = ( const ExpressionLhs& ); - - template - BinaryExpression - operator == ( RhsT const& rhs ) { - return captureExpression( rhs ); - } - - template - BinaryExpression - operator != ( RhsT const& rhs ) { - return captureExpression( rhs ); - } - - template - BinaryExpression - operator < ( RhsT const& rhs ) { - return captureExpression( rhs ); - } - - template - BinaryExpression - operator > ( RhsT const& rhs ) { - return captureExpression( rhs ); - } - - template - BinaryExpression - operator <= ( RhsT const& rhs ) { - return captureExpression( rhs ); - } - - template - BinaryExpression - operator >= ( RhsT const& rhs ) { - return captureExpression( rhs ); - } - - BinaryExpression operator == ( bool rhs ) { - return captureExpression( rhs ); - } - - BinaryExpression operator != ( bool rhs ) { - return captureExpression( rhs ); - } - - void endExpression() { - m_truthy = m_lhs ? true : false; - m_rb - .setResultType( m_truthy ) - .endExpression( *this ); - } - - virtual void reconstructExpression( std::string& dest ) const CATCH_OVERRIDE { - dest = Catch::toString( m_lhs ); - } - -private: - template - BinaryExpression captureExpression( RhsT& rhs ) const { - return BinaryExpression( m_rb, m_lhs, rhs ); - } - - template - BinaryExpression captureExpression( bool rhs ) const { - return BinaryExpression( m_rb, m_lhs, rhs ); - } - -private: - ResultBuilder& m_rb; - T m_lhs; - bool m_truthy; -}; - -template -class BinaryExpression : public DecomposedExpression { -public: - BinaryExpression( ResultBuilder& rb, LhsT lhs, RhsT rhs ) - : m_rb( rb ), m_lhs( lhs ), m_rhs( rhs ) {} - - BinaryExpression& operator = ( BinaryExpression& ); - - void endExpression() const { - m_rb - .setResultType( Internal::compare( m_lhs, m_rhs ) ) - .endExpression( *this ); - } - - virtual bool isBinaryExpression() const CATCH_OVERRIDE { - return true; - } - - virtual void reconstructExpression( std::string& dest ) const CATCH_OVERRIDE { - std::string lhs = Catch::toString( m_lhs ); - std::string rhs = Catch::toString( m_rhs ); - char delim = lhs.size() + rhs.size() < 40 && - lhs.find('\n') == std::string::npos && - rhs.find('\n') == std::string::npos ? ' ' : '\n'; - dest.reserve( 7 + lhs.size() + rhs.size() ); - // 2 for spaces around operator - // 2 for operator - // 2 for parentheses (conditionally added later) - // 1 for negation (conditionally added later) - dest = lhs; - dest += delim; - dest += Internal::OperatorTraits::getName(); - dest += delim; - dest += rhs; - } - -private: - ResultBuilder& m_rb; - LhsT m_lhs; - RhsT m_rhs; -}; - -template -class MatchExpression : public DecomposedExpression { -public: - MatchExpression( ArgT arg, MatcherT matcher, char const* matcherString ) - : m_arg( arg ), m_matcher( matcher ), m_matcherString( matcherString ) {} - - virtual bool isBinaryExpression() const CATCH_OVERRIDE { - return true; - } - - virtual void reconstructExpression( std::string& dest ) const CATCH_OVERRIDE { - std::string matcherAsString = m_matcher.toString(); - dest = Catch::toString( m_arg ); - dest += ' '; - if( matcherAsString == Detail::unprintableString ) - dest += m_matcherString; - else - dest += matcherAsString; - } - -private: - ArgT m_arg; - MatcherT m_matcher; - char const* m_matcherString; -}; - -} // end namespace Catch - - -namespace Catch { - - template - inline ExpressionLhs ResultBuilder::operator <= ( T const& operand ) { - return ExpressionLhs( *this, operand ); - } - - inline ExpressionLhs ResultBuilder::operator <= ( bool value ) { - return ExpressionLhs( *this, value ); - } - - template - inline void ResultBuilder::captureMatch( ArgT const& arg, MatcherT const& matcher, - char const* matcherString ) { - MatchExpression expr( arg, matcher, matcherString ); - setResultType( matcher.match( arg ) ); - endExpression( expr ); - } - -} // namespace Catch - -// #included from: catch_message.h -#define TWOBLUECUBES_CATCH_MESSAGE_H_INCLUDED - -#include - -namespace Catch { - - struct MessageInfo { - MessageInfo( std::string const& _macroName, - SourceLineInfo const& _lineInfo, - ResultWas::OfType _type ); - - std::string macroName; - SourceLineInfo lineInfo; - ResultWas::OfType type; - std::string message; - unsigned int sequence; - - bool operator == ( MessageInfo const& other ) const { - return sequence == other.sequence; - } - bool operator < ( MessageInfo const& other ) const { - return sequence < other.sequence; - } - private: - static unsigned int globalCount; - }; - - struct MessageBuilder { - MessageBuilder( std::string const& macroName, - SourceLineInfo const& lineInfo, - ResultWas::OfType type ) - : m_info( macroName, lineInfo, type ) - {} - - template - MessageBuilder& operator << ( T const& value ) { - m_stream << value; - return *this; - } - - MessageInfo m_info; - std::ostringstream m_stream; - }; - - class ScopedMessage { - public: - ScopedMessage( MessageBuilder const& builder ); - ScopedMessage( ScopedMessage const& other ); - ~ScopedMessage(); - - MessageInfo m_info; - }; - -} // end namespace Catch - -// #included from: catch_interfaces_capture.h -#define TWOBLUECUBES_CATCH_INTERFACES_CAPTURE_H_INCLUDED - -#include - -namespace Catch { - - class TestCase; - class AssertionResult; - struct AssertionInfo; - struct SectionInfo; - struct SectionEndInfo; - struct MessageInfo; - class ScopedMessageBuilder; - struct Counts; - - struct IResultCapture { - - virtual ~IResultCapture(); - - virtual void assertionEnded( AssertionResult const& result ) = 0; - virtual bool sectionStarted( SectionInfo const& sectionInfo, - Counts& assertions ) = 0; - virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0; - virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0; - virtual void pushScopedMessage( MessageInfo const& message ) = 0; - virtual void popScopedMessage( MessageInfo const& message ) = 0; - - virtual std::string getCurrentTestName() const = 0; - virtual const AssertionResult* getLastResult() const = 0; - - virtual void exceptionEarlyReported() = 0; - - virtual void handleFatalErrorCondition( std::string const& message ) = 0; - }; - - IResultCapture& getResultCapture(); -} - -// #included from: catch_debugger.h -#define TWOBLUECUBES_CATCH_DEBUGGER_H_INCLUDED - -// #included from: catch_platform.h -#define TWOBLUECUBES_CATCH_PLATFORM_H_INCLUDED - -#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) -# define CATCH_PLATFORM_MAC -#elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED) -# define CATCH_PLATFORM_IPHONE -#elif defined(linux) || defined(__linux) || defined(__linux__) -# define CATCH_PLATFORM_LINUX -#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) -# define CATCH_PLATFORM_WINDOWS -# if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX) -# define CATCH_DEFINES_NOMINMAX -# endif -# if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN) -# define CATCH_DEFINES_WIN32_LEAN_AND_MEAN -# endif -#endif - -#include - -namespace Catch{ - - bool isDebuggerActive(); - void writeToDebugConsole( std::string const& text ); -} - -#ifdef CATCH_PLATFORM_MAC - - // The following code snippet based on: - // http://cocoawithlove.com/2008/03/break-into-debugger.html - #if defined(__ppc64__) || defined(__ppc__) - #define CATCH_TRAP() \ - __asm__("li r0, 20\nsc\nnop\nli r0, 37\nli r4, 2\nsc\nnop\n" \ - : : : "memory","r0","r3","r4" ) - #else - #define CATCH_TRAP() __asm__("int $3\n" : : ) - #endif - -#elif defined(CATCH_PLATFORM_LINUX) - // If we can use inline assembler, do it because this allows us to break - // directly at the location of the failing check instead of breaking inside - // raise() called from it, i.e. one stack frame below. - #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64)) - #define CATCH_TRAP() asm volatile ("int $3") - #else // Fall back to the generic way. - #include - - #define CATCH_TRAP() raise(SIGTRAP) - #endif -#elif defined(_MSC_VER) - #define CATCH_TRAP() __debugbreak() -#elif defined(__MINGW32__) - extern "C" __declspec(dllimport) void __stdcall DebugBreak(); - #define CATCH_TRAP() DebugBreak() -#endif - -#ifdef CATCH_TRAP - #define CATCH_BREAK_INTO_DEBUGGER() if( Catch::isDebuggerActive() ) { CATCH_TRAP(); } -#else - #define CATCH_BREAK_INTO_DEBUGGER() Catch::alwaysTrue(); -#endif - -// #included from: catch_interfaces_runner.h -#define TWOBLUECUBES_CATCH_INTERFACES_RUNNER_H_INCLUDED - -namespace Catch { - class TestCase; - - struct IRunner { - virtual ~IRunner(); - virtual bool aborting() const = 0; - }; -} - -#if defined(CATCH_CONFIG_FAST_COMPILE) -/////////////////////////////////////////////////////////////////////////////// -// We can speedup compilation significantly by breaking into debugger lower in -// the callstack, because then we don't have to expand CATCH_BREAK_INTO_DEBUGGER -// macro in each assertion -#define INTERNAL_CATCH_REACT( resultBuilder ) \ - resultBuilder.react(); - -/////////////////////////////////////////////////////////////////////////////// -// Another way to speed-up compilation is to omit local try-catch for REQUIRE* -// macros. -// This can potentially cause false negative, if the test code catches -// the exception before it propagates back up to the runner. -#define INTERNAL_CATCH_TEST_NO_TRY( macroName, resultDisposition, expr ) \ - do { \ - Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \ - __catchResult.setExceptionGuard(); \ - CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \ - ( __catchResult <= expr ).endExpression(); \ - CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \ - __catchResult.unsetExceptionGuard(); \ - INTERNAL_CATCH_REACT( __catchResult ) \ - } while( Catch::isTrue( false && static_cast( !!(expr) ) ) ) // expr here is never evaluated at runtime but it forces the compiler to give it a look -// The double negation silences MSVC's C4800 warning, the static_cast forces short-circuit evaluation if the type has overloaded &&. - -#define INTERNAL_CHECK_THAT_NO_TRY( macroName, matcher, resultDisposition, arg ) \ - do { \ - Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #arg ", " #matcher, resultDisposition ); \ - __catchResult.setExceptionGuard(); \ - __catchResult.captureMatch( arg, matcher, #matcher ); \ - __catchResult.unsetExceptionGuard(); \ - INTERNAL_CATCH_REACT( __catchResult ) \ - } while( Catch::alwaysFalse() ) - -#else -/////////////////////////////////////////////////////////////////////////////// -// In the event of a failure works out if the debugger needs to be invoked -// and/or an exception thrown and takes appropriate action. -// This needs to be done as a macro so the debugger will stop in the user -// source code rather than in Catch library code -#define INTERNAL_CATCH_REACT( resultBuilder ) \ - if( resultBuilder.shouldDebugBreak() ) CATCH_BREAK_INTO_DEBUGGER(); \ - resultBuilder.react(); -#endif - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_TEST( macroName, resultDisposition, expr ) \ - do { \ - Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \ - try { \ - CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \ - ( __catchResult <= expr ).endExpression(); \ - CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \ - } \ - catch( ... ) { \ - __catchResult.useActiveException( resultDisposition ); \ - } \ - INTERNAL_CATCH_REACT( __catchResult ) \ - } while( Catch::isTrue( false && static_cast( !!(expr) ) ) ) // expr here is never evaluated at runtime but it forces the compiler to give it a look - // The double negation silences MSVC's C4800 warning, the static_cast forces short-circuit evaluation if the type has overloaded &&. - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_IF( macroName, resultDisposition, expr ) \ - INTERNAL_CATCH_TEST( macroName, resultDisposition, expr ); \ - if( Catch::getResultCapture().getLastResult()->succeeded() ) - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_ELSE( macroName, resultDisposition, expr ) \ - INTERNAL_CATCH_TEST( macroName, resultDisposition, expr ); \ - if( !Catch::getResultCapture().getLastResult()->succeeded() ) - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_NO_THROW( macroName, resultDisposition, expr ) \ - do { \ - Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \ - try { \ - static_cast(expr); \ - __catchResult.captureResult( Catch::ResultWas::Ok ); \ - } \ - catch( ... ) { \ - __catchResult.useActiveException( resultDisposition ); \ - } \ - INTERNAL_CATCH_REACT( __catchResult ) \ - } while( Catch::alwaysFalse() ) - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_THROWS( macroName, resultDisposition, matcher, expr ) \ - do { \ - Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition, #matcher ); \ - if( __catchResult.allowThrows() ) \ - try { \ - static_cast(expr); \ - __catchResult.captureResult( Catch::ResultWas::DidntThrowException ); \ - } \ - catch( ... ) { \ - __catchResult.captureExpectedException( matcher ); \ - } \ - else \ - __catchResult.captureResult( Catch::ResultWas::Ok ); \ - INTERNAL_CATCH_REACT( __catchResult ) \ - } while( Catch::alwaysFalse() ) - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_THROWS_AS( macroName, exceptionType, resultDisposition, expr ) \ - do { \ - Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr ", " #exceptionType, resultDisposition ); \ - if( __catchResult.allowThrows() ) \ - try { \ - static_cast(expr); \ - __catchResult.captureResult( Catch::ResultWas::DidntThrowException ); \ - } \ - catch( exceptionType ) { \ - __catchResult.captureResult( Catch::ResultWas::Ok ); \ - } \ - catch( ... ) { \ - __catchResult.useActiveException( resultDisposition ); \ - } \ - else \ - __catchResult.captureResult( Catch::ResultWas::Ok ); \ - INTERNAL_CATCH_REACT( __catchResult ) \ - } while( Catch::alwaysFalse() ) - -/////////////////////////////////////////////////////////////////////////////// -#ifdef CATCH_CONFIG_VARIADIC_MACROS - #define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, ... ) \ - do { \ - Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, "", resultDisposition ); \ - __catchResult << __VA_ARGS__ + ::Catch::StreamEndStop(); \ - __catchResult.captureResult( messageType ); \ - INTERNAL_CATCH_REACT( __catchResult ) \ - } while( Catch::alwaysFalse() ) -#else - #define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, log ) \ - do { \ - Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, "", resultDisposition ); \ - __catchResult << log + ::Catch::StreamEndStop(); \ - __catchResult.captureResult( messageType ); \ - INTERNAL_CATCH_REACT( __catchResult ) \ - } while( Catch::alwaysFalse() ) -#endif - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_INFO( macroName, log ) \ - Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage ) = Catch::MessageBuilder( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log; - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CHECK_THAT( macroName, matcher, resultDisposition, arg ) \ - do { \ - Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #arg ", " #matcher, resultDisposition ); \ - try { \ - __catchResult.captureMatch( arg, matcher, #matcher ); \ - } catch( ... ) { \ - __catchResult.useActiveException( resultDisposition | Catch::ResultDisposition::ContinueOnFailure ); \ - } \ - INTERNAL_CATCH_REACT( __catchResult ) \ - } while( Catch::alwaysFalse() ) - -// #included from: internal/catch_section.h -#define TWOBLUECUBES_CATCH_SECTION_H_INCLUDED - -// #included from: catch_section_info.h -#define TWOBLUECUBES_CATCH_SECTION_INFO_H_INCLUDED - -// #included from: catch_totals.hpp -#define TWOBLUECUBES_CATCH_TOTALS_HPP_INCLUDED - -#include - -namespace Catch { - - struct Counts { - Counts() : passed( 0 ), failed( 0 ), failedButOk( 0 ) {} - - Counts operator - ( Counts const& other ) const { - Counts diff; - diff.passed = passed - other.passed; - diff.failed = failed - other.failed; - diff.failedButOk = failedButOk - other.failedButOk; - return diff; - } - Counts& operator += ( Counts const& other ) { - passed += other.passed; - failed += other.failed; - failedButOk += other.failedButOk; - return *this; - } - - std::size_t total() const { - return passed + failed + failedButOk; - } - bool allPassed() const { - return failed == 0 && failedButOk == 0; - } - bool allOk() const { - return failed == 0; - } - - std::size_t passed; - std::size_t failed; - std::size_t failedButOk; - }; - - struct Totals { - - Totals operator - ( Totals const& other ) const { - Totals diff; - diff.assertions = assertions - other.assertions; - diff.testCases = testCases - other.testCases; - return diff; - } - - Totals delta( Totals const& prevTotals ) const { - Totals diff = *this - prevTotals; - if( diff.assertions.failed > 0 ) - ++diff.testCases.failed; - else if( diff.assertions.failedButOk > 0 ) - ++diff.testCases.failedButOk; - else - ++diff.testCases.passed; - return diff; - } - - Totals& operator += ( Totals const& other ) { - assertions += other.assertions; - testCases += other.testCases; - return *this; - } - - Counts assertions; - Counts testCases; - }; -} - -#include - -namespace Catch { - - struct SectionInfo { - SectionInfo - ( SourceLineInfo const& _lineInfo, - std::string const& _name, - std::string const& _description = std::string() ); - - std::string name; - std::string description; - SourceLineInfo lineInfo; - }; - - struct SectionEndInfo { - SectionEndInfo( SectionInfo const& _sectionInfo, Counts const& _prevAssertions, double _durationInSeconds ) - : sectionInfo( _sectionInfo ), prevAssertions( _prevAssertions ), durationInSeconds( _durationInSeconds ) - {} - - SectionInfo sectionInfo; - Counts prevAssertions; - double durationInSeconds; - }; - -} // end namespace Catch - -// #included from: catch_timer.h -#define TWOBLUECUBES_CATCH_TIMER_H_INCLUDED - -#ifdef _MSC_VER - -namespace Catch { - typedef unsigned long long UInt64; -} -#else -#include -namespace Catch { - typedef uint64_t UInt64; -} -#endif - -namespace Catch { - class Timer { - public: - Timer() : m_ticks( 0 ) {} - void start(); - unsigned int getElapsedMicroseconds() const; - unsigned int getElapsedMilliseconds() const; - double getElapsedSeconds() const; - - private: - UInt64 m_ticks; - }; - -} // namespace Catch - -#include - -namespace Catch { - - class Section : NonCopyable { - public: - Section( SectionInfo const& info ); - ~Section(); - - // This indicates whether the section should be executed or not - operator bool() const; - - private: - SectionInfo m_info; - - std::string m_name; - Counts m_assertions; - bool m_sectionIncluded; - Timer m_timer; - }; - -} // end namespace Catch - -#ifdef CATCH_CONFIG_VARIADIC_MACROS - #define INTERNAL_CATCH_SECTION( ... ) \ - if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) -#else - #define INTERNAL_CATCH_SECTION( name, desc ) \ - if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, name, desc ) ) -#endif - -// #included from: internal/catch_generators.hpp -#define TWOBLUECUBES_CATCH_GENERATORS_HPP_INCLUDED - -#include -#include -#include - -namespace Catch { - -template -struct IGenerator { - virtual ~IGenerator() {} - virtual T getValue( std::size_t index ) const = 0; - virtual std::size_t size () const = 0; -}; - -template -class BetweenGenerator : public IGenerator { -public: - BetweenGenerator( T from, T to ) : m_from( from ), m_to( to ){} - - virtual T getValue( std::size_t index ) const { - return m_from+static_cast( index ); - } - - virtual std::size_t size() const { - return static_cast( 1+m_to-m_from ); - } - -private: - - T m_from; - T m_to; -}; - -template -class ValuesGenerator : public IGenerator { -public: - ValuesGenerator(){} - - void add( T value ) { - m_values.push_back( value ); - } - - virtual T getValue( std::size_t index ) const { - return m_values[index]; - } - - virtual std::size_t size() const { - return m_values.size(); - } - -private: - std::vector m_values; -}; - -template -class CompositeGenerator { -public: - CompositeGenerator() : m_totalSize( 0 ) {} - - // *** Move semantics, similar to auto_ptr *** - CompositeGenerator( CompositeGenerator& other ) - : m_fileInfo( other.m_fileInfo ), - m_totalSize( 0 ) - { - move( other ); - } - - CompositeGenerator& setFileInfo( const char* fileInfo ) { - m_fileInfo = fileInfo; - return *this; - } - - ~CompositeGenerator() { - deleteAll( m_composed ); - } - - operator T () const { - size_t overallIndex = getCurrentContext().getGeneratorIndex( m_fileInfo, m_totalSize ); - - typename std::vector*>::const_iterator it = m_composed.begin(); - typename std::vector*>::const_iterator itEnd = m_composed.end(); - for( size_t index = 0; it != itEnd; ++it ) - { - const IGenerator* generator = *it; - if( overallIndex >= index && overallIndex < index + generator->size() ) - { - return generator->getValue( overallIndex-index ); - } - index += generator->size(); - } - CATCH_INTERNAL_ERROR( "Indexed past end of generated range" ); - return T(); // Suppress spurious "not all control paths return a value" warning in Visual Studio - if you know how to fix this please do so - } - - void add( const IGenerator* generator ) { - m_totalSize += generator->size(); - m_composed.push_back( generator ); - } - - CompositeGenerator& then( CompositeGenerator& other ) { - move( other ); - return *this; - } - - CompositeGenerator& then( T value ) { - ValuesGenerator* valuesGen = new ValuesGenerator(); - valuesGen->add( value ); - add( valuesGen ); - return *this; - } - -private: - - void move( CompositeGenerator& other ) { - m_composed.insert( m_composed.end(), other.m_composed.begin(), other.m_composed.end() ); - m_totalSize += other.m_totalSize; - other.m_composed.clear(); - } - - std::vector*> m_composed; - std::string m_fileInfo; - size_t m_totalSize; -}; - -namespace Generators -{ - template - CompositeGenerator between( T from, T to ) { - CompositeGenerator generators; - generators.add( new BetweenGenerator( from, to ) ); - return generators; - } - - template - CompositeGenerator values( T val1, T val2 ) { - CompositeGenerator generators; - ValuesGenerator* valuesGen = new ValuesGenerator(); - valuesGen->add( val1 ); - valuesGen->add( val2 ); - generators.add( valuesGen ); - return generators; - } - - template - CompositeGenerator values( T val1, T val2, T val3 ){ - CompositeGenerator generators; - ValuesGenerator* valuesGen = new ValuesGenerator(); - valuesGen->add( val1 ); - valuesGen->add( val2 ); - valuesGen->add( val3 ); - generators.add( valuesGen ); - return generators; - } - - template - CompositeGenerator values( T val1, T val2, T val3, T val4 ) { - CompositeGenerator generators; - ValuesGenerator* valuesGen = new ValuesGenerator(); - valuesGen->add( val1 ); - valuesGen->add( val2 ); - valuesGen->add( val3 ); - valuesGen->add( val4 ); - generators.add( valuesGen ); - return generators; - } - -} // end namespace Generators - -using namespace Generators; - -} // end namespace Catch - -#define INTERNAL_CATCH_LINESTR2( line ) #line -#define INTERNAL_CATCH_LINESTR( line ) INTERNAL_CATCH_LINESTR2( line ) - -#define INTERNAL_CATCH_GENERATE( expr ) expr.setFileInfo( __FILE__ "(" INTERNAL_CATCH_LINESTR( __LINE__ ) ")" ) - -// #included from: internal/catch_interfaces_exception.h -#define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED - -#include -#include - -// #included from: catch_interfaces_registry_hub.h -#define TWOBLUECUBES_CATCH_INTERFACES_REGISTRY_HUB_H_INCLUDED - -#include - -namespace Catch { - - class TestCase; - struct ITestCaseRegistry; - struct IExceptionTranslatorRegistry; - struct IExceptionTranslator; - struct IReporterRegistry; - struct IReporterFactory; - struct ITagAliasRegistry; - - struct IRegistryHub { - virtual ~IRegistryHub(); - - virtual IReporterRegistry const& getReporterRegistry() const = 0; - virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0; - virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0; - - virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() = 0; - }; - - struct IMutableRegistryHub { - virtual ~IMutableRegistryHub(); - virtual void registerReporter( std::string const& name, Ptr const& factory ) = 0; - virtual void registerListener( Ptr const& factory ) = 0; - virtual void registerTest( TestCase const& testInfo ) = 0; - virtual void registerTranslator( const IExceptionTranslator* translator ) = 0; - virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0; - }; - - IRegistryHub& getRegistryHub(); - IMutableRegistryHub& getMutableRegistryHub(); - void cleanUp(); - std::string translateActiveException(); - -} - -namespace Catch { - - typedef std::string(*exceptionTranslateFunction)(); - - struct IExceptionTranslator; - typedef std::vector ExceptionTranslators; - - struct IExceptionTranslator { - virtual ~IExceptionTranslator(); - virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0; - }; - - struct IExceptionTranslatorRegistry { - virtual ~IExceptionTranslatorRegistry(); - - virtual std::string translateActiveException() const = 0; - }; - - class ExceptionTranslatorRegistrar { - template - class ExceptionTranslator : public IExceptionTranslator { - public: - - ExceptionTranslator( std::string(*translateFunction)( T& ) ) - : m_translateFunction( translateFunction ) - {} - - virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const CATCH_OVERRIDE { - try { - if( it == itEnd ) - throw; - else - return (*it)->translate( it+1, itEnd ); - } - catch( T& ex ) { - return m_translateFunction( ex ); - } - } - - protected: - std::string(*m_translateFunction)( T& ); - }; - - public: - template - ExceptionTranslatorRegistrar( std::string(*translateFunction)( T& ) ) { - getMutableRegistryHub().registerTranslator - ( new ExceptionTranslator( translateFunction ) ); - } - }; -} - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \ - static std::string translatorName( signature ); \ - namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); }\ - static std::string translatorName( signature ) - -#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature ) - -// #included from: internal/catch_approx.hpp -#define TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED - -#include -#include - -#if defined(CATCH_CONFIG_CPP11_TYPE_TRAITS) -#include -#endif - -namespace Catch { -namespace Detail { - - class Approx { - public: - explicit Approx ( double value ) - : m_epsilon( std::numeric_limits::epsilon()*100 ), - m_margin( 0.0 ), - m_scale( 1.0 ), - m_value( value ) - {} - - Approx( Approx const& other ) - : m_epsilon( other.m_epsilon ), - m_margin( other.m_margin ), - m_scale( other.m_scale ), - m_value( other.m_value ) - {} - - static Approx custom() { - return Approx( 0 ); - } - -#if defined(CATCH_CONFIG_CPP11_TYPE_TRAITS) - - template ::value>::type> - Approx operator()( T value ) { - Approx approx( static_cast(value) ); - approx.epsilon( m_epsilon ); - approx.margin( m_margin ); - approx.scale( m_scale ); - return approx; - } - - template ::value>::type> - explicit Approx( T value ): Approx(static_cast(value)) - {} - - template ::value>::type> - friend bool operator == ( const T& lhs, Approx const& rhs ) { - // Thanks to Richard Harris for his help refining this formula - auto lhs_v = double(lhs); - bool relativeOK = std::fabs(lhs_v - rhs.m_value) < rhs.m_epsilon * (rhs.m_scale + (std::max)(std::fabs(lhs_v), std::fabs(rhs.m_value))); - if (relativeOK) { - return true; - } - return std::fabs(lhs_v - rhs.m_value) < rhs.m_margin; - } - - template ::value>::type> - friend bool operator == ( Approx const& lhs, const T& rhs ) { - return operator==( rhs, lhs ); - } - - template ::value>::type> - friend bool operator != ( T lhs, Approx const& rhs ) { - return !operator==( lhs, rhs ); - } - - template ::value>::type> - friend bool operator != ( Approx const& lhs, T rhs ) { - return !operator==( rhs, lhs ); - } - - template ::value>::type> - friend bool operator <= ( T lhs, Approx const& rhs ) { - return double(lhs) < rhs.m_value || lhs == rhs; - } - - template ::value>::type> - friend bool operator <= ( Approx const& lhs, T rhs ) { - return lhs.m_value < double(rhs) || lhs == rhs; - } - - template ::value>::type> - friend bool operator >= ( T lhs, Approx const& rhs ) { - return double(lhs) > rhs.m_value || lhs == rhs; - } - - template ::value>::type> - friend bool operator >= ( Approx const& lhs, T rhs ) { - return lhs.m_value > double(rhs) || lhs == rhs; - } - - template ::value>::type> - Approx& epsilon( T newEpsilon ) { - m_epsilon = double(newEpsilon); - return *this; - } - - template ::value>::type> - Approx& margin( T newMargin ) { - m_margin = double(newMargin); - return *this; - } - - template ::value>::type> - Approx& scale( T newScale ) { - m_scale = double(newScale); - return *this; - } - -#else - - Approx operator()( double value ) { - Approx approx( value ); - approx.epsilon( m_epsilon ); - approx.margin( m_margin ); - approx.scale( m_scale ); - return approx; - } - - friend bool operator == ( double lhs, Approx const& rhs ) { - // Thanks to Richard Harris for his help refining this formula - bool relativeOK = std::fabs( lhs - rhs.m_value ) < rhs.m_epsilon * (rhs.m_scale + (std::max)( std::fabs(lhs), std::fabs(rhs.m_value) ) ); - if (relativeOK) { - return true; - } - return std::fabs(lhs - rhs.m_value) < rhs.m_margin; - } - - friend bool operator == ( Approx const& lhs, double rhs ) { - return operator==( rhs, lhs ); - } - - friend bool operator != ( double lhs, Approx const& rhs ) { - return !operator==( lhs, rhs ); - } - - friend bool operator != ( Approx const& lhs, double rhs ) { - return !operator==( rhs, lhs ); - } - - friend bool operator <= ( double lhs, Approx const& rhs ) { - return lhs < rhs.m_value || lhs == rhs; - } - - friend bool operator <= ( Approx const& lhs, double rhs ) { - return lhs.m_value < rhs || lhs == rhs; - } - - friend bool operator >= ( double lhs, Approx const& rhs ) { - return lhs > rhs.m_value || lhs == rhs; - } - - friend bool operator >= ( Approx const& lhs, double rhs ) { - return lhs.m_value > rhs || lhs == rhs; - } - - Approx& epsilon( double newEpsilon ) { - m_epsilon = newEpsilon; - return *this; - } - - Approx& margin( double newMargin ) { - m_margin = newMargin; - return *this; - } - - Approx& scale( double newScale ) { - m_scale = newScale; - return *this; - } -#endif - - std::string toString() const { - std::ostringstream oss; - oss << "Approx( " << Catch::toString( m_value ) << " )"; - return oss.str(); - } - - private: - double m_epsilon; - double m_margin; - double m_scale; - double m_value; - }; -} - -template<> -inline std::string toString( Detail::Approx const& value ) { - return value.toString(); -} - -} // end namespace Catch - -// #included from: internal/catch_matchers_string.h -#define TWOBLUECUBES_CATCH_MATCHERS_STRING_H_INCLUDED - -namespace Catch { -namespace Matchers { - - namespace StdString { - - struct CasedString - { - CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity ); - std::string adjustString( std::string const& str ) const; - std::string caseSensitivitySuffix() const; - - CaseSensitive::Choice m_caseSensitivity; - std::string m_str; - }; - - struct StringMatcherBase : MatcherBase { - StringMatcherBase( std::string const& operation, CasedString const& comparator ); - virtual std::string describe() const CATCH_OVERRIDE; - - CasedString m_comparator; - std::string m_operation; - }; - - struct EqualsMatcher : StringMatcherBase { - EqualsMatcher( CasedString const& comparator ); - virtual bool match( std::string const& source ) const CATCH_OVERRIDE; - }; - struct ContainsMatcher : StringMatcherBase { - ContainsMatcher( CasedString const& comparator ); - virtual bool match( std::string const& source ) const CATCH_OVERRIDE; - }; - struct StartsWithMatcher : StringMatcherBase { - StartsWithMatcher( CasedString const& comparator ); - virtual bool match( std::string const& source ) const CATCH_OVERRIDE; - }; - struct EndsWithMatcher : StringMatcherBase { - EndsWithMatcher( CasedString const& comparator ); - virtual bool match( std::string const& source ) const CATCH_OVERRIDE; - }; - - } // namespace StdString - - // The following functions create the actual matcher objects. - // This allows the types to be inferred - - StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ); - StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ); - StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ); - StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ); - -} // namespace Matchers -} // namespace Catch - -// #included from: internal/catch_matchers_vector.h -#define TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED - -namespace Catch { -namespace Matchers { - - namespace Vector { - - template - struct ContainsElementMatcher : MatcherBase, T> { - - ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {} - - bool match(std::vector const &v) const CATCH_OVERRIDE { - return std::find(v.begin(), v.end(), m_comparator) != v.end(); - } - - virtual std::string describe() const CATCH_OVERRIDE { - return "Contains: " + Catch::toString( m_comparator ); - } - - T const& m_comparator; - }; - - template - struct ContainsMatcher : MatcherBase, std::vector > { - - ContainsMatcher(std::vector const &comparator) : m_comparator( comparator ) {} - - bool match(std::vector const &v) const CATCH_OVERRIDE { - // !TBD: see note in EqualsMatcher - if (m_comparator.size() > v.size()) - return false; - for (size_t i = 0; i < m_comparator.size(); ++i) - if (std::find(v.begin(), v.end(), m_comparator[i]) == v.end()) - return false; - return true; - } - virtual std::string describe() const CATCH_OVERRIDE { - return "Contains: " + Catch::toString( m_comparator ); - } - - std::vector const& m_comparator; - }; - - template - struct EqualsMatcher : MatcherBase, std::vector > { - - EqualsMatcher(std::vector const &comparator) : m_comparator( comparator ) {} - - bool match(std::vector const &v) const CATCH_OVERRIDE { - // !TBD: This currently works if all elements can be compared using != - // - a more general approach would be via a compare template that defaults - // to using !=. but could be specialised for, e.g. std::vector etc - // - then just call that directly - if (m_comparator.size() != v.size()) - return false; - for (size_t i = 0; i < v.size(); ++i) - if (m_comparator[i] != v[i]) - return false; - return true; - } - virtual std::string describe() const CATCH_OVERRIDE { - return "Equals: " + Catch::toString( m_comparator ); - } - std::vector const& m_comparator; - }; - - } // namespace Vector - - // The following functions create the actual matcher objects. - // This allows the types to be inferred - - template - Vector::ContainsMatcher Contains( std::vector const& comparator ) { - return Vector::ContainsMatcher( comparator ); - } - - template - Vector::ContainsElementMatcher VectorContains( T const& comparator ) { - return Vector::ContainsElementMatcher( comparator ); - } - - template - Vector::EqualsMatcher Equals( std::vector const& comparator ) { - return Vector::EqualsMatcher( comparator ); - } - -} // namespace Matchers -} // namespace Catch - -// #included from: internal/catch_interfaces_tag_alias_registry.h -#define TWOBLUECUBES_CATCH_INTERFACES_TAG_ALIAS_REGISTRY_H_INCLUDED - -// #included from: catch_tag_alias.h -#define TWOBLUECUBES_CATCH_TAG_ALIAS_H_INCLUDED - -#include - -namespace Catch { - - struct TagAlias { - TagAlias( std::string const& _tag, SourceLineInfo _lineInfo ) : tag( _tag ), lineInfo( _lineInfo ) {} - - std::string tag; - SourceLineInfo lineInfo; - }; - - struct RegistrarForTagAliases { - RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo ); - }; - -} // end namespace Catch - -#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } -// #included from: catch_option.hpp -#define TWOBLUECUBES_CATCH_OPTION_HPP_INCLUDED - -namespace Catch { - - // An optional type - template - class Option { - public: - Option() : nullableValue( CATCH_NULL ) {} - Option( T const& _value ) - : nullableValue( new( storage ) T( _value ) ) - {} - Option( Option const& _other ) - : nullableValue( _other ? new( storage ) T( *_other ) : CATCH_NULL ) - {} - - ~Option() { - reset(); - } - - Option& operator= ( Option const& _other ) { - if( &_other != this ) { - reset(); - if( _other ) - nullableValue = new( storage ) T( *_other ); - } - return *this; - } - Option& operator = ( T const& _value ) { - reset(); - nullableValue = new( storage ) T( _value ); - return *this; - } - - void reset() { - if( nullableValue ) - nullableValue->~T(); - nullableValue = CATCH_NULL; - } - - T& operator*() { return *nullableValue; } - T const& operator*() const { return *nullableValue; } - T* operator->() { return nullableValue; } - const T* operator->() const { return nullableValue; } - - T valueOr( T const& defaultValue ) const { - return nullableValue ? *nullableValue : defaultValue; - } - - bool some() const { return nullableValue != CATCH_NULL; } - bool none() const { return nullableValue == CATCH_NULL; } - - bool operator !() const { return nullableValue == CATCH_NULL; } - operator SafeBool::type() const { - return SafeBool::makeSafe( some() ); - } - - private: - T *nullableValue; - union { - char storage[sizeof(T)]; - - // These are here to force alignment for the storage - long double dummy1; - void (*dummy2)(); - long double dummy3; -#ifdef CATCH_CONFIG_CPP11_LONG_LONG - long long dummy4; -#endif - }; - }; - -} // end namespace Catch - -namespace Catch { - - struct ITagAliasRegistry { - virtual ~ITagAliasRegistry(); - virtual Option find( std::string const& alias ) const = 0; - virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0; - - static ITagAliasRegistry const& get(); - }; - -} // end namespace Catch - -// These files are included here so the single_include script doesn't put them -// in the conditionally compiled sections -// #included from: internal/catch_test_case_info.h -#define TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED - -#include -#include - -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wpadded" -#endif - -namespace Catch { - - struct ITestCase; - - struct TestCaseInfo { - enum SpecialProperties{ - None = 0, - IsHidden = 1 << 1, - ShouldFail = 1 << 2, - MayFail = 1 << 3, - Throws = 1 << 4, - NonPortable = 1 << 5 - }; - - TestCaseInfo( std::string const& _name, - std::string const& _className, - std::string const& _description, - std::set const& _tags, - SourceLineInfo const& _lineInfo ); - - TestCaseInfo( TestCaseInfo const& other ); - - friend void setTags( TestCaseInfo& testCaseInfo, std::set const& tags ); - - bool isHidden() const; - bool throws() const; - bool okToFail() const; - bool expectedToFail() const; - - std::string name; - std::string className; - std::string description; - std::set tags; - std::set lcaseTags; - std::string tagsAsString; - SourceLineInfo lineInfo; - SpecialProperties properties; - }; - - class TestCase : public TestCaseInfo { - public: - - TestCase( ITestCase* testCase, TestCaseInfo const& info ); - TestCase( TestCase const& other ); - - TestCase withName( std::string const& _newName ) const; - - void invoke() const; - - TestCaseInfo const& getTestCaseInfo() const; - - void swap( TestCase& other ); - bool operator == ( TestCase const& other ) const; - bool operator < ( TestCase const& other ) const; - TestCase& operator = ( TestCase const& other ); - - private: - Ptr test; - }; - - TestCase makeTestCase( ITestCase* testCase, - std::string const& className, - std::string const& name, - std::string const& description, - SourceLineInfo const& lineInfo ); -} - -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - - -#ifdef __OBJC__ -// #included from: internal/catch_objc.hpp -#define TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED - -#import - -#include - -// NB. Any general catch headers included here must be included -// in catch.hpp first to make sure they are included by the single -// header for non obj-usage - -/////////////////////////////////////////////////////////////////////////////// -// This protocol is really only here for (self) documenting purposes, since -// all its methods are optional. -@protocol OcFixture - -@optional - --(void) setUp; --(void) tearDown; - -@end - -namespace Catch { - - class OcMethod : public SharedImpl { - - public: - OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {} - - virtual void invoke() const { - id obj = [[m_cls alloc] init]; - - performOptionalSelector( obj, @selector(setUp) ); - performOptionalSelector( obj, m_sel ); - performOptionalSelector( obj, @selector(tearDown) ); - - arcSafeRelease( obj ); - } - private: - virtual ~OcMethod() {} - - Class m_cls; - SEL m_sel; - }; - - namespace Detail{ - - inline std::string getAnnotation( Class cls, - std::string const& annotationName, - std::string const& testCaseName ) { - NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()]; - SEL sel = NSSelectorFromString( selStr ); - arcSafeRelease( selStr ); - id value = performOptionalSelector( cls, sel ); - if( value ) - return [(NSString*)value UTF8String]; - return ""; - } - } - - inline size_t registerTestMethods() { - size_t noTestMethods = 0; - int noClasses = objc_getClassList( CATCH_NULL, 0 ); - - Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses); - objc_getClassList( classes, noClasses ); - - for( int c = 0; c < noClasses; c++ ) { - Class cls = classes[c]; - { - u_int count; - Method* methods = class_copyMethodList( cls, &count ); - for( u_int m = 0; m < count ; m++ ) { - SEL selector = method_getName(methods[m]); - std::string methodName = sel_getName(selector); - if( startsWith( methodName, "Catch_TestCase_" ) ) { - std::string testCaseName = methodName.substr( 15 ); - std::string name = Detail::getAnnotation( cls, "Name", testCaseName ); - std::string desc = Detail::getAnnotation( cls, "Description", testCaseName ); - const char* className = class_getName( cls ); - - getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, name.c_str(), desc.c_str(), SourceLineInfo() ) ); - noTestMethods++; - } - } - free(methods); - } - } - return noTestMethods; - } - - namespace Matchers { - namespace Impl { - namespace NSStringMatchers { - - struct StringHolder : MatcherBase{ - StringHolder( NSString* substr ) : m_substr( [substr copy] ){} - StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){} - StringHolder() { - arcSafeRelease( m_substr ); - } - - virtual bool match( NSString* arg ) const CATCH_OVERRIDE { - return false; - } - - NSString* m_substr; - }; - - struct Equals : StringHolder { - Equals( NSString* substr ) : StringHolder( substr ){} - - virtual bool match( NSString* str ) const CATCH_OVERRIDE { - return (str != nil || m_substr == nil ) && - [str isEqualToString:m_substr]; - } - - virtual std::string describe() const CATCH_OVERRIDE { - return "equals string: " + Catch::toString( m_substr ); - } - }; - - struct Contains : StringHolder { - Contains( NSString* substr ) : StringHolder( substr ){} - - virtual bool match( NSString* str ) const { - return (str != nil || m_substr == nil ) && - [str rangeOfString:m_substr].location != NSNotFound; - } - - virtual std::string describe() const CATCH_OVERRIDE { - return "contains string: " + Catch::toString( m_substr ); - } - }; - - struct StartsWith : StringHolder { - StartsWith( NSString* substr ) : StringHolder( substr ){} - - virtual bool match( NSString* str ) const { - return (str != nil || m_substr == nil ) && - [str rangeOfString:m_substr].location == 0; - } - - virtual std::string describe() const CATCH_OVERRIDE { - return "starts with: " + Catch::toString( m_substr ); - } - }; - struct EndsWith : StringHolder { - EndsWith( NSString* substr ) : StringHolder( substr ){} - - virtual bool match( NSString* str ) const { - return (str != nil || m_substr == nil ) && - [str rangeOfString:m_substr].location == [str length] - [m_substr length]; - } - - virtual std::string describe() const CATCH_OVERRIDE { - return "ends with: " + Catch::toString( m_substr ); - } - }; - - } // namespace NSStringMatchers - } // namespace Impl - - inline Impl::NSStringMatchers::Equals - Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); } - - inline Impl::NSStringMatchers::Contains - Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); } - - inline Impl::NSStringMatchers::StartsWith - StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); } - - inline Impl::NSStringMatchers::EndsWith - EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); } - - } // namespace Matchers - - using namespace Matchers; - -} // namespace Catch - -/////////////////////////////////////////////////////////////////////////////// -#define OC_TEST_CASE( name, desc )\ -+(NSString*) INTERNAL_CATCH_UNIQUE_NAME( Catch_Name_test ) \ -{\ -return @ name; \ -}\ -+(NSString*) INTERNAL_CATCH_UNIQUE_NAME( Catch_Description_test ) \ -{ \ -return @ desc; \ -} \ --(void) INTERNAL_CATCH_UNIQUE_NAME( Catch_TestCase_test ) - -#endif - -#ifdef CATCH_IMPL - -// !TBD: Move the leak detector code into a separate header -#ifdef CATCH_CONFIG_WINDOWS_CRTDBG -#include -class LeakDetector { -public: - LeakDetector() { - int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG); - flag |= _CRTDBG_LEAK_CHECK_DF; - flag |= _CRTDBG_ALLOC_MEM_DF; - _CrtSetDbgFlag(flag); - _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG); - _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR); - // Change this to leaking allocation's number to break there - _CrtSetBreakAlloc(-1); - } -}; -#else -class LeakDetector {}; -#endif - -LeakDetector leakDetector; - -// #included from: internal/catch_impl.hpp -#define TWOBLUECUBES_CATCH_IMPL_HPP_INCLUDED - -// Collect all the implementation files together here -// These are the equivalent of what would usually be cpp files - -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wweak-vtables" -#endif - -// #included from: ../catch_session.hpp -#define TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED - -// #included from: internal/catch_commandline.hpp -#define TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED - -// #included from: catch_config.hpp -#define TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED - -// #included from: catch_test_spec_parser.hpp -#define TWOBLUECUBES_CATCH_TEST_SPEC_PARSER_HPP_INCLUDED - -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wpadded" -#endif - -// #included from: catch_test_spec.hpp -#define TWOBLUECUBES_CATCH_TEST_SPEC_HPP_INCLUDED - -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wpadded" -#endif - -// #included from: catch_wildcard_pattern.hpp -#define TWOBLUECUBES_CATCH_WILDCARD_PATTERN_HPP_INCLUDED - -#include - -namespace Catch -{ - class WildcardPattern { - enum WildcardPosition { - NoWildcard = 0, - WildcardAtStart = 1, - WildcardAtEnd = 2, - WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd - }; - - public: - - WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity ) - : m_caseSensitivity( caseSensitivity ), - m_wildcard( NoWildcard ), - m_pattern( adjustCase( pattern ) ) - { - if( startsWith( m_pattern, '*' ) ) { - m_pattern = m_pattern.substr( 1 ); - m_wildcard = WildcardAtStart; - } - if( endsWith( m_pattern, '*' ) ) { - m_pattern = m_pattern.substr( 0, m_pattern.size()-1 ); - m_wildcard = static_cast( m_wildcard | WildcardAtEnd ); - } - } - virtual ~WildcardPattern(); - virtual bool matches( std::string const& str ) const { - switch( m_wildcard ) { - case NoWildcard: - return m_pattern == adjustCase( str ); - case WildcardAtStart: - return endsWith( adjustCase( str ), m_pattern ); - case WildcardAtEnd: - return startsWith( adjustCase( str ), m_pattern ); - case WildcardAtBothEnds: - return contains( adjustCase( str ), m_pattern ); - } - -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wunreachable-code" -#endif - throw std::logic_error( "Unknown enum" ); -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - } - private: - std::string adjustCase( std::string const& str ) const { - return m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str; - } - CaseSensitive::Choice m_caseSensitivity; - WildcardPosition m_wildcard; - std::string m_pattern; - }; -} - -#include -#include - -namespace Catch { - - class TestSpec { - struct Pattern : SharedImpl<> { - virtual ~Pattern(); - virtual bool matches( TestCaseInfo const& testCase ) const = 0; - }; - class NamePattern : public Pattern { - public: - NamePattern( std::string const& name ) - : m_wildcardPattern( toLower( name ), CaseSensitive::No ) - {} - virtual ~NamePattern(); - virtual bool matches( TestCaseInfo const& testCase ) const { - return m_wildcardPattern.matches( toLower( testCase.name ) ); - } - private: - WildcardPattern m_wildcardPattern; - }; - - class TagPattern : public Pattern { - public: - TagPattern( std::string const& tag ) : m_tag( toLower( tag ) ) {} - virtual ~TagPattern(); - virtual bool matches( TestCaseInfo const& testCase ) const { - return testCase.lcaseTags.find( m_tag ) != testCase.lcaseTags.end(); - } - private: - std::string m_tag; - }; - - class ExcludedPattern : public Pattern { - public: - ExcludedPattern( Ptr const& underlyingPattern ) : m_underlyingPattern( underlyingPattern ) {} - virtual ~ExcludedPattern(); - virtual bool matches( TestCaseInfo const& testCase ) const { return !m_underlyingPattern->matches( testCase ); } - private: - Ptr m_underlyingPattern; - }; - - struct Filter { - std::vector > m_patterns; - - bool matches( TestCaseInfo const& testCase ) const { - // All patterns in a filter must match for the filter to be a match - for( std::vector >::const_iterator it = m_patterns.begin(), itEnd = m_patterns.end(); it != itEnd; ++it ) { - if( !(*it)->matches( testCase ) ) - return false; - } - return true; - } - }; - - public: - bool hasFilters() const { - return !m_filters.empty(); - } - bool matches( TestCaseInfo const& testCase ) const { - // A TestSpec matches if any filter matches - for( std::vector::const_iterator it = m_filters.begin(), itEnd = m_filters.end(); it != itEnd; ++it ) - if( it->matches( testCase ) ) - return true; - return false; - } - - private: - std::vector m_filters; - - friend class TestSpecParser; - }; -} - -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - -namespace Catch { - - class TestSpecParser { - enum Mode{ None, Name, QuotedName, Tag, EscapedName }; - Mode m_mode; - bool m_exclusion; - std::size_t m_start, m_pos; - std::string m_arg; - std::vector m_escapeChars; - TestSpec::Filter m_currentFilter; - TestSpec m_testSpec; - ITagAliasRegistry const* m_tagAliases; - - public: - TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {} - - TestSpecParser& parse( std::string const& arg ) { - m_mode = None; - m_exclusion = false; - m_start = std::string::npos; - m_arg = m_tagAliases->expandAliases( arg ); - m_escapeChars.clear(); - for( m_pos = 0; m_pos < m_arg.size(); ++m_pos ) - visitChar( m_arg[m_pos] ); - if( m_mode == Name ) - addPattern(); - return *this; - } - TestSpec testSpec() { - addFilter(); - return m_testSpec; - } - private: - void visitChar( char c ) { - if( m_mode == None ) { - switch( c ) { - case ' ': return; - case '~': m_exclusion = true; return; - case '[': return startNewMode( Tag, ++m_pos ); - case '"': return startNewMode( QuotedName, ++m_pos ); - case '\\': return escape(); - default: startNewMode( Name, m_pos ); break; - } - } - if( m_mode == Name ) { - if( c == ',' ) { - addPattern(); - addFilter(); - } - else if( c == '[' ) { - if( subString() == "exclude:" ) - m_exclusion = true; - else - addPattern(); - startNewMode( Tag, ++m_pos ); - } - else if( c == '\\' ) - escape(); - } - else if( m_mode == EscapedName ) - m_mode = Name; - else if( m_mode == QuotedName && c == '"' ) - addPattern(); - else if( m_mode == Tag && c == ']' ) - addPattern(); - } - void startNewMode( Mode mode, std::size_t start ) { - m_mode = mode; - m_start = start; - } - void escape() { - if( m_mode == None ) - m_start = m_pos; - m_mode = EscapedName; - m_escapeChars.push_back( m_pos ); - } - std::string subString() const { return m_arg.substr( m_start, m_pos - m_start ); } - template - void addPattern() { - std::string token = subString(); - for( size_t i = 0; i < m_escapeChars.size(); ++i ) - token = token.substr( 0, m_escapeChars[i]-m_start-i ) + token.substr( m_escapeChars[i]-m_start-i+1 ); - m_escapeChars.clear(); - if( startsWith( token, "exclude:" ) ) { - m_exclusion = true; - token = token.substr( 8 ); - } - if( !token.empty() ) { - Ptr pattern = new T( token ); - if( m_exclusion ) - pattern = new TestSpec::ExcludedPattern( pattern ); - m_currentFilter.m_patterns.push_back( pattern ); - } - m_exclusion = false; - m_mode = None; - } - void addFilter() { - if( !m_currentFilter.m_patterns.empty() ) { - m_testSpec.m_filters.push_back( m_currentFilter ); - m_currentFilter = TestSpec::Filter(); - } - } - }; - inline TestSpec parseTestSpec( std::string const& arg ) { - return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec(); - } - -} // namespace Catch - -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - -// #included from: catch_interfaces_config.h -#define TWOBLUECUBES_CATCH_INTERFACES_CONFIG_H_INCLUDED - -#include -#include -#include - -namespace Catch { - - struct Verbosity { enum Level { - NoOutput = 0, - Quiet, - Normal - }; }; - - struct WarnAbout { enum What { - Nothing = 0x00, - NoAssertions = 0x01 - }; }; - - struct ShowDurations { enum OrNot { - DefaultForReporter, - Always, - Never - }; }; - struct RunTests { enum InWhatOrder { - InDeclarationOrder, - InLexicographicalOrder, - InRandomOrder - }; }; - struct UseColour { enum YesOrNo { - Auto, - Yes, - No - }; }; - - class TestSpec; - - struct IConfig : IShared { - - virtual ~IConfig(); - - virtual bool allowThrows() const = 0; - virtual std::ostream& stream() const = 0; - virtual std::string name() const = 0; - virtual bool includeSuccessfulResults() const = 0; - virtual bool shouldDebugBreak() const = 0; - virtual bool warnAboutMissingAssertions() const = 0; - virtual int abortAfter() const = 0; - virtual bool showInvisibles() const = 0; - virtual ShowDurations::OrNot showDurations() const = 0; - virtual TestSpec const& testSpec() const = 0; - virtual RunTests::InWhatOrder runOrder() const = 0; - virtual unsigned int rngSeed() const = 0; - virtual UseColour::YesOrNo useColour() const = 0; - virtual std::vector const& getSectionsToRun() const = 0; - - }; -} - -// #included from: catch_stream.h -#define TWOBLUECUBES_CATCH_STREAM_H_INCLUDED - -// #included from: catch_streambuf.h -#define TWOBLUECUBES_CATCH_STREAMBUF_H_INCLUDED - -#include - -namespace Catch { - - class StreamBufBase : public std::streambuf { - public: - virtual ~StreamBufBase() CATCH_NOEXCEPT; - }; -} - -#include -#include -#include -#include - -namespace Catch { - - std::ostream& cout(); - std::ostream& cerr(); - - struct IStream { - virtual ~IStream() CATCH_NOEXCEPT; - virtual std::ostream& stream() const = 0; - }; - - class FileStream : public IStream { - mutable std::ofstream m_ofs; - public: - FileStream( std::string const& filename ); - virtual ~FileStream() CATCH_NOEXCEPT; - public: // IStream - virtual std::ostream& stream() const CATCH_OVERRIDE; - }; - - class CoutStream : public IStream { - mutable std::ostream m_os; - public: - CoutStream(); - virtual ~CoutStream() CATCH_NOEXCEPT; - - public: // IStream - virtual std::ostream& stream() const CATCH_OVERRIDE; - }; - - class DebugOutStream : public IStream { - CATCH_AUTO_PTR( StreamBufBase ) m_streamBuf; - mutable std::ostream m_os; - public: - DebugOutStream(); - virtual ~DebugOutStream() CATCH_NOEXCEPT; - - public: // IStream - virtual std::ostream& stream() const CATCH_OVERRIDE; - }; -} - -#include -#include -#include -#include - -#ifndef CATCH_CONFIG_CONSOLE_WIDTH -#define CATCH_CONFIG_CONSOLE_WIDTH 80 -#endif - -namespace Catch { - - struct ConfigData { - - ConfigData() - : listTests( false ), - listTags( false ), - listReporters( false ), - listTestNamesOnly( false ), - listExtraInfo( false ), - showSuccessfulTests( false ), - shouldDebugBreak( false ), - noThrow( false ), - showHelp( false ), - showInvisibles( false ), - filenamesAsTags( false ), - abortAfter( -1 ), - rngSeed( 0 ), - verbosity( Verbosity::Normal ), - warnings( WarnAbout::Nothing ), - showDurations( ShowDurations::DefaultForReporter ), - runOrder( RunTests::InDeclarationOrder ), - useColour( UseColour::Auto ) - {} - - bool listTests; - bool listTags; - bool listReporters; - bool listTestNamesOnly; - bool listExtraInfo; - - bool showSuccessfulTests; - bool shouldDebugBreak; - bool noThrow; - bool showHelp; - bool showInvisibles; - bool filenamesAsTags; - - int abortAfter; - unsigned int rngSeed; - - Verbosity::Level verbosity; - WarnAbout::What warnings; - ShowDurations::OrNot showDurations; - RunTests::InWhatOrder runOrder; - UseColour::YesOrNo useColour; - - std::string outputFilename; - std::string name; - std::string processName; - - std::vector reporterNames; - std::vector testsOrTags; - std::vector sectionsToRun; - }; - - class Config : public SharedImpl { - private: - Config( Config const& other ); - Config& operator = ( Config const& other ); - virtual void dummy(); - public: - - Config() - {} - - Config( ConfigData const& data ) - : m_data( data ), - m_stream( openStream() ) - { - if( !data.testsOrTags.empty() ) { - TestSpecParser parser( ITagAliasRegistry::get() ); - for( std::size_t i = 0; i < data.testsOrTags.size(); ++i ) - parser.parse( data.testsOrTags[i] ); - m_testSpec = parser.testSpec(); - } - } - - virtual ~Config() {} - - std::string const& getFilename() const { - return m_data.outputFilename ; - } - - bool listTests() const { return m_data.listTests; } - bool listTestNamesOnly() const { return m_data.listTestNamesOnly; } - bool listTags() const { return m_data.listTags; } - bool listReporters() const { return m_data.listReporters; } - bool listExtraInfo() const { return m_data.listExtraInfo; } - - std::string getProcessName() const { return m_data.processName; } - - std::vector const& getReporterNames() const { return m_data.reporterNames; } - std::vector const& getSectionsToRun() const CATCH_OVERRIDE { return m_data.sectionsToRun; } - - virtual TestSpec const& testSpec() const CATCH_OVERRIDE { return m_testSpec; } - - bool showHelp() const { return m_data.showHelp; } - - // IConfig interface - virtual bool allowThrows() const CATCH_OVERRIDE { return !m_data.noThrow; } - virtual std::ostream& stream() const CATCH_OVERRIDE { return m_stream->stream(); } - virtual std::string name() const CATCH_OVERRIDE { return m_data.name.empty() ? m_data.processName : m_data.name; } - virtual bool includeSuccessfulResults() const CATCH_OVERRIDE { return m_data.showSuccessfulTests; } - virtual bool warnAboutMissingAssertions() const CATCH_OVERRIDE { return m_data.warnings & WarnAbout::NoAssertions; } - virtual ShowDurations::OrNot showDurations() const CATCH_OVERRIDE { return m_data.showDurations; } - virtual RunTests::InWhatOrder runOrder() const CATCH_OVERRIDE { return m_data.runOrder; } - virtual unsigned int rngSeed() const CATCH_OVERRIDE { return m_data.rngSeed; } - virtual UseColour::YesOrNo useColour() const CATCH_OVERRIDE { return m_data.useColour; } - virtual bool shouldDebugBreak() const CATCH_OVERRIDE { return m_data.shouldDebugBreak; } - virtual int abortAfter() const CATCH_OVERRIDE { return m_data.abortAfter; } - virtual bool showInvisibles() const CATCH_OVERRIDE { return m_data.showInvisibles; } - - private: - - IStream const* openStream() { - if( m_data.outputFilename.empty() ) - return new CoutStream(); - else if( m_data.outputFilename[0] == '%' ) { - if( m_data.outputFilename == "%debug" ) - return new DebugOutStream(); - else - throw std::domain_error( "Unrecognised stream: " + m_data.outputFilename ); - } - else - return new FileStream( m_data.outputFilename ); - } - ConfigData m_data; - - CATCH_AUTO_PTR( IStream const ) m_stream; - TestSpec m_testSpec; - }; - -} // end namespace Catch - -// #included from: catch_clara.h -#define TWOBLUECUBES_CATCH_CLARA_H_INCLUDED - -// Use Catch's value for console width (store Clara's off to the side, if present) -#ifdef CLARA_CONFIG_CONSOLE_WIDTH -#define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CLARA_CONFIG_CONSOLE_WIDTH -#undef CLARA_CONFIG_CONSOLE_WIDTH -#endif -#define CLARA_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH - -// Declare Clara inside the Catch namespace -#define STITCH_CLARA_OPEN_NAMESPACE namespace Catch { -// #included from: ../external/clara.h - -// Version 0.0.2.4 - -// Only use header guard if we are not using an outer namespace -#if !defined(TWOBLUECUBES_CLARA_H_INCLUDED) || defined(STITCH_CLARA_OPEN_NAMESPACE) - -#ifndef STITCH_CLARA_OPEN_NAMESPACE -#define TWOBLUECUBES_CLARA_H_INCLUDED -#define STITCH_CLARA_OPEN_NAMESPACE -#define STITCH_CLARA_CLOSE_NAMESPACE -#else -#define STITCH_CLARA_CLOSE_NAMESPACE } -#endif - -#define STITCH_TBC_TEXT_FORMAT_OPEN_NAMESPACE STITCH_CLARA_OPEN_NAMESPACE - -// ----------- #included from tbc_text_format.h ----------- - -// Only use header guard if we are not using an outer namespace -#if !defined(TBC_TEXT_FORMAT_H_INCLUDED) || defined(STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE) -#ifndef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE -#define TBC_TEXT_FORMAT_H_INCLUDED -#endif - -#include -#include -#include -#include -#include - -// Use optional outer namespace -#ifdef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE -namespace STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE { -#endif - -namespace Tbc { - -#ifdef TBC_TEXT_FORMAT_CONSOLE_WIDTH - const unsigned int consoleWidth = TBC_TEXT_FORMAT_CONSOLE_WIDTH; -#else - const unsigned int consoleWidth = 80; -#endif - - struct TextAttributes { - TextAttributes() - : initialIndent( std::string::npos ), - indent( 0 ), - width( consoleWidth-1 ), - tabChar( '\t' ) - {} - - TextAttributes& setInitialIndent( std::size_t _value ) { initialIndent = _value; return *this; } - TextAttributes& setIndent( std::size_t _value ) { indent = _value; return *this; } - TextAttributes& setWidth( std::size_t _value ) { width = _value; return *this; } - TextAttributes& setTabChar( char _value ) { tabChar = _value; return *this; } - - std::size_t initialIndent; // indent of first line, or npos - std::size_t indent; // indent of subsequent lines, or all if initialIndent is npos - std::size_t width; // maximum width of text, including indent. Longer text will wrap - char tabChar; // If this char is seen the indent is changed to current pos - }; - - class Text { - public: - Text( std::string const& _str, TextAttributes const& _attr = TextAttributes() ) - : attr( _attr ) - { - std::string wrappableChars = " [({.,/|\\-"; - std::size_t indent = _attr.initialIndent != std::string::npos - ? _attr.initialIndent - : _attr.indent; - std::string remainder = _str; - - while( !remainder.empty() ) { - if( lines.size() >= 1000 ) { - lines.push_back( "... message truncated due to excessive size" ); - return; - } - std::size_t tabPos = std::string::npos; - std::size_t width = (std::min)( remainder.size(), _attr.width - indent ); - std::size_t pos = remainder.find_first_of( '\n' ); - if( pos <= width ) { - width = pos; - } - pos = remainder.find_last_of( _attr.tabChar, width ); - if( pos != std::string::npos ) { - tabPos = pos; - if( remainder[width] == '\n' ) - width--; - remainder = remainder.substr( 0, tabPos ) + remainder.substr( tabPos+1 ); - } - - if( width == remainder.size() ) { - spliceLine( indent, remainder, width ); - } - else if( remainder[width] == '\n' ) { - spliceLine( indent, remainder, width ); - if( width <= 1 || remainder.size() != 1 ) - remainder = remainder.substr( 1 ); - indent = _attr.indent; - } - else { - pos = remainder.find_last_of( wrappableChars, width ); - if( pos != std::string::npos && pos > 0 ) { - spliceLine( indent, remainder, pos ); - if( remainder[0] == ' ' ) - remainder = remainder.substr( 1 ); - } - else { - spliceLine( indent, remainder, width-1 ); - lines.back() += "-"; - } - if( lines.size() == 1 ) - indent = _attr.indent; - if( tabPos != std::string::npos ) - indent += tabPos; - } - } - } - - void spliceLine( std::size_t _indent, std::string& _remainder, std::size_t _pos ) { - lines.push_back( std::string( _indent, ' ' ) + _remainder.substr( 0, _pos ) ); - _remainder = _remainder.substr( _pos ); - } - - typedef std::vector::const_iterator const_iterator; - - const_iterator begin() const { return lines.begin(); } - const_iterator end() const { return lines.end(); } - std::string const& last() const { return lines.back(); } - std::size_t size() const { return lines.size(); } - std::string const& operator[]( std::size_t _index ) const { return lines[_index]; } - std::string toString() const { - std::ostringstream oss; - oss << *this; - return oss.str(); - } - - inline friend std::ostream& operator << ( std::ostream& _stream, Text const& _text ) { - for( Text::const_iterator it = _text.begin(), itEnd = _text.end(); - it != itEnd; ++it ) { - if( it != _text.begin() ) - _stream << "\n"; - _stream << *it; - } - return _stream; - } - - private: - std::string str; - TextAttributes attr; - std::vector lines; - }; - -} // end namespace Tbc - -#ifdef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE -} // end outer namespace -#endif - -#endif // TBC_TEXT_FORMAT_H_INCLUDED - -// ----------- end of #include from tbc_text_format.h ----------- -// ........... back in clara.h - -#undef STITCH_TBC_TEXT_FORMAT_OPEN_NAMESPACE - -// ----------- #included from clara_compilers.h ----------- - -#ifndef TWOBLUECUBES_CLARA_COMPILERS_H_INCLUDED -#define TWOBLUECUBES_CLARA_COMPILERS_H_INCLUDED - -// Detect a number of compiler features - mostly C++11/14 conformance - by compiler -// The following features are defined: -// -// CLARA_CONFIG_CPP11_NULLPTR : is nullptr supported? -// CLARA_CONFIG_CPP11_NOEXCEPT : is noexcept supported? -// CLARA_CONFIG_CPP11_GENERATED_METHODS : The delete and default keywords for compiler generated methods -// CLARA_CONFIG_CPP11_OVERRIDE : is override supported? -// CLARA_CONFIG_CPP11_UNIQUE_PTR : is unique_ptr supported (otherwise use auto_ptr) - -// CLARA_CONFIG_CPP11_OR_GREATER : Is C++11 supported? - -// CLARA_CONFIG_VARIADIC_MACROS : are variadic macros supported? - -// In general each macro has a _NO_ form -// (e.g. CLARA_CONFIG_CPP11_NO_NULLPTR) which disables the feature. -// Many features, at point of detection, define an _INTERNAL_ macro, so they -// can be combined, en-mass, with the _NO_ forms later. - -// All the C++11 features can be disabled with CLARA_CONFIG_NO_CPP11 - -#ifdef __clang__ - -#if __has_feature(cxx_nullptr) -#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR -#endif - -#if __has_feature(cxx_noexcept) -#define CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT -#endif - -#endif // __clang__ - -//////////////////////////////////////////////////////////////////////////////// -// GCC -#ifdef __GNUC__ - -#if __GNUC__ == 4 && __GNUC_MINOR__ >= 6 && defined(__GXX_EXPERIMENTAL_CXX0X__) -#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR -#endif - -// - otherwise more recent versions define __cplusplus >= 201103L -// and will get picked up below - -#endif // __GNUC__ - -//////////////////////////////////////////////////////////////////////////////// -// Visual C++ -#ifdef _MSC_VER - -#if (_MSC_VER >= 1600) -#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR -#define CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR -#endif - -#if (_MSC_VER >= 1900 ) // (VC++ 13 (VS2015)) -#define CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT -#define CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS -#endif - -#endif // _MSC_VER - -//////////////////////////////////////////////////////////////////////////////// -// C++ language feature support - -// catch all support for C++11 -#if defined(__cplusplus) && __cplusplus >= 201103L - -#define CLARA_CPP11_OR_GREATER - -#if !defined(CLARA_INTERNAL_CONFIG_CPP11_NULLPTR) -#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR -#endif - -#ifndef CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT -#define CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT -#endif - -#ifndef CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS -#define CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS -#endif - -#if !defined(CLARA_INTERNAL_CONFIG_CPP11_OVERRIDE) -#define CLARA_INTERNAL_CONFIG_CPP11_OVERRIDE -#endif -#if !defined(CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) -#define CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR -#endif - -#endif // __cplusplus >= 201103L - -// Now set the actual defines based on the above + anything the user has configured -#if defined(CLARA_INTERNAL_CONFIG_CPP11_NULLPTR) && !defined(CLARA_CONFIG_CPP11_NO_NULLPTR) && !defined(CLARA_CONFIG_CPP11_NULLPTR) && !defined(CLARA_CONFIG_NO_CPP11) -#define CLARA_CONFIG_CPP11_NULLPTR -#endif -#if defined(CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT) && !defined(CLARA_CONFIG_CPP11_NO_NOEXCEPT) && !defined(CLARA_CONFIG_CPP11_NOEXCEPT) && !defined(CLARA_CONFIG_NO_CPP11) -#define CLARA_CONFIG_CPP11_NOEXCEPT -#endif -#if defined(CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS) && !defined(CLARA_CONFIG_CPP11_NO_GENERATED_METHODS) && !defined(CLARA_CONFIG_CPP11_GENERATED_METHODS) && !defined(CLARA_CONFIG_NO_CPP11) -#define CLARA_CONFIG_CPP11_GENERATED_METHODS -#endif -#if defined(CLARA_INTERNAL_CONFIG_CPP11_OVERRIDE) && !defined(CLARA_CONFIG_NO_OVERRIDE) && !defined(CLARA_CONFIG_CPP11_OVERRIDE) && !defined(CLARA_CONFIG_NO_CPP11) -#define CLARA_CONFIG_CPP11_OVERRIDE -#endif -#if defined(CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) && !defined(CLARA_CONFIG_NO_UNIQUE_PTR) && !defined(CLARA_CONFIG_CPP11_UNIQUE_PTR) && !defined(CLARA_CONFIG_NO_CPP11) -#define CLARA_CONFIG_CPP11_UNIQUE_PTR -#endif - -// noexcept support: -#if defined(CLARA_CONFIG_CPP11_NOEXCEPT) && !defined(CLARA_NOEXCEPT) -#define CLARA_NOEXCEPT noexcept -# define CLARA_NOEXCEPT_IS(x) noexcept(x) -#else -#define CLARA_NOEXCEPT throw() -# define CLARA_NOEXCEPT_IS(x) -#endif - -// nullptr support -#ifdef CLARA_CONFIG_CPP11_NULLPTR -#define CLARA_NULL nullptr -#else -#define CLARA_NULL NULL -#endif - -// override support -#ifdef CLARA_CONFIG_CPP11_OVERRIDE -#define CLARA_OVERRIDE override -#else -#define CLARA_OVERRIDE -#endif - -// unique_ptr support -#ifdef CLARA_CONFIG_CPP11_UNIQUE_PTR -# define CLARA_AUTO_PTR( T ) std::unique_ptr -#else -# define CLARA_AUTO_PTR( T ) std::auto_ptr -#endif - -#endif // TWOBLUECUBES_CLARA_COMPILERS_H_INCLUDED - -// ----------- end of #include from clara_compilers.h ----------- -// ........... back in clara.h - -#include -#include -#include - -#if defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) -#define CLARA_PLATFORM_WINDOWS -#endif - -// Use optional outer namespace -#ifdef STITCH_CLARA_OPEN_NAMESPACE -STITCH_CLARA_OPEN_NAMESPACE -#endif - -namespace Clara { - - struct UnpositionalTag {}; - - extern UnpositionalTag _; - -#ifdef CLARA_CONFIG_MAIN - UnpositionalTag _; -#endif - - namespace Detail { - -#ifdef CLARA_CONSOLE_WIDTH - const unsigned int consoleWidth = CLARA_CONFIG_CONSOLE_WIDTH; -#else - const unsigned int consoleWidth = 80; -#endif - - using namespace Tbc; - - inline bool startsWith( std::string const& str, std::string const& prefix ) { - return str.size() >= prefix.size() && str.substr( 0, prefix.size() ) == prefix; - } - - template struct RemoveConstRef{ typedef T type; }; - template struct RemoveConstRef{ typedef T type; }; - template struct RemoveConstRef{ typedef T type; }; - template struct RemoveConstRef{ typedef T type; }; - - template struct IsBool { static const bool value = false; }; - template<> struct IsBool { static const bool value = true; }; - - template - void convertInto( std::string const& _source, T& _dest ) { - std::stringstream ss; - ss << _source; - ss >> _dest; - if( ss.fail() ) - throw std::runtime_error( "Unable to convert " + _source + " to destination type" ); - } - inline void convertInto( std::string const& _source, std::string& _dest ) { - _dest = _source; - } - char toLowerCh(char c) { - return static_cast( std::tolower( c ) ); - } - inline void convertInto( std::string const& _source, bool& _dest ) { - std::string sourceLC = _source; - std::transform( sourceLC.begin(), sourceLC.end(), sourceLC.begin(), toLowerCh ); - if( sourceLC == "y" || sourceLC == "1" || sourceLC == "true" || sourceLC == "yes" || sourceLC == "on" ) - _dest = true; - else if( sourceLC == "n" || sourceLC == "0" || sourceLC == "false" || sourceLC == "no" || sourceLC == "off" ) - _dest = false; - else - throw std::runtime_error( "Expected a boolean value but did not recognise:\n '" + _source + "'" ); - } - - template - struct IArgFunction { - virtual ~IArgFunction() {} -#ifdef CLARA_CONFIG_CPP11_GENERATED_METHODS - IArgFunction() = default; - IArgFunction( IArgFunction const& ) = default; -#endif - virtual void set( ConfigT& config, std::string const& value ) const = 0; - virtual bool takesArg() const = 0; - virtual IArgFunction* clone() const = 0; - }; - - template - class BoundArgFunction { - public: - BoundArgFunction() : functionObj( CLARA_NULL ) {} - BoundArgFunction( IArgFunction* _functionObj ) : functionObj( _functionObj ) {} - BoundArgFunction( BoundArgFunction const& other ) : functionObj( other.functionObj ? other.functionObj->clone() : CLARA_NULL ) {} - BoundArgFunction& operator = ( BoundArgFunction const& other ) { - IArgFunction* newFunctionObj = other.functionObj ? other.functionObj->clone() : CLARA_NULL; - delete functionObj; - functionObj = newFunctionObj; - return *this; - } - ~BoundArgFunction() { delete functionObj; } - - void set( ConfigT& config, std::string const& value ) const { - functionObj->set( config, value ); - } - bool takesArg() const { return functionObj->takesArg(); } - - bool isSet() const { - return functionObj != CLARA_NULL; - } - private: - IArgFunction* functionObj; - }; - - template - struct NullBinder : IArgFunction{ - virtual void set( C&, std::string const& ) const {} - virtual bool takesArg() const { return true; } - virtual IArgFunction* clone() const { return new NullBinder( *this ); } - }; - - template - struct BoundDataMember : IArgFunction{ - BoundDataMember( M C::* _member ) : member( _member ) {} - virtual void set( C& p, std::string const& stringValue ) const { - convertInto( stringValue, p.*member ); - } - virtual bool takesArg() const { return !IsBool::value; } - virtual IArgFunction* clone() const { return new BoundDataMember( *this ); } - M C::* member; - }; - template - struct BoundUnaryMethod : IArgFunction{ - BoundUnaryMethod( void (C::*_member)( M ) ) : member( _member ) {} - virtual void set( C& p, std::string const& stringValue ) const { - typename RemoveConstRef::type value; - convertInto( stringValue, value ); - (p.*member)( value ); - } - virtual bool takesArg() const { return !IsBool::value; } - virtual IArgFunction* clone() const { return new BoundUnaryMethod( *this ); } - void (C::*member)( M ); - }; - template - struct BoundNullaryMethod : IArgFunction{ - BoundNullaryMethod( void (C::*_member)() ) : member( _member ) {} - virtual void set( C& p, std::string const& stringValue ) const { - bool value; - convertInto( stringValue, value ); - if( value ) - (p.*member)(); - } - virtual bool takesArg() const { return false; } - virtual IArgFunction* clone() const { return new BoundNullaryMethod( *this ); } - void (C::*member)(); - }; - - template - struct BoundUnaryFunction : IArgFunction{ - BoundUnaryFunction( void (*_function)( C& ) ) : function( _function ) {} - virtual void set( C& obj, std::string const& stringValue ) const { - bool value; - convertInto( stringValue, value ); - if( value ) - function( obj ); - } - virtual bool takesArg() const { return false; } - virtual IArgFunction* clone() const { return new BoundUnaryFunction( *this ); } - void (*function)( C& ); - }; - - template - struct BoundBinaryFunction : IArgFunction{ - BoundBinaryFunction( void (*_function)( C&, T ) ) : function( _function ) {} - virtual void set( C& obj, std::string const& stringValue ) const { - typename RemoveConstRef::type value; - convertInto( stringValue, value ); - function( obj, value ); - } - virtual bool takesArg() const { return !IsBool::value; } - virtual IArgFunction* clone() const { return new BoundBinaryFunction( *this ); } - void (*function)( C&, T ); - }; - - } // namespace Detail - - inline std::vector argsToVector( int argc, char const* const* const argv ) { - std::vector args( static_cast( argc ) ); - for( std::size_t i = 0; i < static_cast( argc ); ++i ) - args[i] = argv[i]; - - return args; - } - - class Parser { - enum Mode { None, MaybeShortOpt, SlashOpt, ShortOpt, LongOpt, Positional }; - Mode mode; - std::size_t from; - bool inQuotes; - public: - - struct Token { - enum Type { Positional, ShortOpt, LongOpt }; - Token( Type _type, std::string const& _data ) : type( _type ), data( _data ) {} - Type type; - std::string data; - }; - - Parser() : mode( None ), from( 0 ), inQuotes( false ){} - - void parseIntoTokens( std::vector const& args, std::vector& tokens ) { - const std::string doubleDash = "--"; - for( std::size_t i = 1; i < args.size() && args[i] != doubleDash; ++i ) - parseIntoTokens( args[i], tokens); - } - - void parseIntoTokens( std::string const& arg, std::vector& tokens ) { - for( std::size_t i = 0; i < arg.size(); ++i ) { - char c = arg[i]; - if( c == '"' ) - inQuotes = !inQuotes; - mode = handleMode( i, c, arg, tokens ); - } - mode = handleMode( arg.size(), '\0', arg, tokens ); - } - Mode handleMode( std::size_t i, char c, std::string const& arg, std::vector& tokens ) { - switch( mode ) { - case None: return handleNone( i, c ); - case MaybeShortOpt: return handleMaybeShortOpt( i, c ); - case ShortOpt: - case LongOpt: - case SlashOpt: return handleOpt( i, c, arg, tokens ); - case Positional: return handlePositional( i, c, arg, tokens ); - default: throw std::logic_error( "Unknown mode" ); - } - } - - Mode handleNone( std::size_t i, char c ) { - if( inQuotes ) { - from = i; - return Positional; - } - switch( c ) { - case '-': return MaybeShortOpt; -#ifdef CLARA_PLATFORM_WINDOWS - case '/': from = i+1; return SlashOpt; -#endif - default: from = i; return Positional; - } - } - Mode handleMaybeShortOpt( std::size_t i, char c ) { - switch( c ) { - case '-': from = i+1; return LongOpt; - default: from = i; return ShortOpt; - } - } - - Mode handleOpt( std::size_t i, char c, std::string const& arg, std::vector& tokens ) { - if( std::string( ":=\0", 3 ).find( c ) == std::string::npos ) - return mode; - - std::string optName = arg.substr( from, i-from ); - if( mode == ShortOpt ) - for( std::size_t j = 0; j < optName.size(); ++j ) - tokens.push_back( Token( Token::ShortOpt, optName.substr( j, 1 ) ) ); - else if( mode == SlashOpt && optName.size() == 1 ) - tokens.push_back( Token( Token::ShortOpt, optName ) ); - else - tokens.push_back( Token( Token::LongOpt, optName ) ); - return None; - } - Mode handlePositional( std::size_t i, char c, std::string const& arg, std::vector& tokens ) { - if( inQuotes || std::string( "\0", 1 ).find( c ) == std::string::npos ) - return mode; - - std::string data = arg.substr( from, i-from ); - tokens.push_back( Token( Token::Positional, data ) ); - return None; - } - }; - - template - struct CommonArgProperties { - CommonArgProperties() {} - CommonArgProperties( Detail::BoundArgFunction const& _boundField ) : boundField( _boundField ) {} - - Detail::BoundArgFunction boundField; - std::string description; - std::string detail; - std::string placeholder; // Only value if boundField takes an arg - - bool takesArg() const { - return !placeholder.empty(); - } - void validate() const { - if( !boundField.isSet() ) - throw std::logic_error( "option not bound" ); - } - }; - struct OptionArgProperties { - std::vector shortNames; - std::string longName; - - bool hasShortName( std::string const& shortName ) const { - return std::find( shortNames.begin(), shortNames.end(), shortName ) != shortNames.end(); - } - bool hasLongName( std::string const& _longName ) const { - return _longName == longName; - } - }; - struct PositionalArgProperties { - PositionalArgProperties() : position( -1 ) {} - int position; // -1 means non-positional (floating) - - bool isFixedPositional() const { - return position != -1; - } - }; - - template - class CommandLine { - - struct Arg : CommonArgProperties, OptionArgProperties, PositionalArgProperties { - Arg() {} - Arg( Detail::BoundArgFunction const& _boundField ) : CommonArgProperties( _boundField ) {} - - using CommonArgProperties::placeholder; // !TBD - - std::string dbgName() const { - if( !longName.empty() ) - return "--" + longName; - if( !shortNames.empty() ) - return "-" + shortNames[0]; - return "positional args"; - } - std::string commands() const { - std::ostringstream oss; - bool first = true; - std::vector::const_iterator it = shortNames.begin(), itEnd = shortNames.end(); - for(; it != itEnd; ++it ) { - if( first ) - first = false; - else - oss << ", "; - oss << "-" << *it; - } - if( !longName.empty() ) { - if( !first ) - oss << ", "; - oss << "--" << longName; - } - if( !placeholder.empty() ) - oss << " <" << placeholder << ">"; - return oss.str(); - } - }; - - typedef CLARA_AUTO_PTR( Arg ) ArgAutoPtr; - - friend void addOptName( Arg& arg, std::string const& optName ) - { - if( optName.empty() ) - return; - if( Detail::startsWith( optName, "--" ) ) { - if( !arg.longName.empty() ) - throw std::logic_error( "Only one long opt may be specified. '" - + arg.longName - + "' already specified, now attempting to add '" - + optName + "'" ); - arg.longName = optName.substr( 2 ); - } - else if( Detail::startsWith( optName, "-" ) ) - arg.shortNames.push_back( optName.substr( 1 ) ); - else - throw std::logic_error( "option must begin with - or --. Option was: '" + optName + "'" ); - } - friend void setPositionalArg( Arg& arg, int position ) - { - arg.position = position; - } - - class ArgBuilder { - public: - ArgBuilder( Arg* arg ) : m_arg( arg ) {} - - // Bind a non-boolean data member (requires placeholder string) - template - void bind( M C::* field, std::string const& placeholder ) { - m_arg->boundField = new Detail::BoundDataMember( field ); - m_arg->placeholder = placeholder; - } - // Bind a boolean data member (no placeholder required) - template - void bind( bool C::* field ) { - m_arg->boundField = new Detail::BoundDataMember( field ); - } - - // Bind a method taking a single, non-boolean argument (requires a placeholder string) - template - void bind( void (C::* unaryMethod)( M ), std::string const& placeholder ) { - m_arg->boundField = new Detail::BoundUnaryMethod( unaryMethod ); - m_arg->placeholder = placeholder; - } - - // Bind a method taking a single, boolean argument (no placeholder string required) - template - void bind( void (C::* unaryMethod)( bool ) ) { - m_arg->boundField = new Detail::BoundUnaryMethod( unaryMethod ); - } - - // Bind a method that takes no arguments (will be called if opt is present) - template - void bind( void (C::* nullaryMethod)() ) { - m_arg->boundField = new Detail::BoundNullaryMethod( nullaryMethod ); - } - - // Bind a free function taking a single argument - the object to operate on (no placeholder string required) - template - void bind( void (* unaryFunction)( C& ) ) { - m_arg->boundField = new Detail::BoundUnaryFunction( unaryFunction ); - } - - // Bind a free function taking a single argument - the object to operate on (requires a placeholder string) - template - void bind( void (* binaryFunction)( C&, T ), std::string const& placeholder ) { - m_arg->boundField = new Detail::BoundBinaryFunction( binaryFunction ); - m_arg->placeholder = placeholder; - } - - ArgBuilder& describe( std::string const& description ) { - m_arg->description = description; - return *this; - } - ArgBuilder& detail( std::string const& detail ) { - m_arg->detail = detail; - return *this; - } - - protected: - Arg* m_arg; - }; - - class OptBuilder : public ArgBuilder { - public: - OptBuilder( Arg* arg ) : ArgBuilder( arg ) {} - OptBuilder( OptBuilder& other ) : ArgBuilder( other ) {} - - OptBuilder& operator[]( std::string const& optName ) { - addOptName( *ArgBuilder::m_arg, optName ); - return *this; - } - }; - - public: - - CommandLine() - : m_boundProcessName( new Detail::NullBinder() ), - m_highestSpecifiedArgPosition( 0 ), - m_throwOnUnrecognisedTokens( false ) - {} - CommandLine( CommandLine const& other ) - : m_boundProcessName( other.m_boundProcessName ), - m_options ( other.m_options ), - m_positionalArgs( other.m_positionalArgs ), - m_highestSpecifiedArgPosition( other.m_highestSpecifiedArgPosition ), - m_throwOnUnrecognisedTokens( other.m_throwOnUnrecognisedTokens ) - { - if( other.m_floatingArg.get() ) - m_floatingArg.reset( new Arg( *other.m_floatingArg ) ); - } - - CommandLine& setThrowOnUnrecognisedTokens( bool shouldThrow = true ) { - m_throwOnUnrecognisedTokens = shouldThrow; - return *this; - } - - OptBuilder operator[]( std::string const& optName ) { - m_options.push_back( Arg() ); - addOptName( m_options.back(), optName ); - OptBuilder builder( &m_options.back() ); - return builder; - } - - ArgBuilder operator[]( int position ) { - m_positionalArgs.insert( std::make_pair( position, Arg() ) ); - if( position > m_highestSpecifiedArgPosition ) - m_highestSpecifiedArgPosition = position; - setPositionalArg( m_positionalArgs[position], position ); - ArgBuilder builder( &m_positionalArgs[position] ); - return builder; - } - - // Invoke this with the _ instance - ArgBuilder operator[]( UnpositionalTag ) { - if( m_floatingArg.get() ) - throw std::logic_error( "Only one unpositional argument can be added" ); - m_floatingArg.reset( new Arg() ); - ArgBuilder builder( m_floatingArg.get() ); - return builder; - } - - template - void bindProcessName( M C::* field ) { - m_boundProcessName = new Detail::BoundDataMember( field ); - } - template - void bindProcessName( void (C::*_unaryMethod)( M ) ) { - m_boundProcessName = new Detail::BoundUnaryMethod( _unaryMethod ); - } - - void optUsage( std::ostream& os, std::size_t indent = 0, std::size_t width = Detail::consoleWidth ) const { - typename std::vector::const_iterator itBegin = m_options.begin(), itEnd = m_options.end(), it; - std::size_t maxWidth = 0; - for( it = itBegin; it != itEnd; ++it ) - maxWidth = (std::max)( maxWidth, it->commands().size() ); - - for( it = itBegin; it != itEnd; ++it ) { - Detail::Text usage( it->commands(), Detail::TextAttributes() - .setWidth( maxWidth+indent ) - .setIndent( indent ) ); - Detail::Text desc( it->description, Detail::TextAttributes() - .setWidth( width - maxWidth - 3 ) ); - - for( std::size_t i = 0; i < (std::max)( usage.size(), desc.size() ); ++i ) { - std::string usageCol = i < usage.size() ? usage[i] : ""; - os << usageCol; - - if( i < desc.size() && !desc[i].empty() ) - os << std::string( indent + 2 + maxWidth - usageCol.size(), ' ' ) - << desc[i]; - os << "\n"; - } - } - } - std::string optUsage() const { - std::ostringstream oss; - optUsage( oss ); - return oss.str(); - } - - void argSynopsis( std::ostream& os ) const { - for( int i = 1; i <= m_highestSpecifiedArgPosition; ++i ) { - if( i > 1 ) - os << " "; - typename std::map::const_iterator it = m_positionalArgs.find( i ); - if( it != m_positionalArgs.end() ) - os << "<" << it->second.placeholder << ">"; - else if( m_floatingArg.get() ) - os << "<" << m_floatingArg->placeholder << ">"; - else - throw std::logic_error( "non consecutive positional arguments with no floating args" ); - } - // !TBD No indication of mandatory args - if( m_floatingArg.get() ) { - if( m_highestSpecifiedArgPosition > 1 ) - os << " "; - os << "[<" << m_floatingArg->placeholder << "> ...]"; - } - } - std::string argSynopsis() const { - std::ostringstream oss; - argSynopsis( oss ); - return oss.str(); - } - - void usage( std::ostream& os, std::string const& procName ) const { - validate(); - os << "usage:\n " << procName << " "; - argSynopsis( os ); - if( !m_options.empty() ) { - os << " [options]\n\nwhere options are: \n"; - optUsage( os, 2 ); - } - os << "\n"; - } - std::string usage( std::string const& procName ) const { - std::ostringstream oss; - usage( oss, procName ); - return oss.str(); - } - - ConfigT parse( std::vector const& args ) const { - ConfigT config; - parseInto( args, config ); - return config; - } - - std::vector parseInto( std::vector const& args, ConfigT& config ) const { - std::string processName = args.empty() ? std::string() : args[0]; - std::size_t lastSlash = processName.find_last_of( "/\\" ); - if( lastSlash != std::string::npos ) - processName = processName.substr( lastSlash+1 ); - m_boundProcessName.set( config, processName ); - std::vector tokens; - Parser parser; - parser.parseIntoTokens( args, tokens ); - return populate( tokens, config ); - } - - std::vector populate( std::vector const& tokens, ConfigT& config ) const { - validate(); - std::vector unusedTokens = populateOptions( tokens, config ); - unusedTokens = populateFixedArgs( unusedTokens, config ); - unusedTokens = populateFloatingArgs( unusedTokens, config ); - return unusedTokens; - } - - std::vector populateOptions( std::vector const& tokens, ConfigT& config ) const { - std::vector unusedTokens; - std::vector errors; - for( std::size_t i = 0; i < tokens.size(); ++i ) { - Parser::Token const& token = tokens[i]; - typename std::vector::const_iterator it = m_options.begin(), itEnd = m_options.end(); - for(; it != itEnd; ++it ) { - Arg const& arg = *it; - - try { - if( ( token.type == Parser::Token::ShortOpt && arg.hasShortName( token.data ) ) || - ( token.type == Parser::Token::LongOpt && arg.hasLongName( token.data ) ) ) { - if( arg.takesArg() ) { - if( i == tokens.size()-1 || tokens[i+1].type != Parser::Token::Positional ) - errors.push_back( "Expected argument to option: " + token.data ); - else - arg.boundField.set( config, tokens[++i].data ); - } - else { - arg.boundField.set( config, "true" ); - } - break; - } - } - catch( std::exception& ex ) { - errors.push_back( std::string( ex.what() ) + "\n- while parsing: (" + arg.commands() + ")" ); - } - } - if( it == itEnd ) { - if( token.type == Parser::Token::Positional || !m_throwOnUnrecognisedTokens ) - unusedTokens.push_back( token ); - else if( errors.empty() && m_throwOnUnrecognisedTokens ) - errors.push_back( "unrecognised option: " + token.data ); - } - } - if( !errors.empty() ) { - std::ostringstream oss; - for( std::vector::const_iterator it = errors.begin(), itEnd = errors.end(); - it != itEnd; - ++it ) { - if( it != errors.begin() ) - oss << "\n"; - oss << *it; - } - throw std::runtime_error( oss.str() ); - } - return unusedTokens; - } - std::vector populateFixedArgs( std::vector const& tokens, ConfigT& config ) const { - std::vector unusedTokens; - int position = 1; - for( std::size_t i = 0; i < tokens.size(); ++i ) { - Parser::Token const& token = tokens[i]; - typename std::map::const_iterator it = m_positionalArgs.find( position ); - if( it != m_positionalArgs.end() ) - it->second.boundField.set( config, token.data ); - else - unusedTokens.push_back( token ); - if( token.type == Parser::Token::Positional ) - position++; - } - return unusedTokens; - } - std::vector populateFloatingArgs( std::vector const& tokens, ConfigT& config ) const { - if( !m_floatingArg.get() ) - return tokens; - std::vector unusedTokens; - for( std::size_t i = 0; i < tokens.size(); ++i ) { - Parser::Token const& token = tokens[i]; - if( token.type == Parser::Token::Positional ) - m_floatingArg->boundField.set( config, token.data ); - else - unusedTokens.push_back( token ); - } - return unusedTokens; - } - - void validate() const - { - if( m_options.empty() && m_positionalArgs.empty() && !m_floatingArg.get() ) - throw std::logic_error( "No options or arguments specified" ); - - for( typename std::vector::const_iterator it = m_options.begin(), - itEnd = m_options.end(); - it != itEnd; ++it ) - it->validate(); - } - - private: - Detail::BoundArgFunction m_boundProcessName; - std::vector m_options; - std::map m_positionalArgs; - ArgAutoPtr m_floatingArg; - int m_highestSpecifiedArgPosition; - bool m_throwOnUnrecognisedTokens; - }; - -} // end namespace Clara - -STITCH_CLARA_CLOSE_NAMESPACE -#undef STITCH_CLARA_OPEN_NAMESPACE -#undef STITCH_CLARA_CLOSE_NAMESPACE - -#endif // TWOBLUECUBES_CLARA_H_INCLUDED -#undef STITCH_CLARA_OPEN_NAMESPACE - -// Restore Clara's value for console width, if present -#ifdef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH -#define CLARA_CONFIG_CONSOLE_WIDTH CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH -#undef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH -#endif - -#include -#include - -namespace Catch { - - inline void abortAfterFirst( ConfigData& config ) { config.abortAfter = 1; } - inline void abortAfterX( ConfigData& config, int x ) { - if( x < 1 ) - throw std::runtime_error( "Value after -x or --abortAfter must be greater than zero" ); - config.abortAfter = x; - } - inline void addTestOrTags( ConfigData& config, std::string const& _testSpec ) { config.testsOrTags.push_back( _testSpec ); } - inline void addSectionToRun( ConfigData& config, std::string const& sectionName ) { config.sectionsToRun.push_back( sectionName ); } - inline void addReporterName( ConfigData& config, std::string const& _reporterName ) { config.reporterNames.push_back( _reporterName ); } - - inline void addWarning( ConfigData& config, std::string const& _warning ) { - if( _warning == "NoAssertions" ) - config.warnings = static_cast( config.warnings | WarnAbout::NoAssertions ); - else - throw std::runtime_error( "Unrecognised warning: '" + _warning + '\'' ); - } - inline void setOrder( ConfigData& config, std::string const& order ) { - if( startsWith( "declared", order ) ) - config.runOrder = RunTests::InDeclarationOrder; - else if( startsWith( "lexical", order ) ) - config.runOrder = RunTests::InLexicographicalOrder; - else if( startsWith( "random", order ) ) - config.runOrder = RunTests::InRandomOrder; - else - throw std::runtime_error( "Unrecognised ordering: '" + order + '\'' ); - } - inline void setRngSeed( ConfigData& config, std::string const& seed ) { - if( seed == "time" ) { - config.rngSeed = static_cast( std::time(0) ); - } - else { - std::stringstream ss; - ss << seed; - ss >> config.rngSeed; - if( ss.fail() ) - throw std::runtime_error( "Argument to --rng-seed should be the word 'time' or a number" ); - } - } - inline void setVerbosity( ConfigData& config, int level ) { - // !TBD: accept strings? - config.verbosity = static_cast( level ); - } - inline void setShowDurations( ConfigData& config, bool _showDurations ) { - config.showDurations = _showDurations - ? ShowDurations::Always - : ShowDurations::Never; - } - inline void setUseColour( ConfigData& config, std::string const& value ) { - std::string mode = toLower( value ); - - if( mode == "yes" ) - config.useColour = UseColour::Yes; - else if( mode == "no" ) - config.useColour = UseColour::No; - else if( mode == "auto" ) - config.useColour = UseColour::Auto; - else - throw std::runtime_error( "colour mode must be one of: auto, yes or no" ); - } - inline void forceColour( ConfigData& config ) { - config.useColour = UseColour::Yes; - } - inline void loadTestNamesFromFile( ConfigData& config, std::string const& _filename ) { - std::ifstream f( _filename.c_str() ); - if( !f.is_open() ) - throw std::domain_error( "Unable to load input file: " + _filename ); - - std::string line; - while( std::getline( f, line ) ) { - line = trim(line); - if( !line.empty() && !startsWith( line, '#' ) ) { - if( !startsWith( line, '"' ) ) - line = '"' + line + '"'; - addTestOrTags( config, line + ',' ); - } - } - } - - inline Clara::CommandLine makeCommandLineParser() { - - using namespace Clara; - CommandLine cli; - - cli.bindProcessName( &ConfigData::processName ); - - cli["-?"]["-h"]["--help"] - .describe( "display usage information" ) - .bind( &ConfigData::showHelp ); - - cli["-l"]["--list-tests"] - .describe( "list all/matching test cases" ) - .bind( &ConfigData::listTests ); - - cli["-t"]["--list-tags"] - .describe( "list all/matching tags" ) - .bind( &ConfigData::listTags ); - - cli["-s"]["--success"] - .describe( "include successful tests in output" ) - .bind( &ConfigData::showSuccessfulTests ); - - cli["-b"]["--break"] - .describe( "break into debugger on failure" ) - .bind( &ConfigData::shouldDebugBreak ); - - cli["-e"]["--nothrow"] - .describe( "skip exception tests" ) - .bind( &ConfigData::noThrow ); - - cli["-i"]["--invisibles"] - .describe( "show invisibles (tabs, newlines)" ) - .bind( &ConfigData::showInvisibles ); - - cli["-o"]["--out"] - .describe( "output filename" ) - .bind( &ConfigData::outputFilename, "filename" ); - - cli["-r"]["--reporter"] -// .placeholder( "name[:filename]" ) - .describe( "reporter to use (defaults to console)" ) - .bind( &addReporterName, "name" ); - - cli["-n"]["--name"] - .describe( "suite name" ) - .bind( &ConfigData::name, "name" ); - - cli["-a"]["--abort"] - .describe( "abort at first failure" ) - .bind( &abortAfterFirst ); - - cli["-x"]["--abortx"] - .describe( "abort after x failures" ) - .bind( &abortAfterX, "no. failures" ); - - cli["-w"]["--warn"] - .describe( "enable warnings" ) - .bind( &addWarning, "warning name" ); - -// - needs updating if reinstated -// cli.into( &setVerbosity ) -// .describe( "level of verbosity (0=no output)" ) -// .shortOpt( "v") -// .longOpt( "verbosity" ) -// .placeholder( "level" ); - - cli[_] - .describe( "which test or tests to use" ) - .bind( &addTestOrTags, "test name, pattern or tags" ); - - cli["-d"]["--durations"] - .describe( "show test durations" ) - .bind( &setShowDurations, "yes|no" ); - - cli["-f"]["--input-file"] - .describe( "load test names to run from a file" ) - .bind( &loadTestNamesFromFile, "filename" ); - - cli["-#"]["--filenames-as-tags"] - .describe( "adds a tag for the filename" ) - .bind( &ConfigData::filenamesAsTags ); - - cli["-c"]["--section"] - .describe( "specify section to run" ) - .bind( &addSectionToRun, "section name" ); - - // Less common commands which don't have a short form - cli["--list-test-names-only"] - .describe( "list all/matching test cases names only" ) - .bind( &ConfigData::listTestNamesOnly ); - - cli["--list-extra-info"] - .describe( "list all/matching test cases with more info" ) - .bind( &ConfigData::listExtraInfo ); - - cli["--list-reporters"] - .describe( "list all reporters" ) - .bind( &ConfigData::listReporters ); - - cli["--order"] - .describe( "test case order (defaults to decl)" ) - .bind( &setOrder, "decl|lex|rand" ); - - cli["--rng-seed"] - .describe( "set a specific seed for random numbers" ) - .bind( &setRngSeed, "'time'|number" ); - - cli["--force-colour"] - .describe( "force colourised output (deprecated)" ) - .bind( &forceColour ); - - cli["--use-colour"] - .describe( "should output be colourised" ) - .bind( &setUseColour, "yes|no" ); - - return cli; - } - -} // end namespace Catch - -// #included from: internal/catch_list.hpp -#define TWOBLUECUBES_CATCH_LIST_HPP_INCLUDED - -// #included from: catch_text.h -#define TWOBLUECUBES_CATCH_TEXT_H_INCLUDED - -#define TBC_TEXT_FORMAT_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH - -#define CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE Catch -// #included from: ../external/tbc_text_format.h -// Only use header guard if we are not using an outer namespace -#ifndef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE -# ifdef TWOBLUECUBES_TEXT_FORMAT_H_INCLUDED -# ifndef TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED -# define TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED -# endif -# else -# define TWOBLUECUBES_TEXT_FORMAT_H_INCLUDED -# endif -#endif -#ifndef TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED -#include -#include -#include - -// Use optional outer namespace -#ifdef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE -namespace CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE { -#endif - -namespace Tbc { - -#ifdef TBC_TEXT_FORMAT_CONSOLE_WIDTH - const unsigned int consoleWidth = TBC_TEXT_FORMAT_CONSOLE_WIDTH; -#else - const unsigned int consoleWidth = 80; -#endif - - struct TextAttributes { - TextAttributes() - : initialIndent( std::string::npos ), - indent( 0 ), - width( consoleWidth-1 ) - {} - - TextAttributes& setInitialIndent( std::size_t _value ) { initialIndent = _value; return *this; } - TextAttributes& setIndent( std::size_t _value ) { indent = _value; return *this; } - TextAttributes& setWidth( std::size_t _value ) { width = _value; return *this; } - - std::size_t initialIndent; // indent of first line, or npos - std::size_t indent; // indent of subsequent lines, or all if initialIndent is npos - std::size_t width; // maximum width of text, including indent. Longer text will wrap - }; - - class Text { - public: - Text( std::string const& _str, TextAttributes const& _attr = TextAttributes() ) - : attr( _attr ) - { - const std::string wrappableBeforeChars = "[({<\t"; - const std::string wrappableAfterChars = "])}>-,./|\\"; - const std::string wrappableInsteadOfChars = " \n\r"; - std::string indent = _attr.initialIndent != std::string::npos - ? std::string( _attr.initialIndent, ' ' ) - : std::string( _attr.indent, ' ' ); - - typedef std::string::const_iterator iterator; - iterator it = _str.begin(); - const iterator strEnd = _str.end(); - - while( it != strEnd ) { - - if( lines.size() >= 1000 ) { - lines.push_back( "... message truncated due to excessive size" ); - return; - } - - std::string suffix; - std::size_t width = (std::min)( static_cast( strEnd-it ), _attr.width-static_cast( indent.size() ) ); - iterator itEnd = it+width; - iterator itNext = _str.end(); - - iterator itNewLine = std::find( it, itEnd, '\n' ); - if( itNewLine != itEnd ) - itEnd = itNewLine; - - if( itEnd != strEnd ) { - bool foundWrapPoint = false; - iterator findIt = itEnd; - do { - if( wrappableAfterChars.find( *findIt ) != std::string::npos && findIt != itEnd ) { - itEnd = findIt+1; - itNext = findIt+1; - foundWrapPoint = true; - } - else if( findIt > it && wrappableBeforeChars.find( *findIt ) != std::string::npos ) { - itEnd = findIt; - itNext = findIt; - foundWrapPoint = true; - } - else if( wrappableInsteadOfChars.find( *findIt ) != std::string::npos ) { - itNext = findIt+1; - itEnd = findIt; - foundWrapPoint = true; - } - if( findIt == it ) - break; - else - --findIt; - } - while( !foundWrapPoint ); - - if( !foundWrapPoint ) { - // No good wrap char, so we'll break mid word and add a hyphen - --itEnd; - itNext = itEnd; - suffix = "-"; - } - else { - while( itEnd > it && wrappableInsteadOfChars.find( *(itEnd-1) ) != std::string::npos ) - --itEnd; - } - } - lines.push_back( indent + std::string( it, itEnd ) + suffix ); - - if( indent.size() != _attr.indent ) - indent = std::string( _attr.indent, ' ' ); - it = itNext; - } - } - - typedef std::vector::const_iterator const_iterator; - - const_iterator begin() const { return lines.begin(); } - const_iterator end() const { return lines.end(); } - std::string const& last() const { return lines.back(); } - std::size_t size() const { return lines.size(); } - std::string const& operator[]( std::size_t _index ) const { return lines[_index]; } - std::string toString() const { - std::ostringstream oss; - oss << *this; - return oss.str(); - } - - inline friend std::ostream& operator << ( std::ostream& _stream, Text const& _text ) { - for( Text::const_iterator it = _text.begin(), itEnd = _text.end(); - it != itEnd; ++it ) { - if( it != _text.begin() ) - _stream << "\n"; - _stream << *it; - } - return _stream; - } - - private: - std::string str; - TextAttributes attr; - std::vector lines; - }; - -} // end namespace Tbc - -#ifdef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE -} // end outer namespace -#endif - -#endif // TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED -#undef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE - -namespace Catch { - using Tbc::Text; - using Tbc::TextAttributes; -} - -// #included from: catch_console_colour.hpp -#define TWOBLUECUBES_CATCH_CONSOLE_COLOUR_HPP_INCLUDED - -namespace Catch { - - struct Colour { - enum Code { - None = 0, - - White, - Red, - Green, - Blue, - Cyan, - Yellow, - Grey, - - Bright = 0x10, - - BrightRed = Bright | Red, - BrightGreen = Bright | Green, - LightGrey = Bright | Grey, - BrightWhite = Bright | White, - - // By intention - FileName = LightGrey, - Warning = Yellow, - ResultError = BrightRed, - ResultSuccess = BrightGreen, - ResultExpectedFailure = Warning, - - Error = BrightRed, - Success = Green, - - OriginalExpression = Cyan, - ReconstructedExpression = Yellow, - - SecondaryText = LightGrey, - Headers = White - }; - - // Use constructed object for RAII guard - Colour( Code _colourCode ); - Colour( Colour const& other ); - ~Colour(); - - // Use static method for one-shot changes - static void use( Code _colourCode ); - - private: - bool m_moved; - }; - - inline std::ostream& operator << ( std::ostream& os, Colour const& ) { return os; } - -} // end namespace Catch - -// #included from: catch_interfaces_reporter.h -#define TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED - -#include -#include -#include - -namespace Catch -{ - struct ReporterConfig { - explicit ReporterConfig( Ptr const& _fullConfig ) - : m_stream( &_fullConfig->stream() ), m_fullConfig( _fullConfig ) {} - - ReporterConfig( Ptr const& _fullConfig, std::ostream& _stream ) - : m_stream( &_stream ), m_fullConfig( _fullConfig ) {} - - std::ostream& stream() const { return *m_stream; } - Ptr fullConfig() const { return m_fullConfig; } - - private: - std::ostream* m_stream; - Ptr m_fullConfig; - }; - - struct ReporterPreferences { - ReporterPreferences() - : shouldRedirectStdOut( false ) - {} - - bool shouldRedirectStdOut; - }; - - template - struct LazyStat : Option { - LazyStat() : used( false ) {} - LazyStat& operator=( T const& _value ) { - Option::operator=( _value ); - used = false; - return *this; - } - void reset() { - Option::reset(); - used = false; - } - bool used; - }; - - struct TestRunInfo { - TestRunInfo( std::string const& _name ) : name( _name ) {} - std::string name; - }; - struct GroupInfo { - GroupInfo( std::string const& _name, - std::size_t _groupIndex, - std::size_t _groupsCount ) - : name( _name ), - groupIndex( _groupIndex ), - groupsCounts( _groupsCount ) - {} - - std::string name; - std::size_t groupIndex; - std::size_t groupsCounts; - }; - - struct AssertionStats { - AssertionStats( AssertionResult const& _assertionResult, - std::vector const& _infoMessages, - Totals const& _totals ) - : assertionResult( _assertionResult ), - infoMessages( _infoMessages ), - totals( _totals ) - { - if( assertionResult.hasMessage() ) { - // Copy message into messages list. - // !TBD This should have been done earlier, somewhere - MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() ); - builder << assertionResult.getMessage(); - builder.m_info.message = builder.m_stream.str(); - - infoMessages.push_back( builder.m_info ); - } - } - virtual ~AssertionStats(); - -# ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - AssertionStats( AssertionStats const& ) = default; - AssertionStats( AssertionStats && ) = default; - AssertionStats& operator = ( AssertionStats const& ) = default; - AssertionStats& operator = ( AssertionStats && ) = default; -# endif - - AssertionResult assertionResult; - std::vector infoMessages; - Totals totals; - }; - - struct SectionStats { - SectionStats( SectionInfo const& _sectionInfo, - Counts const& _assertions, - double _durationInSeconds, - bool _missingAssertions ) - : sectionInfo( _sectionInfo ), - assertions( _assertions ), - durationInSeconds( _durationInSeconds ), - missingAssertions( _missingAssertions ) - {} - virtual ~SectionStats(); -# ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - SectionStats( SectionStats const& ) = default; - SectionStats( SectionStats && ) = default; - SectionStats& operator = ( SectionStats const& ) = default; - SectionStats& operator = ( SectionStats && ) = default; -# endif - - SectionInfo sectionInfo; - Counts assertions; - double durationInSeconds; - bool missingAssertions; - }; - - struct TestCaseStats { - TestCaseStats( TestCaseInfo const& _testInfo, - Totals const& _totals, - std::string const& _stdOut, - std::string const& _stdErr, - bool _aborting ) - : testInfo( _testInfo ), - totals( _totals ), - stdOut( _stdOut ), - stdErr( _stdErr ), - aborting( _aborting ) - {} - virtual ~TestCaseStats(); - -# ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - TestCaseStats( TestCaseStats const& ) = default; - TestCaseStats( TestCaseStats && ) = default; - TestCaseStats& operator = ( TestCaseStats const& ) = default; - TestCaseStats& operator = ( TestCaseStats && ) = default; -# endif - - TestCaseInfo testInfo; - Totals totals; - std::string stdOut; - std::string stdErr; - bool aborting; - }; - - struct TestGroupStats { - TestGroupStats( GroupInfo const& _groupInfo, - Totals const& _totals, - bool _aborting ) - : groupInfo( _groupInfo ), - totals( _totals ), - aborting( _aborting ) - {} - TestGroupStats( GroupInfo const& _groupInfo ) - : groupInfo( _groupInfo ), - aborting( false ) - {} - virtual ~TestGroupStats(); - -# ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - TestGroupStats( TestGroupStats const& ) = default; - TestGroupStats( TestGroupStats && ) = default; - TestGroupStats& operator = ( TestGroupStats const& ) = default; - TestGroupStats& operator = ( TestGroupStats && ) = default; -# endif - - GroupInfo groupInfo; - Totals totals; - bool aborting; - }; - - struct TestRunStats { - TestRunStats( TestRunInfo const& _runInfo, - Totals const& _totals, - bool _aborting ) - : runInfo( _runInfo ), - totals( _totals ), - aborting( _aborting ) - {} - virtual ~TestRunStats(); - -# ifndef CATCH_CONFIG_CPP11_GENERATED_METHODS - TestRunStats( TestRunStats const& _other ) - : runInfo( _other.runInfo ), - totals( _other.totals ), - aborting( _other.aborting ) - {} -# else - TestRunStats( TestRunStats const& ) = default; - TestRunStats( TestRunStats && ) = default; - TestRunStats& operator = ( TestRunStats const& ) = default; - TestRunStats& operator = ( TestRunStats && ) = default; -# endif - - TestRunInfo runInfo; - Totals totals; - bool aborting; - }; - - class MultipleReporters; - - struct IStreamingReporter : IShared { - virtual ~IStreamingReporter(); - - // Implementing class must also provide the following static method: - // static std::string getDescription(); - - virtual ReporterPreferences getPreferences() const = 0; - - virtual void noMatchingTestCases( std::string const& spec ) = 0; - - virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0; - virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0; - - virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0; - virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0; - - virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0; - - // The return value indicates if the messages buffer should be cleared: - virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0; - - virtual void sectionEnded( SectionStats const& sectionStats ) = 0; - virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0; - virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0; - virtual void testRunEnded( TestRunStats const& testRunStats ) = 0; - - virtual void skipTest( TestCaseInfo const& testInfo ) = 0; - - virtual MultipleReporters* tryAsMulti() { return CATCH_NULL; } - }; - - struct IReporterFactory : IShared { - virtual ~IReporterFactory(); - virtual IStreamingReporter* create( ReporterConfig const& config ) const = 0; - virtual std::string getDescription() const = 0; - }; - - struct IReporterRegistry { - typedef std::map > FactoryMap; - typedef std::vector > Listeners; - - virtual ~IReporterRegistry(); - virtual IStreamingReporter* create( std::string const& name, Ptr const& config ) const = 0; - virtual FactoryMap const& getFactories() const = 0; - virtual Listeners const& getListeners() const = 0; - }; - - Ptr addReporter( Ptr const& existingReporter, Ptr const& additionalReporter ); - -} - -#include -#include - -namespace Catch { - - inline std::size_t listTests( Config const& config ) { - - TestSpec testSpec = config.testSpec(); - if( config.testSpec().hasFilters() ) - Catch::cout() << "Matching test cases:\n"; - else { - Catch::cout() << "All available test cases:\n"; - testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "*" ).testSpec(); - } - - std::size_t matchedTests = 0; - TextAttributes nameAttr, descAttr, tagsAttr; - nameAttr.setInitialIndent( 2 ).setIndent( 4 ); - descAttr.setIndent( 4 ); - tagsAttr.setIndent( 6 ); - - std::vector matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config ); - for( std::vector::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end(); - it != itEnd; - ++it ) { - matchedTests++; - TestCaseInfo const& testCaseInfo = it->getTestCaseInfo(); - Colour::Code colour = testCaseInfo.isHidden() - ? Colour::SecondaryText - : Colour::None; - Colour colourGuard( colour ); - - Catch::cout() << Text( testCaseInfo.name, nameAttr ) << std::endl; - if( config.listExtraInfo() ) { - Catch::cout() << " " << testCaseInfo.lineInfo << std::endl; - std::string description = testCaseInfo.description; - if( description.empty() ) - description = "(NO DESCRIPTION)"; - Catch::cout() << Text( description, descAttr ) << std::endl; - } - if( !testCaseInfo.tags.empty() ) - Catch::cout() << Text( testCaseInfo.tagsAsString, tagsAttr ) << std::endl; - } - - if( !config.testSpec().hasFilters() ) - Catch::cout() << pluralise( matchedTests, "test case" ) << '\n' << std::endl; - else - Catch::cout() << pluralise( matchedTests, "matching test case" ) << '\n' << std::endl; - return matchedTests; - } - - inline std::size_t listTestsNamesOnly( Config const& config ) { - TestSpec testSpec = config.testSpec(); - if( !config.testSpec().hasFilters() ) - testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "*" ).testSpec(); - std::size_t matchedTests = 0; - std::vector matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config ); - for( std::vector::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end(); - it != itEnd; - ++it ) { - matchedTests++; - TestCaseInfo const& testCaseInfo = it->getTestCaseInfo(); - if( startsWith( testCaseInfo.name, '#' ) ) - Catch::cout() << '"' << testCaseInfo.name << '"'; - else - Catch::cout() << testCaseInfo.name; - if ( config.listExtraInfo() ) - Catch::cout() << "\t@" << testCaseInfo.lineInfo; - Catch::cout() << std::endl; - } - return matchedTests; - } - - struct TagInfo { - TagInfo() : count ( 0 ) {} - void add( std::string const& spelling ) { - ++count; - spellings.insert( spelling ); - } - std::string all() const { - std::string out; - for( std::set::const_iterator it = spellings.begin(), itEnd = spellings.end(); - it != itEnd; - ++it ) - out += "[" + *it + "]"; - return out; - } - std::set spellings; - std::size_t count; - }; - - inline std::size_t listTags( Config const& config ) { - TestSpec testSpec = config.testSpec(); - if( config.testSpec().hasFilters() ) - Catch::cout() << "Tags for matching test cases:\n"; - else { - Catch::cout() << "All available tags:\n"; - testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "*" ).testSpec(); - } - - std::map tagCounts; - - std::vector matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config ); - for( std::vector::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end(); - it != itEnd; - ++it ) { - for( std::set::const_iterator tagIt = it->getTestCaseInfo().tags.begin(), - tagItEnd = it->getTestCaseInfo().tags.end(); - tagIt != tagItEnd; - ++tagIt ) { - std::string tagName = *tagIt; - std::string lcaseTagName = toLower( tagName ); - std::map::iterator countIt = tagCounts.find( lcaseTagName ); - if( countIt == tagCounts.end() ) - countIt = tagCounts.insert( std::make_pair( lcaseTagName, TagInfo() ) ).first; - countIt->second.add( tagName ); - } - } - - for( std::map::const_iterator countIt = tagCounts.begin(), - countItEnd = tagCounts.end(); - countIt != countItEnd; - ++countIt ) { - std::ostringstream oss; - oss << " " << std::setw(2) << countIt->second.count << " "; - Text wrapper( countIt->second.all(), TextAttributes() - .setInitialIndent( 0 ) - .setIndent( oss.str().size() ) - .setWidth( CATCH_CONFIG_CONSOLE_WIDTH-10 ) ); - Catch::cout() << oss.str() << wrapper << '\n'; - } - Catch::cout() << pluralise( tagCounts.size(), "tag" ) << '\n' << std::endl; - return tagCounts.size(); - } - - inline std::size_t listReporters( Config const& /*config*/ ) { - Catch::cout() << "Available reporters:\n"; - IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories(); - IReporterRegistry::FactoryMap::const_iterator itBegin = factories.begin(), itEnd = factories.end(), it; - std::size_t maxNameLen = 0; - for(it = itBegin; it != itEnd; ++it ) - maxNameLen = (std::max)( maxNameLen, it->first.size() ); - - for(it = itBegin; it != itEnd; ++it ) { - Text wrapper( it->second->getDescription(), TextAttributes() - .setInitialIndent( 0 ) - .setIndent( 7+maxNameLen ) - .setWidth( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen-8 ) ); - Catch::cout() << " " - << it->first - << ':' - << std::string( maxNameLen - it->first.size() + 2, ' ' ) - << wrapper << '\n'; - } - Catch::cout() << std::endl; - return factories.size(); - } - - inline Option list( Config const& config ) { - Option listedCount; - if( config.listTests() || ( config.listExtraInfo() && !config.listTestNamesOnly() ) ) - listedCount = listedCount.valueOr(0) + listTests( config ); - if( config.listTestNamesOnly() ) - listedCount = listedCount.valueOr(0) + listTestsNamesOnly( config ); - if( config.listTags() ) - listedCount = listedCount.valueOr(0) + listTags( config ); - if( config.listReporters() ) - listedCount = listedCount.valueOr(0) + listReporters( config ); - return listedCount; - } - -} // end namespace Catch - -// #included from: internal/catch_run_context.hpp -#define TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED - -// #included from: catch_test_case_tracker.hpp -#define TWOBLUECUBES_CATCH_TEST_CASE_TRACKER_HPP_INCLUDED - -#include -#include -#include -#include -#include - -CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS - -namespace Catch { -namespace TestCaseTracking { - - struct NameAndLocation { - std::string name; - SourceLineInfo location; - - NameAndLocation( std::string const& _name, SourceLineInfo const& _location ) - : name( _name ), - location( _location ) - {} - }; - - struct ITracker : SharedImpl<> { - virtual ~ITracker(); - - // static queries - virtual NameAndLocation const& nameAndLocation() const = 0; - - // dynamic queries - virtual bool isComplete() const = 0; // Successfully completed or failed - virtual bool isSuccessfullyCompleted() const = 0; - virtual bool isOpen() const = 0; // Started but not complete - virtual bool hasChildren() const = 0; - - virtual ITracker& parent() = 0; - - // actions - virtual void close() = 0; // Successfully complete - virtual void fail() = 0; - virtual void markAsNeedingAnotherRun() = 0; - - virtual void addChild( Ptr const& child ) = 0; - virtual ITracker* findChild( NameAndLocation const& nameAndLocation ) = 0; - virtual void openChild() = 0; - - // Debug/ checking - virtual bool isSectionTracker() const = 0; - virtual bool isIndexTracker() const = 0; - }; - - class TrackerContext { - - enum RunState { - NotStarted, - Executing, - CompletedCycle - }; - - Ptr m_rootTracker; - ITracker* m_currentTracker; - RunState m_runState; - - public: - - static TrackerContext& instance() { - static TrackerContext s_instance; - return s_instance; - } - - TrackerContext() - : m_currentTracker( CATCH_NULL ), - m_runState( NotStarted ) - {} - - ITracker& startRun(); - - void endRun() { - m_rootTracker.reset(); - m_currentTracker = CATCH_NULL; - m_runState = NotStarted; - } - - void startCycle() { - m_currentTracker = m_rootTracker.get(); - m_runState = Executing; - } - void completeCycle() { - m_runState = CompletedCycle; - } - - bool completedCycle() const { - return m_runState == CompletedCycle; - } - ITracker& currentTracker() { - return *m_currentTracker; - } - void setCurrentTracker( ITracker* tracker ) { - m_currentTracker = tracker; - } - }; - - class TrackerBase : public ITracker { - protected: - enum CycleState { - NotStarted, - Executing, - ExecutingChildren, - NeedsAnotherRun, - CompletedSuccessfully, - Failed - }; - class TrackerHasName { - NameAndLocation m_nameAndLocation; - public: - TrackerHasName( NameAndLocation const& nameAndLocation ) : m_nameAndLocation( nameAndLocation ) {} - bool operator ()( Ptr const& tracker ) { - return - tracker->nameAndLocation().name == m_nameAndLocation.name && - tracker->nameAndLocation().location == m_nameAndLocation.location; - } - }; - typedef std::vector > Children; - NameAndLocation m_nameAndLocation; - TrackerContext& m_ctx; - ITracker* m_parent; - Children m_children; - CycleState m_runState; - public: - TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ) - : m_nameAndLocation( nameAndLocation ), - m_ctx( ctx ), - m_parent( parent ), - m_runState( NotStarted ) - {} - virtual ~TrackerBase(); - - virtual NameAndLocation const& nameAndLocation() const CATCH_OVERRIDE { - return m_nameAndLocation; - } - virtual bool isComplete() const CATCH_OVERRIDE { - return m_runState == CompletedSuccessfully || m_runState == Failed; - } - virtual bool isSuccessfullyCompleted() const CATCH_OVERRIDE { - return m_runState == CompletedSuccessfully; - } - virtual bool isOpen() const CATCH_OVERRIDE { - return m_runState != NotStarted && !isComplete(); - } - virtual bool hasChildren() const CATCH_OVERRIDE { - return !m_children.empty(); - } - - virtual void addChild( Ptr const& child ) CATCH_OVERRIDE { - m_children.push_back( child ); - } - - virtual ITracker* findChild( NameAndLocation const& nameAndLocation ) CATCH_OVERRIDE { - Children::const_iterator it = std::find_if( m_children.begin(), m_children.end(), TrackerHasName( nameAndLocation ) ); - return( it != m_children.end() ) - ? it->get() - : CATCH_NULL; - } - virtual ITracker& parent() CATCH_OVERRIDE { - assert( m_parent ); // Should always be non-null except for root - return *m_parent; - } - - virtual void openChild() CATCH_OVERRIDE { - if( m_runState != ExecutingChildren ) { - m_runState = ExecutingChildren; - if( m_parent ) - m_parent->openChild(); - } - } - - virtual bool isSectionTracker() const CATCH_OVERRIDE { return false; } - virtual bool isIndexTracker() const CATCH_OVERRIDE { return false; } - - void open() { - m_runState = Executing; - moveToThis(); - if( m_parent ) - m_parent->openChild(); - } - - virtual void close() CATCH_OVERRIDE { - - // Close any still open children (e.g. generators) - while( &m_ctx.currentTracker() != this ) - m_ctx.currentTracker().close(); - - switch( m_runState ) { - case NotStarted: - case CompletedSuccessfully: - case Failed: - throw std::logic_error( "Illogical state" ); - - case NeedsAnotherRun: - break;; - - case Executing: - m_runState = CompletedSuccessfully; - break; - case ExecutingChildren: - if( m_children.empty() || m_children.back()->isComplete() ) - m_runState = CompletedSuccessfully; - break; - - default: - throw std::logic_error( "Unexpected state" ); - } - moveToParent(); - m_ctx.completeCycle(); - } - virtual void fail() CATCH_OVERRIDE { - m_runState = Failed; - if( m_parent ) - m_parent->markAsNeedingAnotherRun(); - moveToParent(); - m_ctx.completeCycle(); - } - virtual void markAsNeedingAnotherRun() CATCH_OVERRIDE { - m_runState = NeedsAnotherRun; - } - private: - void moveToParent() { - assert( m_parent ); - m_ctx.setCurrentTracker( m_parent ); - } - void moveToThis() { - m_ctx.setCurrentTracker( this ); - } - }; - - class SectionTracker : public TrackerBase { - std::vector m_filters; - public: - SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ) - : TrackerBase( nameAndLocation, ctx, parent ) - { - if( parent ) { - while( !parent->isSectionTracker() ) - parent = &parent->parent(); - - SectionTracker& parentSection = static_cast( *parent ); - addNextFilters( parentSection.m_filters ); - } - } - virtual ~SectionTracker(); - - virtual bool isSectionTracker() const CATCH_OVERRIDE { return true; } - - static SectionTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation ) { - SectionTracker* section = CATCH_NULL; - - ITracker& currentTracker = ctx.currentTracker(); - if( ITracker* childTracker = currentTracker.findChild( nameAndLocation ) ) { - assert( childTracker ); - assert( childTracker->isSectionTracker() ); - section = static_cast( childTracker ); - } - else { - section = new SectionTracker( nameAndLocation, ctx, ¤tTracker ); - currentTracker.addChild( section ); - } - if( !ctx.completedCycle() ) - section->tryOpen(); - return *section; - } - - void tryOpen() { - if( !isComplete() && (m_filters.empty() || m_filters[0].empty() || m_filters[0] == m_nameAndLocation.name ) ) - open(); - } - - void addInitialFilters( std::vector const& filters ) { - if( !filters.empty() ) { - m_filters.push_back(""); // Root - should never be consulted - m_filters.push_back(""); // Test Case - not a section filter - m_filters.insert( m_filters.end(), filters.begin(), filters.end() ); - } - } - void addNextFilters( std::vector const& filters ) { - if( filters.size() > 1 ) - m_filters.insert( m_filters.end(), ++filters.begin(), filters.end() ); - } - }; - - class IndexTracker : public TrackerBase { - int m_size; - int m_index; - public: - IndexTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent, int size ) - : TrackerBase( nameAndLocation, ctx, parent ), - m_size( size ), - m_index( -1 ) - {} - virtual ~IndexTracker(); - - virtual bool isIndexTracker() const CATCH_OVERRIDE { return true; } - - static IndexTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation, int size ) { - IndexTracker* tracker = CATCH_NULL; - - ITracker& currentTracker = ctx.currentTracker(); - if( ITracker* childTracker = currentTracker.findChild( nameAndLocation ) ) { - assert( childTracker ); - assert( childTracker->isIndexTracker() ); - tracker = static_cast( childTracker ); - } - else { - tracker = new IndexTracker( nameAndLocation, ctx, ¤tTracker, size ); - currentTracker.addChild( tracker ); - } - - if( !ctx.completedCycle() && !tracker->isComplete() ) { - if( tracker->m_runState != ExecutingChildren && tracker->m_runState != NeedsAnotherRun ) - tracker->moveNext(); - tracker->open(); - } - - return *tracker; - } - - int index() const { return m_index; } - - void moveNext() { - m_index++; - m_children.clear(); - } - - virtual void close() CATCH_OVERRIDE { - TrackerBase::close(); - if( m_runState == CompletedSuccessfully && m_index < m_size-1 ) - m_runState = Executing; - } - }; - - inline ITracker& TrackerContext::startRun() { - m_rootTracker = new SectionTracker( NameAndLocation( "{root}", CATCH_INTERNAL_LINEINFO ), *this, CATCH_NULL ); - m_currentTracker = CATCH_NULL; - m_runState = Executing; - return *m_rootTracker; - } - -} // namespace TestCaseTracking - -using TestCaseTracking::ITracker; -using TestCaseTracking::TrackerContext; -using TestCaseTracking::SectionTracker; -using TestCaseTracking::IndexTracker; - -} // namespace Catch - -CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS - -// #included from: catch_fatal_condition.hpp -#define TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED - -namespace Catch { - - // Report the error condition - inline void reportFatal( std::string const& message ) { - IContext& context = Catch::getCurrentContext(); - IResultCapture* resultCapture = context.getResultCapture(); - resultCapture->handleFatalErrorCondition( message ); - } - -} // namespace Catch - -#if defined ( CATCH_PLATFORM_WINDOWS ) ///////////////////////////////////////// -// #included from: catch_windows_h_proxy.h - -#define TWOBLUECUBES_CATCH_WINDOWS_H_PROXY_H_INCLUDED - -#ifdef CATCH_DEFINES_NOMINMAX -# define NOMINMAX -#endif -#ifdef CATCH_DEFINES_WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -#endif - -#ifdef __AFXDLL -#include -#else -#include -#endif - -#ifdef CATCH_DEFINES_NOMINMAX -# undef NOMINMAX -#endif -#ifdef CATCH_DEFINES_WIN32_LEAN_AND_MEAN -# undef WIN32_LEAN_AND_MEAN -#endif - - -# if !defined ( CATCH_CONFIG_WINDOWS_SEH ) - -namespace Catch { - struct FatalConditionHandler { - void reset() {} - }; -} - -# else // CATCH_CONFIG_WINDOWS_SEH is defined - -namespace Catch { - - struct SignalDefs { DWORD id; const char* name; }; - extern SignalDefs signalDefs[]; - // There is no 1-1 mapping between signals and windows exceptions. - // Windows can easily distinguish between SO and SigSegV, - // but SigInt, SigTerm, etc are handled differently. - SignalDefs signalDefs[] = { - { EXCEPTION_ILLEGAL_INSTRUCTION, "SIGILL - Illegal instruction signal" }, - { EXCEPTION_STACK_OVERFLOW, "SIGSEGV - Stack overflow" }, - { EXCEPTION_ACCESS_VIOLATION, "SIGSEGV - Segmentation violation signal" }, - { EXCEPTION_INT_DIVIDE_BY_ZERO, "Divide by zero error" }, - }; - - struct FatalConditionHandler { - - static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) { - for (int i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) { - if (ExceptionInfo->ExceptionRecord->ExceptionCode == signalDefs[i].id) { - reportFatal(signalDefs[i].name); - } - } - // If its not an exception we care about, pass it along. - // This stops us from eating debugger breaks etc. - return EXCEPTION_CONTINUE_SEARCH; - } - - FatalConditionHandler() { - isSet = true; - // 32k seems enough for Catch to handle stack overflow, - // but the value was found experimentally, so there is no strong guarantee - guaranteeSize = 32 * 1024; - exceptionHandlerHandle = CATCH_NULL; - // Register as first handler in current chain - exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException); - // Pass in guarantee size to be filled - SetThreadStackGuarantee(&guaranteeSize); - } - - static void reset() { - if (isSet) { - // Unregister handler and restore the old guarantee - RemoveVectoredExceptionHandler(exceptionHandlerHandle); - SetThreadStackGuarantee(&guaranteeSize); - exceptionHandlerHandle = CATCH_NULL; - isSet = false; - } - } - - ~FatalConditionHandler() { - reset(); - } - private: - static bool isSet; - static ULONG guaranteeSize; - static PVOID exceptionHandlerHandle; - }; - - bool FatalConditionHandler::isSet = false; - ULONG FatalConditionHandler::guaranteeSize = 0; - PVOID FatalConditionHandler::exceptionHandlerHandle = CATCH_NULL; - -} // namespace Catch - -# endif // CATCH_CONFIG_WINDOWS_SEH - -#else // Not Windows - assumed to be POSIX compatible ////////////////////////// - -# if !defined(CATCH_CONFIG_POSIX_SIGNALS) - -namespace Catch { - struct FatalConditionHandler { - void reset() {} - }; -} - -# else // CATCH_CONFIG_POSIX_SIGNALS is defined - -#include - -namespace Catch { - - struct SignalDefs { - int id; - const char* name; - }; - extern SignalDefs signalDefs[]; - SignalDefs signalDefs[] = { - { SIGINT, "SIGINT - Terminal interrupt signal" }, - { SIGILL, "SIGILL - Illegal instruction signal" }, - { SIGFPE, "SIGFPE - Floating point error signal" }, - { SIGSEGV, "SIGSEGV - Segmentation violation signal" }, - { SIGTERM, "SIGTERM - Termination request signal" }, - { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" } - }; - - struct FatalConditionHandler { - - static bool isSet; - static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)]; - static stack_t oldSigStack; - static char altStackMem[SIGSTKSZ]; - - static void handleSignal( int sig ) { - std::string name = ""; - for (std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) { - SignalDefs &def = signalDefs[i]; - if (sig == def.id) { - name = def.name; - break; - } - } - reset(); - reportFatal(name); - raise( sig ); - } - - FatalConditionHandler() { - isSet = true; - stack_t sigStack; - sigStack.ss_sp = altStackMem; - sigStack.ss_size = SIGSTKSZ; - sigStack.ss_flags = 0; - sigaltstack(&sigStack, &oldSigStack); - struct sigaction sa = { 0 }; - - sa.sa_handler = handleSignal; - sa.sa_flags = SA_ONSTACK; - for (std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i) { - sigaction(signalDefs[i].id, &sa, &oldSigActions[i]); - } - } - - ~FatalConditionHandler() { - reset(); - } - static void reset() { - if( isSet ) { - // Set signals back to previous values -- hopefully nobody overwrote them in the meantime - for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i ) { - sigaction(signalDefs[i].id, &oldSigActions[i], CATCH_NULL); - } - // Return the old stack - sigaltstack(&oldSigStack, CATCH_NULL); - isSet = false; - } - } - }; - - bool FatalConditionHandler::isSet = false; - struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {}; - stack_t FatalConditionHandler::oldSigStack = {}; - char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; - -} // namespace Catch - -# endif // CATCH_CONFIG_POSIX_SIGNALS - -#endif // not Windows - -#include -#include - -namespace Catch { - - class StreamRedirect { - - public: - StreamRedirect( std::ostream& stream, std::string& targetString ) - : m_stream( stream ), - m_prevBuf( stream.rdbuf() ), - m_targetString( targetString ) - { - stream.rdbuf( m_oss.rdbuf() ); - } - - ~StreamRedirect() { - m_targetString += m_oss.str(); - m_stream.rdbuf( m_prevBuf ); - } - - private: - std::ostream& m_stream; - std::streambuf* m_prevBuf; - std::ostringstream m_oss; - std::string& m_targetString; - }; - - /////////////////////////////////////////////////////////////////////////// - - class RunContext : public IResultCapture, public IRunner { - - RunContext( RunContext const& ); - void operator =( RunContext const& ); - - public: - - explicit RunContext( Ptr const& _config, Ptr const& reporter ) - : m_runInfo( _config->name() ), - m_context( getCurrentMutableContext() ), - m_activeTestCase( CATCH_NULL ), - m_config( _config ), - m_reporter( reporter ), - m_shouldReportUnexpected ( true ) - { - m_context.setRunner( this ); - m_context.setConfig( m_config ); - m_context.setResultCapture( this ); - m_reporter->testRunStarting( m_runInfo ); - } - - virtual ~RunContext() { - m_reporter->testRunEnded( TestRunStats( m_runInfo, m_totals, aborting() ) ); - } - - void testGroupStarting( std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount ) { - m_reporter->testGroupStarting( GroupInfo( testSpec, groupIndex, groupsCount ) ); - } - void testGroupEnded( std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount ) { - m_reporter->testGroupEnded( TestGroupStats( GroupInfo( testSpec, groupIndex, groupsCount ), totals, aborting() ) ); - } - - Totals runTest( TestCase const& testCase ) { - Totals prevTotals = m_totals; - - std::string redirectedCout; - std::string redirectedCerr; - - TestCaseInfo testInfo = testCase.getTestCaseInfo(); - - m_reporter->testCaseStarting( testInfo ); - - m_activeTestCase = &testCase; - - do { - ITracker& rootTracker = m_trackerContext.startRun(); - assert( rootTracker.isSectionTracker() ); - static_cast( rootTracker ).addInitialFilters( m_config->getSectionsToRun() ); - do { - m_trackerContext.startCycle(); - m_testCaseTracker = &SectionTracker::acquire( m_trackerContext, TestCaseTracking::NameAndLocation( testInfo.name, testInfo.lineInfo ) ); - runCurrentTest( redirectedCout, redirectedCerr ); - } - while( !m_testCaseTracker->isSuccessfullyCompleted() && !aborting() ); - } - // !TBD: deprecated - this will be replaced by indexed trackers - while( getCurrentContext().advanceGeneratorsForCurrentTest() && !aborting() ); - - Totals deltaTotals = m_totals.delta( prevTotals ); - if( testInfo.expectedToFail() && deltaTotals.testCases.passed > 0 ) { - deltaTotals.assertions.failed++; - deltaTotals.testCases.passed--; - deltaTotals.testCases.failed++; - } - m_totals.testCases += deltaTotals.testCases; - m_reporter->testCaseEnded( TestCaseStats( testInfo, - deltaTotals, - redirectedCout, - redirectedCerr, - aborting() ) ); - - m_activeTestCase = CATCH_NULL; - m_testCaseTracker = CATCH_NULL; - - return deltaTotals; - } - - Ptr config() const { - return m_config; - } - - private: // IResultCapture - - virtual void assertionEnded( AssertionResult const& result ) { - if( result.getResultType() == ResultWas::Ok ) { - m_totals.assertions.passed++; - } - else if( !result.isOk() ) { - m_totals.assertions.failed++; - } - - // We have no use for the return value (whether messages should be cleared), because messages were made scoped - // and should be let to clear themselves out. - static_cast(m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals))); - - // Reset working state - m_lastAssertionInfo = AssertionInfo( "", m_lastAssertionInfo.lineInfo, "{Unknown expression after the reported line}" , m_lastAssertionInfo.resultDisposition ); - m_lastResult = result; - } - - virtual bool sectionStarted ( - SectionInfo const& sectionInfo, - Counts& assertions - ) - { - ITracker& sectionTracker = SectionTracker::acquire( m_trackerContext, TestCaseTracking::NameAndLocation( sectionInfo.name, sectionInfo.lineInfo ) ); - if( !sectionTracker.isOpen() ) - return false; - m_activeSections.push_back( §ionTracker ); - - m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo; - - m_reporter->sectionStarting( sectionInfo ); - - assertions = m_totals.assertions; - - return true; - } - bool testForMissingAssertions( Counts& assertions ) { - if( assertions.total() != 0 ) - return false; - if( !m_config->warnAboutMissingAssertions() ) - return false; - if( m_trackerContext.currentTracker().hasChildren() ) - return false; - m_totals.assertions.failed++; - assertions.failed++; - return true; - } - - virtual void sectionEnded( SectionEndInfo const& endInfo ) { - Counts assertions = m_totals.assertions - endInfo.prevAssertions; - bool missingAssertions = testForMissingAssertions( assertions ); - - if( !m_activeSections.empty() ) { - m_activeSections.back()->close(); - m_activeSections.pop_back(); - } - - m_reporter->sectionEnded( SectionStats( endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions ) ); - m_messages.clear(); - } - - virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) { - if( m_unfinishedSections.empty() ) - m_activeSections.back()->fail(); - else - m_activeSections.back()->close(); - m_activeSections.pop_back(); - - m_unfinishedSections.push_back( endInfo ); - } - - virtual void pushScopedMessage( MessageInfo const& message ) { - m_messages.push_back( message ); - } - - virtual void popScopedMessage( MessageInfo const& message ) { - m_messages.erase( std::remove( m_messages.begin(), m_messages.end(), message ), m_messages.end() ); - } - - virtual std::string getCurrentTestName() const { - return m_activeTestCase - ? m_activeTestCase->getTestCaseInfo().name - : std::string(); - } - - virtual const AssertionResult* getLastResult() const { - return &m_lastResult; - } - - virtual void exceptionEarlyReported() { - m_shouldReportUnexpected = false; - } - - virtual void handleFatalErrorCondition( std::string const& message ) { - // Don't rebuild the result -- the stringification itself can cause more fatal errors - // Instead, fake a result data. - AssertionResultData tempResult; - tempResult.resultType = ResultWas::FatalErrorCondition; - tempResult.message = message; - AssertionResult result(m_lastAssertionInfo, tempResult); - - getResultCapture().assertionEnded(result); - - handleUnfinishedSections(); - - // Recreate section for test case (as we will lose the one that was in scope) - TestCaseInfo const& testCaseInfo = m_activeTestCase->getTestCaseInfo(); - SectionInfo testCaseSection( testCaseInfo.lineInfo, testCaseInfo.name, testCaseInfo.description ); - - Counts assertions; - assertions.failed = 1; - SectionStats testCaseSectionStats( testCaseSection, assertions, 0, false ); - m_reporter->sectionEnded( testCaseSectionStats ); - - TestCaseInfo testInfo = m_activeTestCase->getTestCaseInfo(); - - Totals deltaTotals; - deltaTotals.testCases.failed = 1; - m_reporter->testCaseEnded( TestCaseStats( testInfo, - deltaTotals, - std::string(), - std::string(), - false ) ); - m_totals.testCases.failed++; - testGroupEnded( std::string(), m_totals, 1, 1 ); - m_reporter->testRunEnded( TestRunStats( m_runInfo, m_totals, false ) ); - } - - public: - // !TBD We need to do this another way! - bool aborting() const { - return m_totals.assertions.failed == static_cast( m_config->abortAfter() ); - } - - private: - - void runCurrentTest( std::string& redirectedCout, std::string& redirectedCerr ) { - TestCaseInfo const& testCaseInfo = m_activeTestCase->getTestCaseInfo(); - SectionInfo testCaseSection( testCaseInfo.lineInfo, testCaseInfo.name, testCaseInfo.description ); - m_reporter->sectionStarting( testCaseSection ); - Counts prevAssertions = m_totals.assertions; - double duration = 0; - m_shouldReportUnexpected = true; - try { - m_lastAssertionInfo = AssertionInfo( "TEST_CASE", testCaseInfo.lineInfo, "", ResultDisposition::Normal ); - - seedRng( *m_config ); - - Timer timer; - timer.start(); - if( m_reporter->getPreferences().shouldRedirectStdOut ) { - StreamRedirect coutRedir( Catch::cout(), redirectedCout ); - StreamRedirect cerrRedir( Catch::cerr(), redirectedCerr ); - invokeActiveTestCase(); - } - else { - invokeActiveTestCase(); - } - duration = timer.getElapsedSeconds(); - } - catch( TestFailureException& ) { - // This just means the test was aborted due to failure - } - catch(...) { - // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions - // are reported without translation at the point of origin. - if (m_shouldReportUnexpected) { - makeUnexpectedResultBuilder().useActiveException(); - } - } - m_testCaseTracker->close(); - handleUnfinishedSections(); - m_messages.clear(); - - Counts assertions = m_totals.assertions - prevAssertions; - bool missingAssertions = testForMissingAssertions( assertions ); - - if( testCaseInfo.okToFail() ) { - std::swap( assertions.failedButOk, assertions.failed ); - m_totals.assertions.failed -= assertions.failedButOk; - m_totals.assertions.failedButOk += assertions.failedButOk; - } - - SectionStats testCaseSectionStats( testCaseSection, assertions, duration, missingAssertions ); - m_reporter->sectionEnded( testCaseSectionStats ); - } - - void invokeActiveTestCase() { - FatalConditionHandler fatalConditionHandler; // Handle signals - m_activeTestCase->invoke(); - fatalConditionHandler.reset(); - } - - private: - - ResultBuilder makeUnexpectedResultBuilder() const { - return ResultBuilder( m_lastAssertionInfo.macroName, - m_lastAssertionInfo.lineInfo, - m_lastAssertionInfo.capturedExpression, - m_lastAssertionInfo.resultDisposition ); - } - - void handleUnfinishedSections() { - // If sections ended prematurely due to an exception we stored their - // infos here so we can tear them down outside the unwind process. - for( std::vector::const_reverse_iterator it = m_unfinishedSections.rbegin(), - itEnd = m_unfinishedSections.rend(); - it != itEnd; - ++it ) - sectionEnded( *it ); - m_unfinishedSections.clear(); - } - - TestRunInfo m_runInfo; - IMutableContext& m_context; - TestCase const* m_activeTestCase; - ITracker* m_testCaseTracker; - ITracker* m_currentSectionTracker; - AssertionResult m_lastResult; - - Ptr m_config; - Totals m_totals; - Ptr m_reporter; - std::vector m_messages; - AssertionInfo m_lastAssertionInfo; - std::vector m_unfinishedSections; - std::vector m_activeSections; - TrackerContext m_trackerContext; - bool m_shouldReportUnexpected; - }; - - IResultCapture& getResultCapture() { - if( IResultCapture* capture = getCurrentContext().getResultCapture() ) - return *capture; - else - throw std::logic_error( "No result capture instance" ); - } - -} // end namespace Catch - -// #included from: internal/catch_version.h -#define TWOBLUECUBES_CATCH_VERSION_H_INCLUDED - -namespace Catch { - - // Versioning information - struct Version { - Version( unsigned int _majorVersion, - unsigned int _minorVersion, - unsigned int _patchNumber, - char const * const _branchName, - unsigned int _buildNumber ); - - unsigned int const majorVersion; - unsigned int const minorVersion; - unsigned int const patchNumber; - - // buildNumber is only used if branchName is not null - char const * const branchName; - unsigned int const buildNumber; - - friend std::ostream& operator << ( std::ostream& os, Version const& version ); - - private: - void operator=( Version const& ); - }; - - inline Version libraryVersion(); -} - -#include -#include -#include - -namespace Catch { - - Ptr createReporter( std::string const& reporterName, Ptr const& config ) { - Ptr reporter = getRegistryHub().getReporterRegistry().create( reporterName, config.get() ); - if( !reporter ) { - std::ostringstream oss; - oss << "No reporter registered with name: '" << reporterName << "'"; - throw std::domain_error( oss.str() ); - } - return reporter; - } - - Ptr makeReporter( Ptr const& config ) { - std::vector reporters = config->getReporterNames(); - if( reporters.empty() ) - reporters.push_back( "console" ); - - Ptr reporter; - for( std::vector::const_iterator it = reporters.begin(), itEnd = reporters.end(); - it != itEnd; - ++it ) - reporter = addReporter( reporter, createReporter( *it, config ) ); - return reporter; - } - Ptr addListeners( Ptr const& config, Ptr reporters ) { - IReporterRegistry::Listeners listeners = getRegistryHub().getReporterRegistry().getListeners(); - for( IReporterRegistry::Listeners::const_iterator it = listeners.begin(), itEnd = listeners.end(); - it != itEnd; - ++it ) - reporters = addReporter(reporters, (*it)->create( ReporterConfig( config ) ) ); - return reporters; - } - - Totals runTests( Ptr const& config ) { - - Ptr iconfig = config.get(); - - Ptr reporter = makeReporter( config ); - reporter = addListeners( iconfig, reporter ); - - RunContext context( iconfig, reporter ); - - Totals totals; - - context.testGroupStarting( config->name(), 1, 1 ); - - TestSpec testSpec = config->testSpec(); - if( !testSpec.hasFilters() ) - testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "~[.]" ).testSpec(); // All not hidden tests - - std::vector const& allTestCases = getAllTestCasesSorted( *iconfig ); - for( std::vector::const_iterator it = allTestCases.begin(), itEnd = allTestCases.end(); - it != itEnd; - ++it ) { - if( !context.aborting() && matchTest( *it, testSpec, *iconfig ) ) - totals += context.runTest( *it ); - else - reporter->skipTest( *it ); - } - - context.testGroupEnded( iconfig->name(), totals, 1, 1 ); - return totals; - } - - void applyFilenamesAsTags( IConfig const& config ) { - std::vector const& tests = getAllTestCasesSorted( config ); - for(std::size_t i = 0; i < tests.size(); ++i ) { - TestCase& test = const_cast( tests[i] ); - std::set tags = test.tags; - - std::string filename = test.lineInfo.file; - std::string::size_type lastSlash = filename.find_last_of( "\\/" ); - if( lastSlash != std::string::npos ) - filename = filename.substr( lastSlash+1 ); - - std::string::size_type lastDot = filename.find_last_of( "." ); - if( lastDot != std::string::npos ) - filename = filename.substr( 0, lastDot ); - - tags.insert( "#" + filename ); - setTags( test, tags ); - } - } - - class Session : NonCopyable { - static bool alreadyInstantiated; - - public: - - struct OnUnusedOptions { enum DoWhat { Ignore, Fail }; }; - - Session() - : m_cli( makeCommandLineParser() ) { - if( alreadyInstantiated ) { - std::string msg = "Only one instance of Catch::Session can ever be used"; - Catch::cerr() << msg << std::endl; - throw std::logic_error( msg ); - } - alreadyInstantiated = true; - } - ~Session() { - Catch::cleanUp(); - } - - void showHelp( std::string const& processName ) { - Catch::cout() << "\nCatch v" << libraryVersion() << "\n"; - - m_cli.usage( Catch::cout(), processName ); - Catch::cout() << "For more detail usage please see the project docs\n" << std::endl; - } - - int applyCommandLine( int argc, char const* const* const argv, OnUnusedOptions::DoWhat unusedOptionBehaviour = OnUnusedOptions::Fail ) { - try { - m_cli.setThrowOnUnrecognisedTokens( unusedOptionBehaviour == OnUnusedOptions::Fail ); - m_unusedTokens = m_cli.parseInto( Clara::argsToVector( argc, argv ), m_configData ); - if( m_configData.showHelp ) - showHelp( m_configData.processName ); - m_config.reset(); - } - catch( std::exception& ex ) { - { - Colour colourGuard( Colour::Red ); - Catch::cerr() - << "\nError(s) in input:\n" - << Text( ex.what(), TextAttributes().setIndent(2) ) - << "\n\n"; - } - m_cli.usage( Catch::cout(), m_configData.processName ); - return (std::numeric_limits::max)(); - } - return 0; - } - - void useConfigData( ConfigData const& _configData ) { - m_configData = _configData; - m_config.reset(); - } - - int run( int argc, char const* const* const argv ) { - - int returnCode = applyCommandLine( argc, argv ); - if( returnCode == 0 ) - returnCode = run(); - return returnCode; - } - - #if defined(WIN32) && defined(UNICODE) - int run( int argc, wchar_t const* const* const argv ) { - - char **utf8Argv = new char *[ argc ]; - - for ( int i = 0; i < argc; ++i ) { - int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, NULL, 0, NULL, NULL ); - - utf8Argv[ i ] = new char[ bufSize ]; - - WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, NULL, NULL ); - } - - int returnCode = applyCommandLine( argc, utf8Argv ); - if( returnCode == 0 ) - returnCode = run(); - - for ( int i = 0; i < argc; ++i ) - delete [] utf8Argv[ i ]; - - delete [] utf8Argv; - - return returnCode; - } - #endif - - int run() { - if( m_configData.showHelp ) - return 0; - - try - { - config(); // Force config to be constructed - - seedRng( *m_config ); - - if( m_configData.filenamesAsTags ) - applyFilenamesAsTags( *m_config ); - - // Handle list request - if( Option listed = list( config() ) ) - return static_cast( *listed ); - - return static_cast( runTests( m_config ).assertions.failed ); - } - catch( std::exception& ex ) { - Catch::cerr() << ex.what() << std::endl; - return (std::numeric_limits::max)(); - } - } - - Clara::CommandLine const& cli() const { - return m_cli; - } - std::vector const& unusedTokens() const { - return m_unusedTokens; - } - ConfigData& configData() { - return m_configData; - } - Config& config() { - if( !m_config ) - m_config = new Config( m_configData ); - return *m_config; - } - private: - Clara::CommandLine m_cli; - std::vector m_unusedTokens; - ConfigData m_configData; - Ptr m_config; - }; - - bool Session::alreadyInstantiated = false; - -} // end namespace Catch - -// #included from: catch_registry_hub.hpp -#define TWOBLUECUBES_CATCH_REGISTRY_HUB_HPP_INCLUDED - -// #included from: catch_test_case_registry_impl.hpp -#define TWOBLUECUBES_CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED - -#include -#include -#include -#include - -namespace Catch { - - struct RandomNumberGenerator { - typedef std::ptrdiff_t result_type; - - result_type operator()( result_type n ) const { return std::rand() % n; } - -#ifdef CATCH_CONFIG_CPP11_SHUFFLE - static constexpr result_type min() { return 0; } - static constexpr result_type max() { return 1000000; } - result_type operator()() const { return std::rand() % max(); } -#endif - template - static void shuffle( V& vector ) { - RandomNumberGenerator rng; -#ifdef CATCH_CONFIG_CPP11_SHUFFLE - std::shuffle( vector.begin(), vector.end(), rng ); -#else - std::random_shuffle( vector.begin(), vector.end(), rng ); -#endif - } - }; - - inline std::vector sortTests( IConfig const& config, std::vector const& unsortedTestCases ) { - - std::vector sorted = unsortedTestCases; - - switch( config.runOrder() ) { - case RunTests::InLexicographicalOrder: - std::sort( sorted.begin(), sorted.end() ); - break; - case RunTests::InRandomOrder: - { - seedRng( config ); - RandomNumberGenerator::shuffle( sorted ); - } - break; - case RunTests::InDeclarationOrder: - // already in declaration order - break; - } - return sorted; - } - bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) { - return testSpec.matches( testCase ) && ( config.allowThrows() || !testCase.throws() ); - } - - void enforceNoDuplicateTestCases( std::vector const& functions ) { - std::set seenFunctions; - for( std::vector::const_iterator it = functions.begin(), itEnd = functions.end(); - it != itEnd; - ++it ) { - std::pair::const_iterator, bool> prev = seenFunctions.insert( *it ); - if( !prev.second ) { - std::ostringstream ss; - - ss << Colour( Colour::Red ) - << "error: TEST_CASE( \"" << it->name << "\" ) already defined.\n" - << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << '\n' - << "\tRedefined at " << it->getTestCaseInfo().lineInfo << std::endl; - - throw std::runtime_error(ss.str()); - } - } - } - - std::vector filterTests( std::vector const& testCases, TestSpec const& testSpec, IConfig const& config ) { - std::vector filtered; - filtered.reserve( testCases.size() ); - for( std::vector::const_iterator it = testCases.begin(), itEnd = testCases.end(); - it != itEnd; - ++it ) - if( matchTest( *it, testSpec, config ) ) - filtered.push_back( *it ); - return filtered; - } - std::vector const& getAllTestCasesSorted( IConfig const& config ) { - return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config ); - } - - class TestRegistry : public ITestCaseRegistry { - public: - TestRegistry() - : m_currentSortOrder( RunTests::InDeclarationOrder ), - m_unnamedCount( 0 ) - {} - virtual ~TestRegistry(); - - virtual void registerTest( TestCase const& testCase ) { - std::string name = testCase.getTestCaseInfo().name; - if( name.empty() ) { - std::ostringstream oss; - oss << "Anonymous test case " << ++m_unnamedCount; - return registerTest( testCase.withName( oss.str() ) ); - } - m_functions.push_back( testCase ); - } - - virtual std::vector const& getAllTests() const { - return m_functions; - } - virtual std::vector const& getAllTestsSorted( IConfig const& config ) const { - if( m_sortedFunctions.empty() ) - enforceNoDuplicateTestCases( m_functions ); - - if( m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) { - m_sortedFunctions = sortTests( config, m_functions ); - m_currentSortOrder = config.runOrder(); - } - return m_sortedFunctions; - } - - private: - std::vector m_functions; - mutable RunTests::InWhatOrder m_currentSortOrder; - mutable std::vector m_sortedFunctions; - size_t m_unnamedCount; - std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised - }; - - /////////////////////////////////////////////////////////////////////////// - - class FreeFunctionTestCase : public SharedImpl { - public: - - FreeFunctionTestCase( TestFunction fun ) : m_fun( fun ) {} - - virtual void invoke() const { - m_fun(); - } - - private: - virtual ~FreeFunctionTestCase(); - - TestFunction m_fun; - }; - - inline std::string extractClassName( std::string const& classOrQualifiedMethodName ) { - std::string className = classOrQualifiedMethodName; - if( startsWith( className, '&' ) ) - { - std::size_t lastColons = className.rfind( "::" ); - std::size_t penultimateColons = className.rfind( "::", lastColons-1 ); - if( penultimateColons == std::string::npos ) - penultimateColons = 1; - className = className.substr( penultimateColons, lastColons-penultimateColons ); - } - return className; - } - - void registerTestCase - ( ITestCase* testCase, - char const* classOrQualifiedMethodName, - NameAndDesc const& nameAndDesc, - SourceLineInfo const& lineInfo ) { - - getMutableRegistryHub().registerTest - ( makeTestCase - ( testCase, - extractClassName( classOrQualifiedMethodName ), - nameAndDesc.name, - nameAndDesc.description, - lineInfo ) ); - } - void registerTestCaseFunction - ( TestFunction function, - SourceLineInfo const& lineInfo, - NameAndDesc const& nameAndDesc ) { - registerTestCase( new FreeFunctionTestCase( function ), "", nameAndDesc, lineInfo ); - } - - /////////////////////////////////////////////////////////////////////////// - - AutoReg::AutoReg - ( TestFunction function, - SourceLineInfo const& lineInfo, - NameAndDesc const& nameAndDesc ) { - registerTestCaseFunction( function, lineInfo, nameAndDesc ); - } - - AutoReg::~AutoReg() {} - -} // end namespace Catch - -// #included from: catch_reporter_registry.hpp -#define TWOBLUECUBES_CATCH_REPORTER_REGISTRY_HPP_INCLUDED - -#include - -namespace Catch { - - class ReporterRegistry : public IReporterRegistry { - - public: - - virtual ~ReporterRegistry() CATCH_OVERRIDE {} - - virtual IStreamingReporter* create( std::string const& name, Ptr const& config ) const CATCH_OVERRIDE { - FactoryMap::const_iterator it = m_factories.find( name ); - if( it == m_factories.end() ) - return CATCH_NULL; - return it->second->create( ReporterConfig( config ) ); - } - - void registerReporter( std::string const& name, Ptr const& factory ) { - m_factories.insert( std::make_pair( name, factory ) ); - } - void registerListener( Ptr const& factory ) { - m_listeners.push_back( factory ); - } - - virtual FactoryMap const& getFactories() const CATCH_OVERRIDE { - return m_factories; - } - virtual Listeners const& getListeners() const CATCH_OVERRIDE { - return m_listeners; - } - - private: - FactoryMap m_factories; - Listeners m_listeners; - }; -} - -// #included from: catch_exception_translator_registry.hpp -#define TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED - -#ifdef __OBJC__ -#import "Foundation/Foundation.h" -#endif - -namespace Catch { - - class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry { - public: - ~ExceptionTranslatorRegistry() { - deleteAll( m_translators ); - } - - virtual void registerTranslator( const IExceptionTranslator* translator ) { - m_translators.push_back( translator ); - } - - virtual std::string translateActiveException() const { - try { -#ifdef __OBJC__ - // In Objective-C try objective-c exceptions first - @try { - return tryTranslators(); - } - @catch (NSException *exception) { - return Catch::toString( [exception description] ); - } -#else - return tryTranslators(); -#endif - } - catch( TestFailureException& ) { - throw; - } - catch( std::exception& ex ) { - return ex.what(); - } - catch( std::string& msg ) { - return msg; - } - catch( const char* msg ) { - return msg; - } - catch(...) { - return "Unknown exception"; - } - } - - std::string tryTranslators() const { - if( m_translators.empty() ) - throw; - else - return m_translators[0]->translate( m_translators.begin()+1, m_translators.end() ); - } - - private: - std::vector m_translators; - }; -} - -// #included from: catch_tag_alias_registry.h -#define TWOBLUECUBES_CATCH_TAG_ALIAS_REGISTRY_H_INCLUDED - -#include - -namespace Catch { - - class TagAliasRegistry : public ITagAliasRegistry { - public: - virtual ~TagAliasRegistry(); - virtual Option find( std::string const& alias ) const; - virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const; - void add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ); - - private: - std::map m_registry; - }; - -} // end namespace Catch - -namespace Catch { - - namespace { - - class RegistryHub : public IRegistryHub, public IMutableRegistryHub { - - RegistryHub( RegistryHub const& ); - void operator=( RegistryHub const& ); - - public: // IRegistryHub - RegistryHub() { - } - virtual IReporterRegistry const& getReporterRegistry() const CATCH_OVERRIDE { - return m_reporterRegistry; - } - virtual ITestCaseRegistry const& getTestCaseRegistry() const CATCH_OVERRIDE { - return m_testCaseRegistry; - } - virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() CATCH_OVERRIDE { - return m_exceptionTranslatorRegistry; - } - virtual ITagAliasRegistry const& getTagAliasRegistry() const CATCH_OVERRIDE { - return m_tagAliasRegistry; - } - - public: // IMutableRegistryHub - virtual void registerReporter( std::string const& name, Ptr const& factory ) CATCH_OVERRIDE { - m_reporterRegistry.registerReporter( name, factory ); - } - virtual void registerListener( Ptr const& factory ) CATCH_OVERRIDE { - m_reporterRegistry.registerListener( factory ); - } - virtual void registerTest( TestCase const& testInfo ) CATCH_OVERRIDE { - m_testCaseRegistry.registerTest( testInfo ); - } - virtual void registerTranslator( const IExceptionTranslator* translator ) CATCH_OVERRIDE { - m_exceptionTranslatorRegistry.registerTranslator( translator ); - } - virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) CATCH_OVERRIDE { - m_tagAliasRegistry.add( alias, tag, lineInfo ); - } - - private: - TestRegistry m_testCaseRegistry; - ReporterRegistry m_reporterRegistry; - ExceptionTranslatorRegistry m_exceptionTranslatorRegistry; - TagAliasRegistry m_tagAliasRegistry; - }; - - // Single, global, instance - inline RegistryHub*& getTheRegistryHub() { - static RegistryHub* theRegistryHub = CATCH_NULL; - if( !theRegistryHub ) - theRegistryHub = new RegistryHub(); - return theRegistryHub; - } - } - - IRegistryHub& getRegistryHub() { - return *getTheRegistryHub(); - } - IMutableRegistryHub& getMutableRegistryHub() { - return *getTheRegistryHub(); - } - void cleanUp() { - delete getTheRegistryHub(); - getTheRegistryHub() = CATCH_NULL; - cleanUpContext(); - } - std::string translateActiveException() { - return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException(); - } - -} // end namespace Catch - -// #included from: catch_notimplemented_exception.hpp -#define TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_HPP_INCLUDED - -#include - -namespace Catch { - - NotImplementedException::NotImplementedException( SourceLineInfo const& lineInfo ) - : m_lineInfo( lineInfo ) { - std::ostringstream oss; - oss << lineInfo << ": function "; - oss << "not implemented"; - m_what = oss.str(); - } - - const char* NotImplementedException::what() const CATCH_NOEXCEPT { - return m_what.c_str(); - } - -} // end namespace Catch - -// #included from: catch_context_impl.hpp -#define TWOBLUECUBES_CATCH_CONTEXT_IMPL_HPP_INCLUDED - -// #included from: catch_stream.hpp -#define TWOBLUECUBES_CATCH_STREAM_HPP_INCLUDED - -#include -#include -#include - -namespace Catch { - - template - class StreamBufImpl : public StreamBufBase { - char data[bufferSize]; - WriterF m_writer; - - public: - StreamBufImpl() { - setp( data, data + sizeof(data) ); - } - - ~StreamBufImpl() CATCH_NOEXCEPT { - sync(); - } - - private: - int overflow( int c ) { - sync(); - - if( c != EOF ) { - if( pbase() == epptr() ) - m_writer( std::string( 1, static_cast( c ) ) ); - else - sputc( static_cast( c ) ); - } - return 0; - } - - int sync() { - if( pbase() != pptr() ) { - m_writer( std::string( pbase(), static_cast( pptr() - pbase() ) ) ); - setp( pbase(), epptr() ); - } - return 0; - } - }; - - /////////////////////////////////////////////////////////////////////////// - - FileStream::FileStream( std::string const& filename ) { - m_ofs.open( filename.c_str() ); - if( m_ofs.fail() ) { - std::ostringstream oss; - oss << "Unable to open file: '" << filename << '\''; - throw std::domain_error( oss.str() ); - } - } - - std::ostream& FileStream::stream() const { - return m_ofs; - } - - struct OutputDebugWriter { - - void operator()( std::string const&str ) { - writeToDebugConsole( str ); - } - }; - - DebugOutStream::DebugOutStream() - : m_streamBuf( new StreamBufImpl() ), - m_os( m_streamBuf.get() ) - {} - - std::ostream& DebugOutStream::stream() const { - return m_os; - } - - // Store the streambuf from cout up-front because - // cout may get redirected when running tests - CoutStream::CoutStream() - : m_os( Catch::cout().rdbuf() ) - {} - - std::ostream& CoutStream::stream() const { - return m_os; - } - -#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions - std::ostream& cout() { - return std::cout; - } - std::ostream& cerr() { - return std::cerr; - } -#endif -} - -namespace Catch { - - class Context : public IMutableContext { - - Context() : m_config( CATCH_NULL ), m_runner( CATCH_NULL ), m_resultCapture( CATCH_NULL ) {} - Context( Context const& ); - void operator=( Context const& ); - - public: - virtual ~Context() { - deleteAllValues( m_generatorsByTestName ); - } - - public: // IContext - virtual IResultCapture* getResultCapture() { - return m_resultCapture; - } - virtual IRunner* getRunner() { - return m_runner; - } - virtual size_t getGeneratorIndex( std::string const& fileInfo, size_t totalSize ) { - return getGeneratorsForCurrentTest() - .getGeneratorInfo( fileInfo, totalSize ) - .getCurrentIndex(); - } - virtual bool advanceGeneratorsForCurrentTest() { - IGeneratorsForTest* generators = findGeneratorsForCurrentTest(); - return generators && generators->moveNext(); - } - - virtual Ptr getConfig() const { - return m_config; - } - - public: // IMutableContext - virtual void setResultCapture( IResultCapture* resultCapture ) { - m_resultCapture = resultCapture; - } - virtual void setRunner( IRunner* runner ) { - m_runner = runner; - } - virtual void setConfig( Ptr const& config ) { - m_config = config; - } - - friend IMutableContext& getCurrentMutableContext(); - - private: - IGeneratorsForTest* findGeneratorsForCurrentTest() { - std::string testName = getResultCapture()->getCurrentTestName(); - - std::map::const_iterator it = - m_generatorsByTestName.find( testName ); - return it != m_generatorsByTestName.end() - ? it->second - : CATCH_NULL; - } - - IGeneratorsForTest& getGeneratorsForCurrentTest() { - IGeneratorsForTest* generators = findGeneratorsForCurrentTest(); - if( !generators ) { - std::string testName = getResultCapture()->getCurrentTestName(); - generators = createGeneratorsForTest(); - m_generatorsByTestName.insert( std::make_pair( testName, generators ) ); - } - return *generators; - } - - private: - Ptr m_config; - IRunner* m_runner; - IResultCapture* m_resultCapture; - std::map m_generatorsByTestName; - }; - - namespace { - Context* currentContext = CATCH_NULL; - } - IMutableContext& getCurrentMutableContext() { - if( !currentContext ) - currentContext = new Context(); - return *currentContext; - } - IContext& getCurrentContext() { - return getCurrentMutableContext(); - } - - void cleanUpContext() { - delete currentContext; - currentContext = CATCH_NULL; - } -} - -// #included from: catch_console_colour_impl.hpp -#define TWOBLUECUBES_CATCH_CONSOLE_COLOUR_IMPL_HPP_INCLUDED - -// #included from: catch_errno_guard.hpp -#define TWOBLUECUBES_CATCH_ERRNO_GUARD_HPP_INCLUDED - -#include - -namespace Catch { - - class ErrnoGuard { - public: - ErrnoGuard():m_oldErrno(errno){} - ~ErrnoGuard() { errno = m_oldErrno; } - private: - int m_oldErrno; - }; - -} - -namespace Catch { - namespace { - - struct IColourImpl { - virtual ~IColourImpl() {} - virtual void use( Colour::Code _colourCode ) = 0; - }; - - struct NoColourImpl : IColourImpl { - void use( Colour::Code ) {} - - static IColourImpl* instance() { - static NoColourImpl s_instance; - return &s_instance; - } - }; - - } // anon namespace -} // namespace Catch - -#if !defined( CATCH_CONFIG_COLOUR_NONE ) && !defined( CATCH_CONFIG_COLOUR_WINDOWS ) && !defined( CATCH_CONFIG_COLOUR_ANSI ) -# ifdef CATCH_PLATFORM_WINDOWS -# define CATCH_CONFIG_COLOUR_WINDOWS -# else -# define CATCH_CONFIG_COLOUR_ANSI -# endif -#endif - -#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) ///////////////////////////////////////// - -namespace Catch { -namespace { - - class Win32ColourImpl : public IColourImpl { - public: - Win32ColourImpl() : stdoutHandle( GetStdHandle(STD_OUTPUT_HANDLE) ) - { - CONSOLE_SCREEN_BUFFER_INFO csbiInfo; - GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo ); - originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY ); - originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY ); - } - - virtual void use( Colour::Code _colourCode ) { - switch( _colourCode ) { - case Colour::None: return setTextAttribute( originalForegroundAttributes ); - case Colour::White: return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE ); - case Colour::Red: return setTextAttribute( FOREGROUND_RED ); - case Colour::Green: return setTextAttribute( FOREGROUND_GREEN ); - case Colour::Blue: return setTextAttribute( FOREGROUND_BLUE ); - case Colour::Cyan: return setTextAttribute( FOREGROUND_BLUE | FOREGROUND_GREEN ); - case Colour::Yellow: return setTextAttribute( FOREGROUND_RED | FOREGROUND_GREEN ); - case Colour::Grey: return setTextAttribute( 0 ); - - case Colour::LightGrey: return setTextAttribute( FOREGROUND_INTENSITY ); - case Colour::BrightRed: return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED ); - case Colour::BrightGreen: return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN ); - case Colour::BrightWhite: return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE ); - - case Colour::Bright: throw std::logic_error( "not a colour" ); - } - } - - private: - void setTextAttribute( WORD _textAttribute ) { - SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes ); - } - HANDLE stdoutHandle; - WORD originalForegroundAttributes; - WORD originalBackgroundAttributes; - }; - - IColourImpl* platformColourInstance() { - static Win32ColourImpl s_instance; - - Ptr config = getCurrentContext().getConfig(); - UseColour::YesOrNo colourMode = config - ? config->useColour() - : UseColour::Auto; - if( colourMode == UseColour::Auto ) - colourMode = !isDebuggerActive() - ? UseColour::Yes - : UseColour::No; - return colourMode == UseColour::Yes - ? &s_instance - : NoColourImpl::instance(); - } - -} // end anon namespace -} // end namespace Catch - -#elif defined( CATCH_CONFIG_COLOUR_ANSI ) ////////////////////////////////////// - -#include - -namespace Catch { -namespace { - - // use POSIX/ ANSI console terminal codes - // Thanks to Adam Strzelecki for original contribution - // (http://github.com/nanoant) - // https://github.com/philsquared/Catch/pull/131 - class PosixColourImpl : public IColourImpl { - public: - virtual void use( Colour::Code _colourCode ) { - switch( _colourCode ) { - case Colour::None: - case Colour::White: return setColour( "[0m" ); - case Colour::Red: return setColour( "[0;31m" ); - case Colour::Green: return setColour( "[0;32m" ); - case Colour::Blue: return setColour( "[0;34m" ); - case Colour::Cyan: return setColour( "[0;36m" ); - case Colour::Yellow: return setColour( "[0;33m" ); - case Colour::Grey: return setColour( "[1;30m" ); - - case Colour::LightGrey: return setColour( "[0;37m" ); - case Colour::BrightRed: return setColour( "[1;31m" ); - case Colour::BrightGreen: return setColour( "[1;32m" ); - case Colour::BrightWhite: return setColour( "[1;37m" ); - - case Colour::Bright: throw std::logic_error( "not a colour" ); - } - } - static IColourImpl* instance() { - static PosixColourImpl s_instance; - return &s_instance; - } - - private: - void setColour( const char* _escapeCode ) { - Catch::cout() << '\033' << _escapeCode; - } - }; - - IColourImpl* platformColourInstance() { - ErrnoGuard guard; - Ptr config = getCurrentContext().getConfig(); - UseColour::YesOrNo colourMode = config - ? config->useColour() - : UseColour::Auto; - if( colourMode == UseColour::Auto ) - colourMode = (!isDebuggerActive() && isatty(STDOUT_FILENO) ) - ? UseColour::Yes - : UseColour::No; - return colourMode == UseColour::Yes - ? PosixColourImpl::instance() - : NoColourImpl::instance(); - } - -} // end anon namespace -} // end namespace Catch - -#else // not Windows or ANSI /////////////////////////////////////////////// - -namespace Catch { - - static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); } - -} // end namespace Catch - -#endif // Windows/ ANSI/ None - -namespace Catch { - - Colour::Colour( Code _colourCode ) : m_moved( false ) { use( _colourCode ); } - Colour::Colour( Colour const& _other ) : m_moved( false ) { const_cast( _other ).m_moved = true; } - Colour::~Colour(){ if( !m_moved ) use( None ); } - - void Colour::use( Code _colourCode ) { - static IColourImpl* impl = platformColourInstance(); - impl->use( _colourCode ); - } - -} // end namespace Catch - -// #included from: catch_generators_impl.hpp -#define TWOBLUECUBES_CATCH_GENERATORS_IMPL_HPP_INCLUDED - -#include -#include -#include - -namespace Catch { - - struct GeneratorInfo : IGeneratorInfo { - - GeneratorInfo( std::size_t size ) - : m_size( size ), - m_currentIndex( 0 ) - {} - - bool moveNext() { - if( ++m_currentIndex == m_size ) { - m_currentIndex = 0; - return false; - } - return true; - } - - std::size_t getCurrentIndex() const { - return m_currentIndex; - } - - std::size_t m_size; - std::size_t m_currentIndex; - }; - - /////////////////////////////////////////////////////////////////////////// - - class GeneratorsForTest : public IGeneratorsForTest { - - public: - ~GeneratorsForTest() { - deleteAll( m_generatorsInOrder ); - } - - IGeneratorInfo& getGeneratorInfo( std::string const& fileInfo, std::size_t size ) { - std::map::const_iterator it = m_generatorsByName.find( fileInfo ); - if( it == m_generatorsByName.end() ) { - IGeneratorInfo* info = new GeneratorInfo( size ); - m_generatorsByName.insert( std::make_pair( fileInfo, info ) ); - m_generatorsInOrder.push_back( info ); - return *info; - } - return *it->second; - } - - bool moveNext() { - std::vector::const_iterator it = m_generatorsInOrder.begin(); - std::vector::const_iterator itEnd = m_generatorsInOrder.end(); - for(; it != itEnd; ++it ) { - if( (*it)->moveNext() ) - return true; - } - return false; - } - - private: - std::map m_generatorsByName; - std::vector m_generatorsInOrder; - }; - - IGeneratorsForTest* createGeneratorsForTest() - { - return new GeneratorsForTest(); - } - -} // end namespace Catch - -// #included from: catch_assertionresult.hpp -#define TWOBLUECUBES_CATCH_ASSERTIONRESULT_HPP_INCLUDED - -namespace Catch { - - AssertionInfo::AssertionInfo( char const * _macroName, - SourceLineInfo const& _lineInfo, - char const * _capturedExpression, - ResultDisposition::Flags _resultDisposition, - char const * _secondArg) - : macroName( _macroName ), - lineInfo( _lineInfo ), - capturedExpression( _capturedExpression ), - resultDisposition( _resultDisposition ), - secondArg( _secondArg ) - {} - - AssertionResult::AssertionResult() {} - - AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data ) - : m_info( info ), - m_resultData( data ) - {} - - AssertionResult::~AssertionResult() {} - - // Result was a success - bool AssertionResult::succeeded() const { - return Catch::isOk( m_resultData.resultType ); - } - - // Result was a success, or failure is suppressed - bool AssertionResult::isOk() const { - return Catch::isOk( m_resultData.resultType ) || shouldSuppressFailure( m_info.resultDisposition ); - } - - ResultWas::OfType AssertionResult::getResultType() const { - return m_resultData.resultType; - } - - bool AssertionResult::hasExpression() const { - return m_info.capturedExpression[0] != 0; - } - - bool AssertionResult::hasMessage() const { - return !m_resultData.message.empty(); - } - - std::string capturedExpressionWithSecondArgument( char const * capturedExpression, char const * secondArg ) { - return (secondArg[0] == 0 || secondArg[0] == '"' && secondArg[1] == '"') - ? capturedExpression - : std::string(capturedExpression) + ", " + secondArg; - } - - std::string AssertionResult::getExpression() const { - if( isFalseTest( m_info.resultDisposition ) ) - return '!' + capturedExpressionWithSecondArgument(m_info.capturedExpression, m_info.secondArg); - else - return capturedExpressionWithSecondArgument(m_info.capturedExpression, m_info.secondArg); - } - std::string AssertionResult::getExpressionInMacro() const { - if( m_info.macroName[0] == 0 ) - return capturedExpressionWithSecondArgument(m_info.capturedExpression, m_info.secondArg); - else - return std::string(m_info.macroName) + "( " + capturedExpressionWithSecondArgument(m_info.capturedExpression, m_info.secondArg) + " )"; - } - - bool AssertionResult::hasExpandedExpression() const { - return hasExpression() && getExpandedExpression() != getExpression(); - } - - std::string AssertionResult::getExpandedExpression() const { - return m_resultData.reconstructExpression(); - } - - std::string AssertionResult::getMessage() const { - return m_resultData.message; - } - SourceLineInfo AssertionResult::getSourceInfo() const { - return m_info.lineInfo; - } - - std::string AssertionResult::getTestMacroName() const { - return m_info.macroName; - } - - void AssertionResult::discardDecomposedExpression() const { - m_resultData.decomposedExpression = CATCH_NULL; - } - - void AssertionResult::expandDecomposedExpression() const { - m_resultData.reconstructExpression(); - } - -} // end namespace Catch - -// #included from: catch_test_case_info.hpp -#define TWOBLUECUBES_CATCH_TEST_CASE_INFO_HPP_INCLUDED - -#include - -namespace Catch { - - inline TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) { - if( startsWith( tag, '.' ) || - tag == "hide" || - tag == "!hide" ) - return TestCaseInfo::IsHidden; - else if( tag == "!throws" ) - return TestCaseInfo::Throws; - else if( tag == "!shouldfail" ) - return TestCaseInfo::ShouldFail; - else if( tag == "!mayfail" ) - return TestCaseInfo::MayFail; - else if( tag == "!nonportable" ) - return TestCaseInfo::NonPortable; - else - return TestCaseInfo::None; - } - inline bool isReservedTag( std::string const& tag ) { - return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !std::isalnum( tag[0] ); - } - inline void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) { - if( isReservedTag( tag ) ) { - std::ostringstream ss; - ss << Colour(Colour::Red) - << "Tag name [" << tag << "] not allowed.\n" - << "Tag names starting with non alpha-numeric characters are reserved\n" - << Colour(Colour::FileName) - << _lineInfo << '\n'; - throw std::runtime_error(ss.str()); - } - } - - TestCase makeTestCase( ITestCase* _testCase, - std::string const& _className, - std::string const& _name, - std::string const& _descOrTags, - SourceLineInfo const& _lineInfo ) - { - bool isHidden( startsWith( _name, "./" ) ); // Legacy support - - // Parse out tags - std::set tags; - std::string desc, tag; - bool inTag = false; - for( std::size_t i = 0; i < _descOrTags.size(); ++i ) { - char c = _descOrTags[i]; - if( !inTag ) { - if( c == '[' ) - inTag = true; - else - desc += c; - } - else { - if( c == ']' ) { - TestCaseInfo::SpecialProperties prop = parseSpecialTag( tag ); - if( prop == TestCaseInfo::IsHidden ) - isHidden = true; - else if( prop == TestCaseInfo::None ) - enforceNotReservedTag( tag, _lineInfo ); - - tags.insert( tag ); - tag.clear(); - inTag = false; - } - else - tag += c; - } - } - if( isHidden ) { - tags.insert( "hide" ); - tags.insert( "." ); - } - - TestCaseInfo info( _name, _className, desc, tags, _lineInfo ); - return TestCase( _testCase, info ); - } - - void setTags( TestCaseInfo& testCaseInfo, std::set const& tags ) - { - testCaseInfo.tags = tags; - testCaseInfo.lcaseTags.clear(); - - std::ostringstream oss; - for( std::set::const_iterator it = tags.begin(), itEnd = tags.end(); it != itEnd; ++it ) { - oss << '[' << *it << ']'; - std::string lcaseTag = toLower( *it ); - testCaseInfo.properties = static_cast( testCaseInfo.properties | parseSpecialTag( lcaseTag ) ); - testCaseInfo.lcaseTags.insert( lcaseTag ); - } - testCaseInfo.tagsAsString = oss.str(); - } - - TestCaseInfo::TestCaseInfo( std::string const& _name, - std::string const& _className, - std::string const& _description, - std::set const& _tags, - SourceLineInfo const& _lineInfo ) - : name( _name ), - className( _className ), - description( _description ), - lineInfo( _lineInfo ), - properties( None ) - { - setTags( *this, _tags ); - } - - TestCaseInfo::TestCaseInfo( TestCaseInfo const& other ) - : name( other.name ), - className( other.className ), - description( other.description ), - tags( other.tags ), - lcaseTags( other.lcaseTags ), - tagsAsString( other.tagsAsString ), - lineInfo( other.lineInfo ), - properties( other.properties ) - {} - - bool TestCaseInfo::isHidden() const { - return ( properties & IsHidden ) != 0; - } - bool TestCaseInfo::throws() const { - return ( properties & Throws ) != 0; - } - bool TestCaseInfo::okToFail() const { - return ( properties & (ShouldFail | MayFail ) ) != 0; - } - bool TestCaseInfo::expectedToFail() const { - return ( properties & (ShouldFail ) ) != 0; - } - - TestCase::TestCase( ITestCase* testCase, TestCaseInfo const& info ) : TestCaseInfo( info ), test( testCase ) {} - - TestCase::TestCase( TestCase const& other ) - : TestCaseInfo( other ), - test( other.test ) - {} - - TestCase TestCase::withName( std::string const& _newName ) const { - TestCase other( *this ); - other.name = _newName; - return other; - } - - void TestCase::swap( TestCase& other ) { - test.swap( other.test ); - name.swap( other.name ); - className.swap( other.className ); - description.swap( other.description ); - tags.swap( other.tags ); - lcaseTags.swap( other.lcaseTags ); - tagsAsString.swap( other.tagsAsString ); - std::swap( TestCaseInfo::properties, static_cast( other ).properties ); - std::swap( lineInfo, other.lineInfo ); - } - - void TestCase::invoke() const { - test->invoke(); - } - - bool TestCase::operator == ( TestCase const& other ) const { - return test.get() == other.test.get() && - name == other.name && - className == other.className; - } - - bool TestCase::operator < ( TestCase const& other ) const { - return name < other.name; - } - TestCase& TestCase::operator = ( TestCase const& other ) { - TestCase temp( other ); - swap( temp ); - return *this; - } - - TestCaseInfo const& TestCase::getTestCaseInfo() const - { - return *this; - } - -} // end namespace Catch - -// #included from: catch_version.hpp -#define TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED - -namespace Catch { - - Version::Version - ( unsigned int _majorVersion, - unsigned int _minorVersion, - unsigned int _patchNumber, - char const * const _branchName, - unsigned int _buildNumber ) - : majorVersion( _majorVersion ), - minorVersion( _minorVersion ), - patchNumber( _patchNumber ), - branchName( _branchName ), - buildNumber( _buildNumber ) - {} - - std::ostream& operator << ( std::ostream& os, Version const& version ) { - os << version.majorVersion << '.' - << version.minorVersion << '.' - << version.patchNumber; - // branchName is never null -> 0th char is \0 if it is empty - if (version.branchName[0]) { - os << '-' << version.branchName - << '.' << version.buildNumber; - } - return os; - } - - inline Version libraryVersion() { - static Version version( 1, 9, 6, "", 0 ); - return version; - } - -} - -// #included from: catch_message.hpp -#define TWOBLUECUBES_CATCH_MESSAGE_HPP_INCLUDED - -namespace Catch { - - MessageInfo::MessageInfo( std::string const& _macroName, - SourceLineInfo const& _lineInfo, - ResultWas::OfType _type ) - : macroName( _macroName ), - lineInfo( _lineInfo ), - type( _type ), - sequence( ++globalCount ) - {} - - // This may need protecting if threading support is added - unsigned int MessageInfo::globalCount = 0; - - //////////////////////////////////////////////////////////////////////////// - - ScopedMessage::ScopedMessage( MessageBuilder const& builder ) - : m_info( builder.m_info ) - { - m_info.message = builder.m_stream.str(); - getResultCapture().pushScopedMessage( m_info ); - } - ScopedMessage::ScopedMessage( ScopedMessage const& other ) - : m_info( other.m_info ) - {} - - ScopedMessage::~ScopedMessage() { - if ( !std::uncaught_exception() ){ - getResultCapture().popScopedMessage(m_info); - } - } - -} // end namespace Catch - -// #included from: catch_legacy_reporter_adapter.hpp -#define TWOBLUECUBES_CATCH_LEGACY_REPORTER_ADAPTER_HPP_INCLUDED - -// #included from: catch_legacy_reporter_adapter.h -#define TWOBLUECUBES_CATCH_LEGACY_REPORTER_ADAPTER_H_INCLUDED - -namespace Catch -{ - // Deprecated - struct IReporter : IShared { - virtual ~IReporter(); - - virtual bool shouldRedirectStdout() const = 0; - - virtual void StartTesting() = 0; - virtual void EndTesting( Totals const& totals ) = 0; - virtual void StartGroup( std::string const& groupName ) = 0; - virtual void EndGroup( std::string const& groupName, Totals const& totals ) = 0; - virtual void StartTestCase( TestCaseInfo const& testInfo ) = 0; - virtual void EndTestCase( TestCaseInfo const& testInfo, Totals const& totals, std::string const& stdOut, std::string const& stdErr ) = 0; - virtual void StartSection( std::string const& sectionName, std::string const& description ) = 0; - virtual void EndSection( std::string const& sectionName, Counts const& assertions ) = 0; - virtual void NoAssertionsInSection( std::string const& sectionName ) = 0; - virtual void NoAssertionsInTestCase( std::string const& testName ) = 0; - virtual void Aborted() = 0; - virtual void Result( AssertionResult const& result ) = 0; - }; - - class LegacyReporterAdapter : public SharedImpl - { - public: - LegacyReporterAdapter( Ptr const& legacyReporter ); - virtual ~LegacyReporterAdapter(); - - virtual ReporterPreferences getPreferences() const; - virtual void noMatchingTestCases( std::string const& ); - virtual void testRunStarting( TestRunInfo const& ); - virtual void testGroupStarting( GroupInfo const& groupInfo ); - virtual void testCaseStarting( TestCaseInfo const& testInfo ); - virtual void sectionStarting( SectionInfo const& sectionInfo ); - virtual void assertionStarting( AssertionInfo const& ); - virtual bool assertionEnded( AssertionStats const& assertionStats ); - virtual void sectionEnded( SectionStats const& sectionStats ); - virtual void testCaseEnded( TestCaseStats const& testCaseStats ); - virtual void testGroupEnded( TestGroupStats const& testGroupStats ); - virtual void testRunEnded( TestRunStats const& testRunStats ); - virtual void skipTest( TestCaseInfo const& ); - - private: - Ptr m_legacyReporter; - }; -} - -namespace Catch -{ - LegacyReporterAdapter::LegacyReporterAdapter( Ptr const& legacyReporter ) - : m_legacyReporter( legacyReporter ) - {} - LegacyReporterAdapter::~LegacyReporterAdapter() {} - - ReporterPreferences LegacyReporterAdapter::getPreferences() const { - ReporterPreferences prefs; - prefs.shouldRedirectStdOut = m_legacyReporter->shouldRedirectStdout(); - return prefs; - } - - void LegacyReporterAdapter::noMatchingTestCases( std::string const& ) {} - void LegacyReporterAdapter::testRunStarting( TestRunInfo const& ) { - m_legacyReporter->StartTesting(); - } - void LegacyReporterAdapter::testGroupStarting( GroupInfo const& groupInfo ) { - m_legacyReporter->StartGroup( groupInfo.name ); - } - void LegacyReporterAdapter::testCaseStarting( TestCaseInfo const& testInfo ) { - m_legacyReporter->StartTestCase( testInfo ); - } - void LegacyReporterAdapter::sectionStarting( SectionInfo const& sectionInfo ) { - m_legacyReporter->StartSection( sectionInfo.name, sectionInfo.description ); - } - void LegacyReporterAdapter::assertionStarting( AssertionInfo const& ) { - // Not on legacy interface - } - - bool LegacyReporterAdapter::assertionEnded( AssertionStats const& assertionStats ) { - if( assertionStats.assertionResult.getResultType() != ResultWas::Ok ) { - for( std::vector::const_iterator it = assertionStats.infoMessages.begin(), itEnd = assertionStats.infoMessages.end(); - it != itEnd; - ++it ) { - if( it->type == ResultWas::Info ) { - ResultBuilder rb( it->macroName.c_str(), it->lineInfo, "", ResultDisposition::Normal ); - rb << it->message; - rb.setResultType( ResultWas::Info ); - AssertionResult result = rb.build(); - m_legacyReporter->Result( result ); - } - } - } - m_legacyReporter->Result( assertionStats.assertionResult ); - return true; - } - void LegacyReporterAdapter::sectionEnded( SectionStats const& sectionStats ) { - if( sectionStats.missingAssertions ) - m_legacyReporter->NoAssertionsInSection( sectionStats.sectionInfo.name ); - m_legacyReporter->EndSection( sectionStats.sectionInfo.name, sectionStats.assertions ); - } - void LegacyReporterAdapter::testCaseEnded( TestCaseStats const& testCaseStats ) { - m_legacyReporter->EndTestCase - ( testCaseStats.testInfo, - testCaseStats.totals, - testCaseStats.stdOut, - testCaseStats.stdErr ); - } - void LegacyReporterAdapter::testGroupEnded( TestGroupStats const& testGroupStats ) { - if( testGroupStats.aborting ) - m_legacyReporter->Aborted(); - m_legacyReporter->EndGroup( testGroupStats.groupInfo.name, testGroupStats.totals ); - } - void LegacyReporterAdapter::testRunEnded( TestRunStats const& testRunStats ) { - m_legacyReporter->EndTesting( testRunStats.totals ); - } - void LegacyReporterAdapter::skipTest( TestCaseInfo const& ) { - } -} - -// #included from: catch_timer.hpp - -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wc++11-long-long" -#endif - -#ifdef CATCH_PLATFORM_WINDOWS - -#else - -#include - -#endif - -namespace Catch { - - namespace { -#ifdef CATCH_PLATFORM_WINDOWS - UInt64 getCurrentTicks() { - static UInt64 hz=0, hzo=0; - if (!hz) { - QueryPerformanceFrequency( reinterpret_cast( &hz ) ); - QueryPerformanceCounter( reinterpret_cast( &hzo ) ); - } - UInt64 t; - QueryPerformanceCounter( reinterpret_cast( &t ) ); - return ((t-hzo)*1000000)/hz; - } -#else - UInt64 getCurrentTicks() { - timeval t; - gettimeofday(&t,CATCH_NULL); - return static_cast( t.tv_sec ) * 1000000ull + static_cast( t.tv_usec ); - } -#endif - } - - void Timer::start() { - m_ticks = getCurrentTicks(); - } - unsigned int Timer::getElapsedMicroseconds() const { - return static_cast(getCurrentTicks() - m_ticks); - } - unsigned int Timer::getElapsedMilliseconds() const { - return static_cast(getElapsedMicroseconds()/1000); - } - double Timer::getElapsedSeconds() const { - return getElapsedMicroseconds()/1000000.0; - } - -} // namespace Catch - -#ifdef __clang__ -#pragma clang diagnostic pop -#endif -// #included from: catch_common.hpp -#define TWOBLUECUBES_CATCH_COMMON_HPP_INCLUDED - -#include -#include - -namespace Catch { - - bool startsWith( std::string const& s, std::string const& prefix ) { - return s.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), s.begin()); - } - bool startsWith( std::string const& s, char prefix ) { - return !s.empty() && s[0] == prefix; - } - bool endsWith( std::string const& s, std::string const& suffix ) { - return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin()); - } - bool endsWith( std::string const& s, char suffix ) { - return !s.empty() && s[s.size()-1] == suffix; - } - bool contains( std::string const& s, std::string const& infix ) { - return s.find( infix ) != std::string::npos; - } - char toLowerCh(char c) { - return static_cast( std::tolower( c ) ); - } - void toLowerInPlace( std::string& s ) { - std::transform( s.begin(), s.end(), s.begin(), toLowerCh ); - } - std::string toLower( std::string const& s ) { - std::string lc = s; - toLowerInPlace( lc ); - return lc; - } - std::string trim( std::string const& str ) { - static char const* whitespaceChars = "\n\r\t "; - std::string::size_type start = str.find_first_not_of( whitespaceChars ); - std::string::size_type end = str.find_last_not_of( whitespaceChars ); - - return start != std::string::npos ? str.substr( start, 1+end-start ) : std::string(); - } - - bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) { - bool replaced = false; - std::size_t i = str.find( replaceThis ); - while( i != std::string::npos ) { - replaced = true; - str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() ); - if( i < str.size()-withThis.size() ) - i = str.find( replaceThis, i+withThis.size() ); - else - i = std::string::npos; - } - return replaced; - } - - pluralise::pluralise( std::size_t count, std::string const& label ) - : m_count( count ), - m_label( label ) - {} - - std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) { - os << pluraliser.m_count << ' ' << pluraliser.m_label; - if( pluraliser.m_count != 1 ) - os << 's'; - return os; - } - - SourceLineInfo::SourceLineInfo() : file(""), line( 0 ){} - SourceLineInfo::SourceLineInfo( char const* _file, std::size_t _line ) - : file( _file ), - line( _line ) - {} - bool SourceLineInfo::empty() const { - return file[0] == '\0'; - } - bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const { - return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0); - } - bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const { - return line < other.line || ( line == other.line && (std::strcmp(file, other.file) < 0)); - } - - void seedRng( IConfig const& config ) { - if( config.rngSeed() != 0 ) - std::srand( config.rngSeed() ); - } - unsigned int rngSeed() { - return getCurrentContext().getConfig()->rngSeed(); - } - - std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) { -#ifndef __GNUG__ - os << info.file << '(' << info.line << ')'; -#else - os << info.file << ':' << info.line; -#endif - return os; - } - - void throwLogicError( std::string const& message, SourceLineInfo const& locationInfo ) { - std::ostringstream oss; - oss << locationInfo << ": Internal Catch error: '" << message << '\''; - if( alwaysTrue() ) - throw std::logic_error( oss.str() ); - } -} - -// #included from: catch_section.hpp -#define TWOBLUECUBES_CATCH_SECTION_HPP_INCLUDED - -namespace Catch { - - SectionInfo::SectionInfo - ( SourceLineInfo const& _lineInfo, - std::string const& _name, - std::string const& _description ) - : name( _name ), - description( _description ), - lineInfo( _lineInfo ) - {} - - Section::Section( SectionInfo const& info ) - : m_info( info ), - m_sectionIncluded( getResultCapture().sectionStarted( m_info, m_assertions ) ) - { - m_timer.start(); - } - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4996) // std::uncaught_exception is deprecated in C++17 -#endif - Section::~Section() { - if( m_sectionIncluded ) { - SectionEndInfo endInfo( m_info, m_assertions, m_timer.getElapsedSeconds() ); - if( std::uncaught_exception() ) - getResultCapture().sectionEndedEarly( endInfo ); - else - getResultCapture().sectionEnded( endInfo ); - } - } -#if defined(_MSC_VER) -#pragma warning(pop) -#endif - - // This indicates whether the section should be executed or not - Section::operator bool() const { - return m_sectionIncluded; - } - -} // end namespace Catch - -// #included from: catch_debugger.hpp -#define TWOBLUECUBES_CATCH_DEBUGGER_HPP_INCLUDED - -#ifdef CATCH_PLATFORM_MAC - - #include - #include - #include - #include - #include - - namespace Catch{ - - // The following function is taken directly from the following technical note: - // http://developer.apple.com/library/mac/#qa/qa2004/qa1361.html - - // Returns true if the current process is being debugged (either - // running under the debugger or has a debugger attached post facto). - bool isDebuggerActive(){ - - int mib[4]; - struct kinfo_proc info; - size_t size; - - // Initialize the flags so that, if sysctl fails for some bizarre - // reason, we get a predictable result. - - info.kp_proc.p_flag = 0; - - // Initialize mib, which tells sysctl the info we want, in this case - // we're looking for information about a specific process ID. - - mib[0] = CTL_KERN; - mib[1] = KERN_PROC; - mib[2] = KERN_PROC_PID; - mib[3] = getpid(); - - // Call sysctl. - - size = sizeof(info); - if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, CATCH_NULL, 0) != 0 ) { - Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" << std::endl; - return false; - } - - // We're being debugged if the P_TRACED flag is set. - - return ( (info.kp_proc.p_flag & P_TRACED) != 0 ); - } - } // namespace Catch - -#elif defined(CATCH_PLATFORM_LINUX) - #include - #include - - namespace Catch{ - // The standard POSIX way of detecting a debugger is to attempt to - // ptrace() the process, but this needs to be done from a child and not - // this process itself to still allow attaching to this process later - // if wanted, so is rather heavy. Under Linux we have the PID of the - // "debugger" (which doesn't need to be gdb, of course, it could also - // be strace, for example) in /proc/$PID/status, so just get it from - // there instead. - bool isDebuggerActive(){ - // Libstdc++ has a bug, where std::ifstream sets errno to 0 - // This way our users can properly assert over errno values - ErrnoGuard guard; - std::ifstream in("/proc/self/status"); - for( std::string line; std::getline(in, line); ) { - static const int PREFIX_LEN = 11; - if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) { - // We're traced if the PID is not 0 and no other PID starts - // with 0 digit, so it's enough to check for just a single - // character. - return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0'; - } - } - - return false; - } - } // namespace Catch -#elif defined(_MSC_VER) - extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent(); - namespace Catch { - bool isDebuggerActive() { - return IsDebuggerPresent() != 0; - } - } -#elif defined(__MINGW32__) - extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent(); - namespace Catch { - bool isDebuggerActive() { - return IsDebuggerPresent() != 0; - } - } -#else - namespace Catch { - inline bool isDebuggerActive() { return false; } - } -#endif // Platform - -#ifdef CATCH_PLATFORM_WINDOWS - - namespace Catch { - void writeToDebugConsole( std::string const& text ) { - ::OutputDebugStringA( text.c_str() ); - } - } -#else - namespace Catch { - void writeToDebugConsole( std::string const& text ) { - // !TBD: Need a version for Mac/ XCode and other IDEs - Catch::cout() << text; - } - } -#endif // Platform - -// #included from: catch_tostring.hpp -#define TWOBLUECUBES_CATCH_TOSTRING_HPP_INCLUDED - -namespace Catch { - -namespace Detail { - - const std::string unprintableString = "{?}"; - - namespace { - const int hexThreshold = 255; - - struct Endianness { - enum Arch { Big, Little }; - - static Arch which() { - union _{ - int asInt; - char asChar[sizeof (int)]; - } u; - - u.asInt = 1; - return ( u.asChar[sizeof(int)-1] == 1 ) ? Big : Little; - } - }; - } - - std::string rawMemoryToString( const void *object, std::size_t size ) - { - // Reverse order for little endian architectures - int i = 0, end = static_cast( size ), inc = 1; - if( Endianness::which() == Endianness::Little ) { - i = end-1; - end = inc = -1; - } - - unsigned char const *bytes = static_cast(object); - std::ostringstream os; - os << "0x" << std::setfill('0') << std::hex; - for( ; i != end; i += inc ) - os << std::setw(2) << static_cast(bytes[i]); - return os.str(); - } -} - -std::string toString( std::string const& value ) { - std::string s = value; - if( getCurrentContext().getConfig()->showInvisibles() ) { - for(size_t i = 0; i < s.size(); ++i ) { - std::string subs; - switch( s[i] ) { - case '\n': subs = "\\n"; break; - case '\t': subs = "\\t"; break; - default: break; - } - if( !subs.empty() ) { - s = s.substr( 0, i ) + subs + s.substr( i+1 ); - ++i; - } - } - } - return '"' + s + '"'; -} -std::string toString( std::wstring const& value ) { - - std::string s; - s.reserve( value.size() ); - for(size_t i = 0; i < value.size(); ++i ) - s += value[i] <= 0xff ? static_cast( value[i] ) : '?'; - return Catch::toString( s ); -} - -std::string toString( const char* const value ) { - return value ? Catch::toString( std::string( value ) ) : std::string( "{null string}" ); -} - -std::string toString( char* const value ) { - return Catch::toString( static_cast( value ) ); -} - -std::string toString( const wchar_t* const value ) -{ - return value ? Catch::toString( std::wstring(value) ) : std::string( "{null string}" ); -} - -std::string toString( wchar_t* const value ) -{ - return Catch::toString( static_cast( value ) ); -} - -std::string toString( int value ) { - std::ostringstream oss; - oss << value; - if( value > Detail::hexThreshold ) - oss << " (0x" << std::hex << value << ')'; - return oss.str(); -} - -std::string toString( unsigned long value ) { - std::ostringstream oss; - oss << value; - if( value > Detail::hexThreshold ) - oss << " (0x" << std::hex << value << ')'; - return oss.str(); -} - -std::string toString( unsigned int value ) { - return Catch::toString( static_cast( value ) ); -} - -template -std::string fpToString( T value, int precision ) { - std::ostringstream oss; - oss << std::setprecision( precision ) - << std::fixed - << value; - std::string d = oss.str(); - std::size_t i = d.find_last_not_of( '0' ); - if( i != std::string::npos && i != d.size()-1 ) { - if( d[i] == '.' ) - i++; - d = d.substr( 0, i+1 ); - } - return d; -} - -std::string toString( const double value ) { - return fpToString( value, 10 ); -} -std::string toString( const float value ) { - return fpToString( value, 5 ) + 'f'; -} - -std::string toString( bool value ) { - return value ? "true" : "false"; -} - -std::string toString( char value ) { - if ( value == '\r' ) - return "'\\r'"; - if ( value == '\f' ) - return "'\\f'"; - if ( value == '\n' ) - return "'\\n'"; - if ( value == '\t' ) - return "'\\t'"; - if ( '\0' <= value && value < ' ' ) - return toString( static_cast( value ) ); - char chstr[] = "' '"; - chstr[1] = value; - return chstr; -} - -std::string toString( signed char value ) { - return toString( static_cast( value ) ); -} - -std::string toString( unsigned char value ) { - return toString( static_cast( value ) ); -} - -#ifdef CATCH_CONFIG_CPP11_LONG_LONG -std::string toString( long long value ) { - std::ostringstream oss; - oss << value; - if( value > Detail::hexThreshold ) - oss << " (0x" << std::hex << value << ')'; - return oss.str(); -} -std::string toString( unsigned long long value ) { - std::ostringstream oss; - oss << value; - if( value > Detail::hexThreshold ) - oss << " (0x" << std::hex << value << ')'; - return oss.str(); -} -#endif - -#ifdef CATCH_CONFIG_CPP11_NULLPTR -std::string toString( std::nullptr_t ) { - return "nullptr"; -} -#endif - -#ifdef __OBJC__ - std::string toString( NSString const * const& nsstring ) { - if( !nsstring ) - return "nil"; - return "@" + toString([nsstring UTF8String]); - } - std::string toString( NSString * CATCH_ARC_STRONG & nsstring ) { - if( !nsstring ) - return "nil"; - return "@" + toString([nsstring UTF8String]); - } - std::string toString( NSObject* const& nsObject ) { - return toString( [nsObject description] ); - } -#endif - -} // end namespace Catch - -// #included from: catch_result_builder.hpp -#define TWOBLUECUBES_CATCH_RESULT_BUILDER_HPP_INCLUDED - -namespace Catch { - - ResultBuilder::ResultBuilder( char const* macroName, - SourceLineInfo const& lineInfo, - char const* capturedExpression, - ResultDisposition::Flags resultDisposition, - char const* secondArg ) - : m_assertionInfo( macroName, lineInfo, capturedExpression, resultDisposition, secondArg ), - m_shouldDebugBreak( false ), - m_shouldThrow( false ), - m_guardException( false ) - { - m_stream().oss.str(""); - } - - ResultBuilder::~ResultBuilder() { -#if defined(CATCH_CONFIG_FAST_COMPILE) - if ( m_guardException ) { - m_stream().oss << "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE"; - captureResult( ResultWas::ThrewException ); - getCurrentContext().getResultCapture()->exceptionEarlyReported(); - } -#endif - } - - ResultBuilder& ResultBuilder::setResultType( ResultWas::OfType result ) { - m_data.resultType = result; - return *this; - } - ResultBuilder& ResultBuilder::setResultType( bool result ) { - m_data.resultType = result ? ResultWas::Ok : ResultWas::ExpressionFailed; - return *this; - } - - void ResultBuilder::endExpression( DecomposedExpression const& expr ) { - AssertionResult result = build( expr ); - handleResult( result ); - } - - void ResultBuilder::useActiveException( ResultDisposition::Flags resultDisposition ) { - m_assertionInfo.resultDisposition = resultDisposition; - m_stream().oss << Catch::translateActiveException(); - captureResult( ResultWas::ThrewException ); - } - - void ResultBuilder::captureResult( ResultWas::OfType resultType ) { - setResultType( resultType ); - captureExpression(); - } - - void ResultBuilder::captureExpectedException( std::string const& expectedMessage ) { - if( expectedMessage.empty() ) - captureExpectedException( Matchers::Impl::MatchAllOf() ); - else - captureExpectedException( Matchers::Equals( expectedMessage ) ); - } - - void ResultBuilder::captureExpectedException( Matchers::Impl::MatcherBase const& matcher ) { - - assert( !isFalseTest( m_assertionInfo.resultDisposition ) ); - AssertionResultData data = m_data; - data.resultType = ResultWas::Ok; - data.reconstructedExpression = capturedExpressionWithSecondArgument(m_assertionInfo.capturedExpression, m_assertionInfo.secondArg); - - std::string actualMessage = Catch::translateActiveException(); - if( !matcher.match( actualMessage ) ) { - data.resultType = ResultWas::ExpressionFailed; - data.reconstructedExpression = actualMessage; - } - AssertionResult result( m_assertionInfo, data ); - handleResult( result ); - } - - void ResultBuilder::captureExpression() { - AssertionResult result = build(); - handleResult( result ); - } - - void ResultBuilder::handleResult( AssertionResult const& result ) - { - getResultCapture().assertionEnded( result ); - - if( !result.isOk() ) { - if( getCurrentContext().getConfig()->shouldDebugBreak() ) - m_shouldDebugBreak = true; - if( getCurrentContext().getRunner()->aborting() || (m_assertionInfo.resultDisposition & ResultDisposition::Normal) ) - m_shouldThrow = true; - } - } - - void ResultBuilder::react() { -#if defined(CATCH_CONFIG_FAST_COMPILE) - if (m_shouldDebugBreak) { - /////////////////////////////////////////////////////////////////// - // To inspect the state during test, you need to go one level up the callstack - // To go back to the test and change execution, jump over the throw statement - /////////////////////////////////////////////////////////////////// - CATCH_BREAK_INTO_DEBUGGER(); - } -#endif - if( m_shouldThrow ) - throw Catch::TestFailureException(); - } - - bool ResultBuilder::shouldDebugBreak() const { return m_shouldDebugBreak; } - bool ResultBuilder::allowThrows() const { return getCurrentContext().getConfig()->allowThrows(); } - - AssertionResult ResultBuilder::build() const - { - return build( *this ); - } - - // CAVEAT: The returned AssertionResult stores a pointer to the argument expr, - // a temporary DecomposedExpression, which in turn holds references to - // operands, possibly temporary as well. - // It should immediately be passed to handleResult; if the expression - // needs to be reported, its string expansion must be composed before - // the temporaries are destroyed. - AssertionResult ResultBuilder::build( DecomposedExpression const& expr ) const - { - assert( m_data.resultType != ResultWas::Unknown ); - AssertionResultData data = m_data; - - // Flip bool results if FalseTest flag is set - if( isFalseTest( m_assertionInfo.resultDisposition ) ) { - data.negate( expr.isBinaryExpression() ); - } - - data.message = m_stream().oss.str(); - data.decomposedExpression = &expr; // for lazy reconstruction - return AssertionResult( m_assertionInfo, data ); - } - - void ResultBuilder::reconstructExpression( std::string& dest ) const { - dest = capturedExpressionWithSecondArgument(m_assertionInfo.capturedExpression, m_assertionInfo.secondArg); - } - - void ResultBuilder::setExceptionGuard() { - m_guardException = true; - } - void ResultBuilder::unsetExceptionGuard() { - m_guardException = false; - } - -} // end namespace Catch - -// #included from: catch_tag_alias_registry.hpp -#define TWOBLUECUBES_CATCH_TAG_ALIAS_REGISTRY_HPP_INCLUDED - -namespace Catch { - - TagAliasRegistry::~TagAliasRegistry() {} - - Option TagAliasRegistry::find( std::string const& alias ) const { - std::map::const_iterator it = m_registry.find( alias ); - if( it != m_registry.end() ) - return it->second; - else - return Option(); - } - - std::string TagAliasRegistry::expandAliases( std::string const& unexpandedTestSpec ) const { - std::string expandedTestSpec = unexpandedTestSpec; - for( std::map::const_iterator it = m_registry.begin(), itEnd = m_registry.end(); - it != itEnd; - ++it ) { - std::size_t pos = expandedTestSpec.find( it->first ); - if( pos != std::string::npos ) { - expandedTestSpec = expandedTestSpec.substr( 0, pos ) + - it->second.tag + - expandedTestSpec.substr( pos + it->first.size() ); - } - } - return expandedTestSpec; - } - - void TagAliasRegistry::add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) { - - if( !startsWith( alias, "[@" ) || !endsWith( alias, ']' ) ) { - std::ostringstream oss; - oss << Colour( Colour::Red ) - << "error: tag alias, \"" << alias << "\" is not of the form [@alias name].\n" - << Colour( Colour::FileName ) - << lineInfo << '\n'; - throw std::domain_error( oss.str().c_str() ); - } - if( !m_registry.insert( std::make_pair( alias, TagAlias( tag, lineInfo ) ) ).second ) { - std::ostringstream oss; - oss << Colour( Colour::Red ) - << "error: tag alias, \"" << alias << "\" already registered.\n" - << "\tFirst seen at " - << Colour( Colour::Red ) << find(alias)->lineInfo << '\n' - << Colour( Colour::Red ) << "\tRedefined at " - << Colour( Colour::FileName) << lineInfo << '\n'; - throw std::domain_error( oss.str().c_str() ); - } - } - - ITagAliasRegistry::~ITagAliasRegistry() {} - - ITagAliasRegistry const& ITagAliasRegistry::get() { - return getRegistryHub().getTagAliasRegistry(); - } - - RegistrarForTagAliases::RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo ) { - getMutableRegistryHub().registerTagAlias( alias, tag, lineInfo ); - } - -} // end namespace Catch - -// #included from: catch_matchers_string.hpp - -namespace Catch { -namespace Matchers { - - namespace StdString { - - CasedString::CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity ) - : m_caseSensitivity( caseSensitivity ), - m_str( adjustString( str ) ) - {} - std::string CasedString::adjustString( std::string const& str ) const { - return m_caseSensitivity == CaseSensitive::No - ? toLower( str ) - : str; - } - std::string CasedString::caseSensitivitySuffix() const { - return m_caseSensitivity == CaseSensitive::No - ? " (case insensitive)" - : std::string(); - } - - StringMatcherBase::StringMatcherBase( std::string const& operation, CasedString const& comparator ) - : m_comparator( comparator ), - m_operation( operation ) { - } - - std::string StringMatcherBase::describe() const { - std::string description; - description.reserve(5 + m_operation.size() + m_comparator.m_str.size() + - m_comparator.caseSensitivitySuffix().size()); - description += m_operation; - description += ": \""; - description += m_comparator.m_str; - description += "\""; - description += m_comparator.caseSensitivitySuffix(); - return description; - } - - EqualsMatcher::EqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals", comparator ) {} - - bool EqualsMatcher::match( std::string const& source ) const { - return m_comparator.adjustString( source ) == m_comparator.m_str; - } - - ContainsMatcher::ContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains", comparator ) {} - - bool ContainsMatcher::match( std::string const& source ) const { - return contains( m_comparator.adjustString( source ), m_comparator.m_str ); - } - - StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with", comparator ) {} - - bool StartsWithMatcher::match( std::string const& source ) const { - return startsWith( m_comparator.adjustString( source ), m_comparator.m_str ); - } - - EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with", comparator ) {} - - bool EndsWithMatcher::match( std::string const& source ) const { - return endsWith( m_comparator.adjustString( source ), m_comparator.m_str ); - } - - } // namespace StdString - - StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity ) { - return StdString::EqualsMatcher( StdString::CasedString( str, caseSensitivity) ); - } - StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity ) { - return StdString::ContainsMatcher( StdString::CasedString( str, caseSensitivity) ); - } - StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) { - return StdString::EndsWithMatcher( StdString::CasedString( str, caseSensitivity) ); - } - StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) { - return StdString::StartsWithMatcher( StdString::CasedString( str, caseSensitivity) ); - } - -} // namespace Matchers -} // namespace Catch -// #included from: ../reporters/catch_reporter_multi.hpp -#define TWOBLUECUBES_CATCH_REPORTER_MULTI_HPP_INCLUDED - -namespace Catch { - -class MultipleReporters : public SharedImpl { - typedef std::vector > Reporters; - Reporters m_reporters; - -public: - void add( Ptr const& reporter ) { - m_reporters.push_back( reporter ); - } - -public: // IStreamingReporter - - virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE { - return m_reporters[0]->getPreferences(); - } - - virtual void noMatchingTestCases( std::string const& spec ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->noMatchingTestCases( spec ); - } - - virtual void testRunStarting( TestRunInfo const& testRunInfo ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->testRunStarting( testRunInfo ); - } - - virtual void testGroupStarting( GroupInfo const& groupInfo ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->testGroupStarting( groupInfo ); - } - - virtual void testCaseStarting( TestCaseInfo const& testInfo ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->testCaseStarting( testInfo ); - } - - virtual void sectionStarting( SectionInfo const& sectionInfo ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->sectionStarting( sectionInfo ); - } - - virtual void assertionStarting( AssertionInfo const& assertionInfo ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->assertionStarting( assertionInfo ); - } - - // The return value indicates if the messages buffer should be cleared: - virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE { - bool clearBuffer = false; - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - clearBuffer |= (*it)->assertionEnded( assertionStats ); - return clearBuffer; - } - - virtual void sectionEnded( SectionStats const& sectionStats ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->sectionEnded( sectionStats ); - } - - virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->testCaseEnded( testCaseStats ); - } - - virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->testGroupEnded( testGroupStats ); - } - - virtual void testRunEnded( TestRunStats const& testRunStats ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->testRunEnded( testRunStats ); - } - - virtual void skipTest( TestCaseInfo const& testInfo ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->skipTest( testInfo ); - } - - virtual MultipleReporters* tryAsMulti() CATCH_OVERRIDE { - return this; - } - -}; - -Ptr addReporter( Ptr const& existingReporter, Ptr const& additionalReporter ) { - Ptr resultingReporter; - - if( existingReporter ) { - MultipleReporters* multi = existingReporter->tryAsMulti(); - if( !multi ) { - multi = new MultipleReporters; - resultingReporter = Ptr( multi ); - if( existingReporter ) - multi->add( existingReporter ); - } - else - resultingReporter = existingReporter; - multi->add( additionalReporter ); - } - else - resultingReporter = additionalReporter; - - return resultingReporter; -} - -} // end namespace Catch - -// #included from: ../reporters/catch_reporter_xml.hpp -#define TWOBLUECUBES_CATCH_REPORTER_XML_HPP_INCLUDED - -// #included from: catch_reporter_bases.hpp -#define TWOBLUECUBES_CATCH_REPORTER_BASES_HPP_INCLUDED - -#include -#include -#include -#include - -namespace Catch { - - namespace { - // Because formatting using c++ streams is stateful, drop down to C is required - // Alternatively we could use stringstream, but its performance is... not good. - std::string getFormattedDuration( double duration ) { - // Max exponent + 1 is required to represent the whole part - // + 1 for decimal point - // + 3 for the 3 decimal places - // + 1 for null terminator - const size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1; - char buffer[maxDoubleSize]; - - // Save previous errno, to prevent sprintf from overwriting it - ErrnoGuard guard; -#ifdef _MSC_VER - sprintf_s(buffer, "%.3f", duration); -#else - sprintf(buffer, "%.3f", duration); -#endif - return std::string(buffer); - } - } - - struct StreamingReporterBase : SharedImpl { - - StreamingReporterBase( ReporterConfig const& _config ) - : m_config( _config.fullConfig() ), - stream( _config.stream() ) - { - m_reporterPrefs.shouldRedirectStdOut = false; - } - - virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE { - return m_reporterPrefs; - } - - virtual ~StreamingReporterBase() CATCH_OVERRIDE; - - virtual void noMatchingTestCases( std::string const& ) CATCH_OVERRIDE {} - - virtual void testRunStarting( TestRunInfo const& _testRunInfo ) CATCH_OVERRIDE { - currentTestRunInfo = _testRunInfo; - } - virtual void testGroupStarting( GroupInfo const& _groupInfo ) CATCH_OVERRIDE { - currentGroupInfo = _groupInfo; - } - - virtual void testCaseStarting( TestCaseInfo const& _testInfo ) CATCH_OVERRIDE { - currentTestCaseInfo = _testInfo; - } - virtual void sectionStarting( SectionInfo const& _sectionInfo ) CATCH_OVERRIDE { - m_sectionStack.push_back( _sectionInfo ); - } - - virtual void sectionEnded( SectionStats const& /* _sectionStats */ ) CATCH_OVERRIDE { - m_sectionStack.pop_back(); - } - virtual void testCaseEnded( TestCaseStats const& /* _testCaseStats */ ) CATCH_OVERRIDE { - currentTestCaseInfo.reset(); - } - virtual void testGroupEnded( TestGroupStats const& /* _testGroupStats */ ) CATCH_OVERRIDE { - currentGroupInfo.reset(); - } - virtual void testRunEnded( TestRunStats const& /* _testRunStats */ ) CATCH_OVERRIDE { - currentTestCaseInfo.reset(); - currentGroupInfo.reset(); - currentTestRunInfo.reset(); - } - - virtual void skipTest( TestCaseInfo const& ) CATCH_OVERRIDE { - // Don't do anything with this by default. - // It can optionally be overridden in the derived class. - } - - Ptr m_config; - std::ostream& stream; - - LazyStat currentTestRunInfo; - LazyStat currentGroupInfo; - LazyStat currentTestCaseInfo; - - std::vector m_sectionStack; - ReporterPreferences m_reporterPrefs; - }; - - struct CumulativeReporterBase : SharedImpl { - template - struct Node : SharedImpl<> { - explicit Node( T const& _value ) : value( _value ) {} - virtual ~Node() {} - - typedef std::vector > ChildNodes; - T value; - ChildNodes children; - }; - struct SectionNode : SharedImpl<> { - explicit SectionNode( SectionStats const& _stats ) : stats( _stats ) {} - virtual ~SectionNode(); - - bool operator == ( SectionNode const& other ) const { - return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo; - } - bool operator == ( Ptr const& other ) const { - return operator==( *other ); - } - - SectionStats stats; - typedef std::vector > ChildSections; - typedef std::vector Assertions; - ChildSections childSections; - Assertions assertions; - std::string stdOut; - std::string stdErr; - }; - - struct BySectionInfo { - BySectionInfo( SectionInfo const& other ) : m_other( other ) {} - BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {} - bool operator() ( Ptr const& node ) const { - return node->stats.sectionInfo.lineInfo == m_other.lineInfo; - } - private: - void operator=( BySectionInfo const& ); - SectionInfo const& m_other; - }; - - typedef Node TestCaseNode; - typedef Node TestGroupNode; - typedef Node TestRunNode; - - CumulativeReporterBase( ReporterConfig const& _config ) - : m_config( _config.fullConfig() ), - stream( _config.stream() ) - { - m_reporterPrefs.shouldRedirectStdOut = false; - } - ~CumulativeReporterBase(); - - virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE { - return m_reporterPrefs; - } - - virtual void testRunStarting( TestRunInfo const& ) CATCH_OVERRIDE {} - virtual void testGroupStarting( GroupInfo const& ) CATCH_OVERRIDE {} - - virtual void testCaseStarting( TestCaseInfo const& ) CATCH_OVERRIDE {} - - virtual void sectionStarting( SectionInfo const& sectionInfo ) CATCH_OVERRIDE { - SectionStats incompleteStats( sectionInfo, Counts(), 0, false ); - Ptr node; - if( m_sectionStack.empty() ) { - if( !m_rootSection ) - m_rootSection = new SectionNode( incompleteStats ); - node = m_rootSection; - } - else { - SectionNode& parentNode = *m_sectionStack.back(); - SectionNode::ChildSections::const_iterator it = - std::find_if( parentNode.childSections.begin(), - parentNode.childSections.end(), - BySectionInfo( sectionInfo ) ); - if( it == parentNode.childSections.end() ) { - node = new SectionNode( incompleteStats ); - parentNode.childSections.push_back( node ); - } - else - node = *it; - } - m_sectionStack.push_back( node ); - m_deepestSection = node; - } - - virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE {} - - virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE { - assert( !m_sectionStack.empty() ); - SectionNode& sectionNode = *m_sectionStack.back(); - sectionNode.assertions.push_back( assertionStats ); - // AssertionResult holds a pointer to a temporary DecomposedExpression, - // which getExpandedExpression() calls to build the expression string. - // Our section stack copy of the assertionResult will likely outlive the - // temporary, so it must be expanded or discarded now to avoid calling - // a destroyed object later. - prepareExpandedExpression( sectionNode.assertions.back().assertionResult ); - return true; - } - virtual void sectionEnded( SectionStats const& sectionStats ) CATCH_OVERRIDE { - assert( !m_sectionStack.empty() ); - SectionNode& node = *m_sectionStack.back(); - node.stats = sectionStats; - m_sectionStack.pop_back(); - } - virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE { - Ptr node = new TestCaseNode( testCaseStats ); - assert( m_sectionStack.size() == 0 ); - node->children.push_back( m_rootSection ); - m_testCases.push_back( node ); - m_rootSection.reset(); - - assert( m_deepestSection ); - m_deepestSection->stdOut = testCaseStats.stdOut; - m_deepestSection->stdErr = testCaseStats.stdErr; - } - virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE { - Ptr node = new TestGroupNode( testGroupStats ); - node->children.swap( m_testCases ); - m_testGroups.push_back( node ); - } - virtual void testRunEnded( TestRunStats const& testRunStats ) CATCH_OVERRIDE { - Ptr node = new TestRunNode( testRunStats ); - node->children.swap( m_testGroups ); - m_testRuns.push_back( node ); - testRunEndedCumulative(); - } - virtual void testRunEndedCumulative() = 0; - - virtual void skipTest( TestCaseInfo const& ) CATCH_OVERRIDE {} - - virtual void prepareExpandedExpression( AssertionResult& result ) const { - if( result.isOk() ) - result.discardDecomposedExpression(); - else - result.expandDecomposedExpression(); - } - - Ptr m_config; - std::ostream& stream; - std::vector m_assertions; - std::vector > > m_sections; - std::vector > m_testCases; - std::vector > m_testGroups; - - std::vector > m_testRuns; - - Ptr m_rootSection; - Ptr m_deepestSection; - std::vector > m_sectionStack; - ReporterPreferences m_reporterPrefs; - - }; - - template - char const* getLineOfChars() { - static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0}; - if( !*line ) { - std::memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 ); - line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0; - } - return line; - } - - struct TestEventListenerBase : StreamingReporterBase { - TestEventListenerBase( ReporterConfig const& _config ) - : StreamingReporterBase( _config ) - {} - - virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE {} - virtual bool assertionEnded( AssertionStats const& ) CATCH_OVERRIDE { - return false; - } - }; - -} // end namespace Catch - -// #included from: ../internal/catch_reporter_registrars.hpp -#define TWOBLUECUBES_CATCH_REPORTER_REGISTRARS_HPP_INCLUDED - -namespace Catch { - - template - class LegacyReporterRegistrar { - - class ReporterFactory : public IReporterFactory { - virtual IStreamingReporter* create( ReporterConfig const& config ) const { - return new LegacyReporterAdapter( new T( config ) ); - } - - virtual std::string getDescription() const { - return T::getDescription(); - } - }; - - public: - - LegacyReporterRegistrar( std::string const& name ) { - getMutableRegistryHub().registerReporter( name, new ReporterFactory() ); - } - }; - - template - class ReporterRegistrar { - - class ReporterFactory : public SharedImpl { - - // *** Please Note ***: - // - If you end up here looking at a compiler error because it's trying to register - // your custom reporter class be aware that the native reporter interface has changed - // to IStreamingReporter. The "legacy" interface, IReporter, is still supported via - // an adapter. Just use REGISTER_LEGACY_REPORTER to take advantage of the adapter. - // However please consider updating to the new interface as the old one is now - // deprecated and will probably be removed quite soon! - // Please contact me via github if you have any questions at all about this. - // In fact, ideally, please contact me anyway to let me know you've hit this - as I have - // no idea who is actually using custom reporters at all (possibly no-one!). - // The new interface is designed to minimise exposure to interface changes in the future. - virtual IStreamingReporter* create( ReporterConfig const& config ) const { - return new T( config ); - } - - virtual std::string getDescription() const { - return T::getDescription(); - } - }; - - public: - - ReporterRegistrar( std::string const& name ) { - getMutableRegistryHub().registerReporter( name, new ReporterFactory() ); - } - }; - - template - class ListenerRegistrar { - - class ListenerFactory : public SharedImpl { - - virtual IStreamingReporter* create( ReporterConfig const& config ) const { - return new T( config ); - } - virtual std::string getDescription() const { - return std::string(); - } - }; - - public: - - ListenerRegistrar() { - getMutableRegistryHub().registerListener( new ListenerFactory() ); - } - }; -} - -#define INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) \ - namespace{ Catch::LegacyReporterRegistrar catch_internal_RegistrarFor##reporterType( name ); } - -#define INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType ) \ - namespace{ Catch::ReporterRegistrar catch_internal_RegistrarFor##reporterType( name ); } - -// Deprecated - use the form without INTERNAL_ -#define INTERNAL_CATCH_REGISTER_LISTENER( listenerType ) \ - namespace{ Catch::ListenerRegistrar catch_internal_RegistrarFor##listenerType; } - -#define CATCH_REGISTER_LISTENER( listenerType ) \ - namespace{ Catch::ListenerRegistrar catch_internal_RegistrarFor##listenerType; } - -// #included from: ../internal/catch_xmlwriter.hpp -#define TWOBLUECUBES_CATCH_XMLWRITER_HPP_INCLUDED - -#include -#include -#include -#include - -namespace Catch { - - class XmlEncode { - public: - enum ForWhat { ForTextNodes, ForAttributes }; - - XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes ) - : m_str( str ), - m_forWhat( forWhat ) - {} - - void encodeTo( std::ostream& os ) const { - - // Apostrophe escaping not necessary if we always use " to write attributes - // (see: http://www.w3.org/TR/xml/#syntax) - - for( std::size_t i = 0; i < m_str.size(); ++ i ) { - char c = m_str[i]; - switch( c ) { - case '<': os << "<"; break; - case '&': os << "&"; break; - - case '>': - // See: http://www.w3.org/TR/xml/#syntax - if( i > 2 && m_str[i-1] == ']' && m_str[i-2] == ']' ) - os << ">"; - else - os << c; - break; - - case '\"': - if( m_forWhat == ForAttributes ) - os << """; - else - os << c; - break; - - default: - // Escape control chars - based on contribution by @espenalb in PR #465 and - // by @mrpi PR #588 - if ( ( c >= 0 && c < '\x09' ) || ( c > '\x0D' && c < '\x20') || c=='\x7F' ) { - // see http://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0 - os << "\\x" << std::uppercase << std::hex << std::setfill('0') << std::setw(2) - << static_cast( c ); - } - else - os << c; - } - } - } - - friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) { - xmlEncode.encodeTo( os ); - return os; - } - - private: - std::string m_str; - ForWhat m_forWhat; - }; - - class XmlWriter { - public: - - class ScopedElement { - public: - ScopedElement( XmlWriter* writer ) - : m_writer( writer ) - {} - - ScopedElement( ScopedElement const& other ) - : m_writer( other.m_writer ){ - other.m_writer = CATCH_NULL; - } - - ~ScopedElement() { - if( m_writer ) - m_writer->endElement(); - } - - ScopedElement& writeText( std::string const& text, bool indent = true ) { - m_writer->writeText( text, indent ); - return *this; - } - - template - ScopedElement& writeAttribute( std::string const& name, T const& attribute ) { - m_writer->writeAttribute( name, attribute ); - return *this; - } - - private: - mutable XmlWriter* m_writer; - }; - - XmlWriter() - : m_tagIsOpen( false ), - m_needsNewline( false ), - m_os( Catch::cout() ) - { - writeDeclaration(); - } - - XmlWriter( std::ostream& os ) - : m_tagIsOpen( false ), - m_needsNewline( false ), - m_os( os ) - { - writeDeclaration(); - } - - ~XmlWriter() { - while( !m_tags.empty() ) - endElement(); - } - - XmlWriter& startElement( std::string const& name ) { - ensureTagClosed(); - newlineIfNecessary(); - m_os << m_indent << '<' << name; - m_tags.push_back( name ); - m_indent += " "; - m_tagIsOpen = true; - return *this; - } - - ScopedElement scopedElement( std::string const& name ) { - ScopedElement scoped( this ); - startElement( name ); - return scoped; - } - - XmlWriter& endElement() { - newlineIfNecessary(); - m_indent = m_indent.substr( 0, m_indent.size()-2 ); - if( m_tagIsOpen ) { - m_os << "/>"; - m_tagIsOpen = false; - } - else { - m_os << m_indent << ""; - } - m_os << std::endl; - m_tags.pop_back(); - return *this; - } - - XmlWriter& writeAttribute( std::string const& name, std::string const& attribute ) { - if( !name.empty() && !attribute.empty() ) - m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"'; - return *this; - } - - XmlWriter& writeAttribute( std::string const& name, bool attribute ) { - m_os << ' ' << name << "=\"" << ( attribute ? "true" : "false" ) << '"'; - return *this; - } - - template - XmlWriter& writeAttribute( std::string const& name, T const& attribute ) { - std::ostringstream oss; - oss << attribute; - return writeAttribute( name, oss.str() ); - } - - XmlWriter& writeText( std::string const& text, bool indent = true ) { - if( !text.empty() ){ - bool tagWasOpen = m_tagIsOpen; - ensureTagClosed(); - if( tagWasOpen && indent ) - m_os << m_indent; - m_os << XmlEncode( text ); - m_needsNewline = true; - } - return *this; - } - - XmlWriter& writeComment( std::string const& text ) { - ensureTagClosed(); - m_os << m_indent << ""; - m_needsNewline = true; - return *this; - } - - void writeStylesheetRef( std::string const& url ) { - m_os << "\n"; - } - - XmlWriter& writeBlankLine() { - ensureTagClosed(); - m_os << '\n'; - return *this; - } - - void ensureTagClosed() { - if( m_tagIsOpen ) { - m_os << ">" << std::endl; - m_tagIsOpen = false; - } - } - - private: - XmlWriter( XmlWriter const& ); - void operator=( XmlWriter const& ); - - void writeDeclaration() { - m_os << "\n"; - } - - void newlineIfNecessary() { - if( m_needsNewline ) { - m_os << std::endl; - m_needsNewline = false; - } - } - - bool m_tagIsOpen; - bool m_needsNewline; - std::vector m_tags; - std::string m_indent; - std::ostream& m_os; - }; - -} - -namespace Catch { - class XmlReporter : public StreamingReporterBase { - public: - XmlReporter( ReporterConfig const& _config ) - : StreamingReporterBase( _config ), - m_xml(_config.stream()), - m_sectionDepth( 0 ) - { - m_reporterPrefs.shouldRedirectStdOut = true; - } - - virtual ~XmlReporter() CATCH_OVERRIDE; - - static std::string getDescription() { - return "Reports test results as an XML document"; - } - - virtual std::string getStylesheetRef() const { - return std::string(); - } - - void writeSourceInfo( SourceLineInfo const& sourceInfo ) { - m_xml - .writeAttribute( "filename", sourceInfo.file ) - .writeAttribute( "line", sourceInfo.line ); - } - - public: // StreamingReporterBase - - virtual void noMatchingTestCases( std::string const& s ) CATCH_OVERRIDE { - StreamingReporterBase::noMatchingTestCases( s ); - } - - virtual void testRunStarting( TestRunInfo const& testInfo ) CATCH_OVERRIDE { - StreamingReporterBase::testRunStarting( testInfo ); - std::string stylesheetRef = getStylesheetRef(); - if( !stylesheetRef.empty() ) - m_xml.writeStylesheetRef( stylesheetRef ); - m_xml.startElement( "Catch" ); - if( !m_config->name().empty() ) - m_xml.writeAttribute( "name", m_config->name() ); - } - - virtual void testGroupStarting( GroupInfo const& groupInfo ) CATCH_OVERRIDE { - StreamingReporterBase::testGroupStarting( groupInfo ); - m_xml.startElement( "Group" ) - .writeAttribute( "name", groupInfo.name ); - } - - virtual void testCaseStarting( TestCaseInfo const& testInfo ) CATCH_OVERRIDE { - StreamingReporterBase::testCaseStarting(testInfo); - m_xml.startElement( "TestCase" ) - .writeAttribute( "name", trim( testInfo.name ) ) - .writeAttribute( "description", testInfo.description ) - .writeAttribute( "tags", testInfo.tagsAsString ); - - writeSourceInfo( testInfo.lineInfo ); - - if ( m_config->showDurations() == ShowDurations::Always ) - m_testCaseTimer.start(); - m_xml.ensureTagClosed(); - } - - virtual void sectionStarting( SectionInfo const& sectionInfo ) CATCH_OVERRIDE { - StreamingReporterBase::sectionStarting( sectionInfo ); - if( m_sectionDepth++ > 0 ) { - m_xml.startElement( "Section" ) - .writeAttribute( "name", trim( sectionInfo.name ) ) - .writeAttribute( "description", sectionInfo.description ); - writeSourceInfo( sectionInfo.lineInfo ); - m_xml.ensureTagClosed(); - } - } - - virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE { } - - virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE { - - AssertionResult const& result = assertionStats.assertionResult; - - bool includeResults = m_config->includeSuccessfulResults() || !result.isOk(); - - if( includeResults ) { - // Print any info messages in tags. - for( std::vector::const_iterator it = assertionStats.infoMessages.begin(), itEnd = assertionStats.infoMessages.end(); - it != itEnd; - ++it ) { - if( it->type == ResultWas::Info ) { - m_xml.scopedElement( "Info" ) - .writeText( it->message ); - } else if ( it->type == ResultWas::Warning ) { - m_xml.scopedElement( "Warning" ) - .writeText( it->message ); - } - } - } - - // Drop out if result was successful but we're not printing them. - if( !includeResults && result.getResultType() != ResultWas::Warning ) - return true; - - // Print the expression if there is one. - if( result.hasExpression() ) { - m_xml.startElement( "Expression" ) - .writeAttribute( "success", result.succeeded() ) - .writeAttribute( "type", result.getTestMacroName() ); - - writeSourceInfo( result.getSourceInfo() ); - - m_xml.scopedElement( "Original" ) - .writeText( result.getExpression() ); - m_xml.scopedElement( "Expanded" ) - .writeText( result.getExpandedExpression() ); - } - - // And... Print a result applicable to each result type. - switch( result.getResultType() ) { - case ResultWas::ThrewException: - m_xml.startElement( "Exception" ); - writeSourceInfo( result.getSourceInfo() ); - m_xml.writeText( result.getMessage() ); - m_xml.endElement(); - break; - case ResultWas::FatalErrorCondition: - m_xml.startElement( "FatalErrorCondition" ); - writeSourceInfo( result.getSourceInfo() ); - m_xml.writeText( result.getMessage() ); - m_xml.endElement(); - break; - case ResultWas::Info: - m_xml.scopedElement( "Info" ) - .writeText( result.getMessage() ); - break; - case ResultWas::Warning: - // Warning will already have been written - break; - case ResultWas::ExplicitFailure: - m_xml.startElement( "Failure" ); - writeSourceInfo( result.getSourceInfo() ); - m_xml.writeText( result.getMessage() ); - m_xml.endElement(); - break; - default: - break; - } - - if( result.hasExpression() ) - m_xml.endElement(); - - return true; - } - - virtual void sectionEnded( SectionStats const& sectionStats ) CATCH_OVERRIDE { - StreamingReporterBase::sectionEnded( sectionStats ); - if( --m_sectionDepth > 0 ) { - XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResults" ); - e.writeAttribute( "successes", sectionStats.assertions.passed ); - e.writeAttribute( "failures", sectionStats.assertions.failed ); - e.writeAttribute( "expectedFailures", sectionStats.assertions.failedButOk ); - - if ( m_config->showDurations() == ShowDurations::Always ) - e.writeAttribute( "durationInSeconds", sectionStats.durationInSeconds ); - - m_xml.endElement(); - } - } - - virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE { - StreamingReporterBase::testCaseEnded( testCaseStats ); - XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResult" ); - e.writeAttribute( "success", testCaseStats.totals.assertions.allOk() ); - - if ( m_config->showDurations() == ShowDurations::Always ) - e.writeAttribute( "durationInSeconds", m_testCaseTimer.getElapsedSeconds() ); - - if( !testCaseStats.stdOut.empty() ) - m_xml.scopedElement( "StdOut" ).writeText( trim( testCaseStats.stdOut ), false ); - if( !testCaseStats.stdErr.empty() ) - m_xml.scopedElement( "StdErr" ).writeText( trim( testCaseStats.stdErr ), false ); - - m_xml.endElement(); - } - - virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE { - StreamingReporterBase::testGroupEnded( testGroupStats ); - // TODO: Check testGroupStats.aborting and act accordingly. - m_xml.scopedElement( "OverallResults" ) - .writeAttribute( "successes", testGroupStats.totals.assertions.passed ) - .writeAttribute( "failures", testGroupStats.totals.assertions.failed ) - .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk ); - m_xml.endElement(); - } - - virtual void testRunEnded( TestRunStats const& testRunStats ) CATCH_OVERRIDE { - StreamingReporterBase::testRunEnded( testRunStats ); - m_xml.scopedElement( "OverallResults" ) - .writeAttribute( "successes", testRunStats.totals.assertions.passed ) - .writeAttribute( "failures", testRunStats.totals.assertions.failed ) - .writeAttribute( "expectedFailures", testRunStats.totals.assertions.failedButOk ); - m_xml.endElement(); - } - - private: - Timer m_testCaseTimer; - XmlWriter m_xml; - int m_sectionDepth; - }; - - INTERNAL_CATCH_REGISTER_REPORTER( "xml", XmlReporter ) - -} // end namespace Catch - -// #included from: ../reporters/catch_reporter_junit.hpp -#define TWOBLUECUBES_CATCH_REPORTER_JUNIT_HPP_INCLUDED - -#include - -namespace Catch { - - namespace { - std::string getCurrentTimestamp() { - // Beware, this is not reentrant because of backward compatibility issues - // Also, UTC only, again because of backward compatibility (%z is C++11) - time_t rawtime; - std::time(&rawtime); - const size_t timeStampSize = sizeof("2017-01-16T17:06:45Z"); - -#ifdef _MSC_VER - std::tm timeInfo = {}; - gmtime_s(&timeInfo, &rawtime); -#else - std::tm* timeInfo; - timeInfo = std::gmtime(&rawtime); -#endif - - char timeStamp[timeStampSize]; - const char * const fmt = "%Y-%m-%dT%H:%M:%SZ"; - -#ifdef _MSC_VER - std::strftime(timeStamp, timeStampSize, fmt, &timeInfo); -#else - std::strftime(timeStamp, timeStampSize, fmt, timeInfo); -#endif - return std::string(timeStamp); - } - - } - - class JunitReporter : public CumulativeReporterBase { - public: - JunitReporter( ReporterConfig const& _config ) - : CumulativeReporterBase( _config ), - xml( _config.stream() ), - m_okToFail( false ) - { - m_reporterPrefs.shouldRedirectStdOut = true; - } - - virtual ~JunitReporter() CATCH_OVERRIDE; - - static std::string getDescription() { - return "Reports test results in an XML format that looks like Ant's junitreport target"; - } - - virtual void noMatchingTestCases( std::string const& /*spec*/ ) CATCH_OVERRIDE {} - - virtual void testRunStarting( TestRunInfo const& runInfo ) CATCH_OVERRIDE { - CumulativeReporterBase::testRunStarting( runInfo ); - xml.startElement( "testsuites" ); - } - - virtual void testGroupStarting( GroupInfo const& groupInfo ) CATCH_OVERRIDE { - suiteTimer.start(); - stdOutForSuite.str(""); - stdErrForSuite.str(""); - unexpectedExceptions = 0; - CumulativeReporterBase::testGroupStarting( groupInfo ); - } - - virtual void testCaseStarting( TestCaseInfo const& testCaseInfo ) CATCH_OVERRIDE { - m_okToFail = testCaseInfo.okToFail(); - } - virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE { - if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException && !m_okToFail ) - unexpectedExceptions++; - return CumulativeReporterBase::assertionEnded( assertionStats ); - } - - virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE { - stdOutForSuite << testCaseStats.stdOut; - stdErrForSuite << testCaseStats.stdErr; - CumulativeReporterBase::testCaseEnded( testCaseStats ); - } - - virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE { - double suiteTime = suiteTimer.getElapsedSeconds(); - CumulativeReporterBase::testGroupEnded( testGroupStats ); - writeGroup( *m_testGroups.back(), suiteTime ); - } - - virtual void testRunEndedCumulative() CATCH_OVERRIDE { - xml.endElement(); - } - - void writeGroup( TestGroupNode const& groupNode, double suiteTime ) { - XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" ); - TestGroupStats const& stats = groupNode.value; - xml.writeAttribute( "name", stats.groupInfo.name ); - xml.writeAttribute( "errors", unexpectedExceptions ); - xml.writeAttribute( "failures", stats.totals.assertions.failed-unexpectedExceptions ); - xml.writeAttribute( "tests", stats.totals.assertions.total() ); - xml.writeAttribute( "hostname", "tbd" ); // !TBD - if( m_config->showDurations() == ShowDurations::Never ) - xml.writeAttribute( "time", "" ); - else - xml.writeAttribute( "time", suiteTime ); - xml.writeAttribute( "timestamp", getCurrentTimestamp() ); - - // Write test cases - for( TestGroupNode::ChildNodes::const_iterator - it = groupNode.children.begin(), itEnd = groupNode.children.end(); - it != itEnd; - ++it ) - writeTestCase( **it ); - - xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite.str() ), false ); - xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite.str() ), false ); - } - - void writeTestCase( TestCaseNode const& testCaseNode ) { - TestCaseStats const& stats = testCaseNode.value; - - // All test cases have exactly one section - which represents the - // test case itself. That section may have 0-n nested sections - assert( testCaseNode.children.size() == 1 ); - SectionNode const& rootSection = *testCaseNode.children.front(); - - std::string className = stats.testInfo.className; - - if( className.empty() ) { - if( rootSection.childSections.empty() ) - className = "global"; - } - writeSection( className, "", rootSection ); - } - - void writeSection( std::string const& className, - std::string const& rootName, - SectionNode const& sectionNode ) { - std::string name = trim( sectionNode.stats.sectionInfo.name ); - if( !rootName.empty() ) - name = rootName + '/' + name; - - if( !sectionNode.assertions.empty() || - !sectionNode.stdOut.empty() || - !sectionNode.stdErr.empty() ) { - XmlWriter::ScopedElement e = xml.scopedElement( "testcase" ); - if( className.empty() ) { - xml.writeAttribute( "classname", name ); - xml.writeAttribute( "name", "root" ); - } - else { - xml.writeAttribute( "classname", className ); - xml.writeAttribute( "name", name ); - } - xml.writeAttribute( "time", Catch::toString( sectionNode.stats.durationInSeconds ) ); - - writeAssertions( sectionNode ); - - if( !sectionNode.stdOut.empty() ) - xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), false ); - if( !sectionNode.stdErr.empty() ) - xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), false ); - } - for( SectionNode::ChildSections::const_iterator - it = sectionNode.childSections.begin(), - itEnd = sectionNode.childSections.end(); - it != itEnd; - ++it ) - if( className.empty() ) - writeSection( name, "", **it ); - else - writeSection( className, name, **it ); - } - - void writeAssertions( SectionNode const& sectionNode ) { - for( SectionNode::Assertions::const_iterator - it = sectionNode.assertions.begin(), itEnd = sectionNode.assertions.end(); - it != itEnd; - ++it ) - writeAssertion( *it ); - } - void writeAssertion( AssertionStats const& stats ) { - AssertionResult const& result = stats.assertionResult; - if( !result.isOk() ) { - std::string elementName; - switch( result.getResultType() ) { - case ResultWas::ThrewException: - case ResultWas::FatalErrorCondition: - elementName = "error"; - break; - case ResultWas::ExplicitFailure: - elementName = "failure"; - break; - case ResultWas::ExpressionFailed: - elementName = "failure"; - break; - case ResultWas::DidntThrowException: - elementName = "failure"; - break; - - // We should never see these here: - case ResultWas::Info: - case ResultWas::Warning: - case ResultWas::Ok: - case ResultWas::Unknown: - case ResultWas::FailureBit: - case ResultWas::Exception: - elementName = "internalError"; - break; - } - - XmlWriter::ScopedElement e = xml.scopedElement( elementName ); - - xml.writeAttribute( "message", result.getExpandedExpression() ); - xml.writeAttribute( "type", result.getTestMacroName() ); - - std::ostringstream oss; - if( !result.getMessage().empty() ) - oss << result.getMessage() << '\n'; - for( std::vector::const_iterator - it = stats.infoMessages.begin(), - itEnd = stats.infoMessages.end(); - it != itEnd; - ++it ) - if( it->type == ResultWas::Info ) - oss << it->message << '\n'; - - oss << "at " << result.getSourceInfo(); - xml.writeText( oss.str(), false ); - } - } - - XmlWriter xml; - Timer suiteTimer; - std::ostringstream stdOutForSuite; - std::ostringstream stdErrForSuite; - unsigned int unexpectedExceptions; - bool m_okToFail; - }; - - INTERNAL_CATCH_REGISTER_REPORTER( "junit", JunitReporter ) - -} // end namespace Catch - -// #included from: ../reporters/catch_reporter_console.hpp -#define TWOBLUECUBES_CATCH_REPORTER_CONSOLE_HPP_INCLUDED - -#include -#include - -namespace Catch { - - struct ConsoleReporter : StreamingReporterBase { - ConsoleReporter( ReporterConfig const& _config ) - : StreamingReporterBase( _config ), - m_headerPrinted( false ) - {} - - virtual ~ConsoleReporter() CATCH_OVERRIDE; - static std::string getDescription() { - return "Reports test results as plain lines of text"; - } - - virtual void noMatchingTestCases( std::string const& spec ) CATCH_OVERRIDE { - stream << "No test cases matched '" << spec << '\'' << std::endl; - } - - virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE { - } - - virtual bool assertionEnded( AssertionStats const& _assertionStats ) CATCH_OVERRIDE { - AssertionResult const& result = _assertionStats.assertionResult; - - bool includeResults = m_config->includeSuccessfulResults() || !result.isOk(); - - // Drop out if result was successful but we're not printing them. - if( !includeResults && result.getResultType() != ResultWas::Warning ) - return false; - - lazyPrint(); - - AssertionPrinter printer( stream, _assertionStats, includeResults ); - printer.print(); - stream << std::endl; - return true; - } - - virtual void sectionStarting( SectionInfo const& _sectionInfo ) CATCH_OVERRIDE { - m_headerPrinted = false; - StreamingReporterBase::sectionStarting( _sectionInfo ); - } - virtual void sectionEnded( SectionStats const& _sectionStats ) CATCH_OVERRIDE { - if( _sectionStats.missingAssertions ) { - lazyPrint(); - Colour colour( Colour::ResultError ); - if( m_sectionStack.size() > 1 ) - stream << "\nNo assertions in section"; - else - stream << "\nNo assertions in test case"; - stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl; - } - if( m_config->showDurations() == ShowDurations::Always ) { - stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl; - } - if( m_headerPrinted ) { - m_headerPrinted = false; - } - StreamingReporterBase::sectionEnded( _sectionStats ); - } - - virtual void testCaseEnded( TestCaseStats const& _testCaseStats ) CATCH_OVERRIDE { - StreamingReporterBase::testCaseEnded( _testCaseStats ); - m_headerPrinted = false; - } - virtual void testGroupEnded( TestGroupStats const& _testGroupStats ) CATCH_OVERRIDE { - if( currentGroupInfo.used ) { - printSummaryDivider(); - stream << "Summary for group '" << _testGroupStats.groupInfo.name << "':\n"; - printTotals( _testGroupStats.totals ); - stream << '\n' << std::endl; - } - StreamingReporterBase::testGroupEnded( _testGroupStats ); - } - virtual void testRunEnded( TestRunStats const& _testRunStats ) CATCH_OVERRIDE { - printTotalsDivider( _testRunStats.totals ); - printTotals( _testRunStats.totals ); - stream << std::endl; - StreamingReporterBase::testRunEnded( _testRunStats ); - } - - private: - - class AssertionPrinter { - void operator= ( AssertionPrinter const& ); - public: - AssertionPrinter( std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages ) - : stream( _stream ), - stats( _stats ), - result( _stats.assertionResult ), - colour( Colour::None ), - message( result.getMessage() ), - messages( _stats.infoMessages ), - printInfoMessages( _printInfoMessages ) - { - switch( result.getResultType() ) { - case ResultWas::Ok: - colour = Colour::Success; - passOrFail = "PASSED"; - //if( result.hasMessage() ) - if( _stats.infoMessages.size() == 1 ) - messageLabel = "with message"; - if( _stats.infoMessages.size() > 1 ) - messageLabel = "with messages"; - break; - case ResultWas::ExpressionFailed: - if( result.isOk() ) { - colour = Colour::Success; - passOrFail = "FAILED - but was ok"; - } - else { - colour = Colour::Error; - passOrFail = "FAILED"; - } - if( _stats.infoMessages.size() == 1 ) - messageLabel = "with message"; - if( _stats.infoMessages.size() > 1 ) - messageLabel = "with messages"; - break; - case ResultWas::ThrewException: - colour = Colour::Error; - passOrFail = "FAILED"; - messageLabel = "due to unexpected exception with "; - if (_stats.infoMessages.size() == 1) - messageLabel += "message"; - if (_stats.infoMessages.size() > 1) - messageLabel += "messages"; - break; - case ResultWas::FatalErrorCondition: - colour = Colour::Error; - passOrFail = "FAILED"; - messageLabel = "due to a fatal error condition"; - break; - case ResultWas::DidntThrowException: - colour = Colour::Error; - passOrFail = "FAILED"; - messageLabel = "because no exception was thrown where one was expected"; - break; - case ResultWas::Info: - messageLabel = "info"; - break; - case ResultWas::Warning: - messageLabel = "warning"; - break; - case ResultWas::ExplicitFailure: - passOrFail = "FAILED"; - colour = Colour::Error; - if( _stats.infoMessages.size() == 1 ) - messageLabel = "explicitly with message"; - if( _stats.infoMessages.size() > 1 ) - messageLabel = "explicitly with messages"; - break; - // These cases are here to prevent compiler warnings - case ResultWas::Unknown: - case ResultWas::FailureBit: - case ResultWas::Exception: - passOrFail = "** internal error **"; - colour = Colour::Error; - break; - } - } - - void print() const { - printSourceInfo(); - if( stats.totals.assertions.total() > 0 ) { - if( result.isOk() ) - stream << '\n'; - printResultType(); - printOriginalExpression(); - printReconstructedExpression(); - } - else { - stream << '\n'; - } - printMessage(); - } - - private: - void printResultType() const { - if( !passOrFail.empty() ) { - Colour colourGuard( colour ); - stream << passOrFail << ":\n"; - } - } - void printOriginalExpression() const { - if( result.hasExpression() ) { - Colour colourGuard( Colour::OriginalExpression ); - stream << " "; - stream << result.getExpressionInMacro(); - stream << '\n'; - } - } - void printReconstructedExpression() const { - if( result.hasExpandedExpression() ) { - stream << "with expansion:\n"; - Colour colourGuard( Colour::ReconstructedExpression ); - stream << Text( result.getExpandedExpression(), TextAttributes().setIndent(2) ) << '\n'; - } - } - void printMessage() const { - if( !messageLabel.empty() ) - stream << messageLabel << ':' << '\n'; - for( std::vector::const_iterator it = messages.begin(), itEnd = messages.end(); - it != itEnd; - ++it ) { - // If this assertion is a warning ignore any INFO messages - if( printInfoMessages || it->type != ResultWas::Info ) - stream << Text( it->message, TextAttributes().setIndent(2) ) << '\n'; - } - } - void printSourceInfo() const { - Colour colourGuard( Colour::FileName ); - stream << result.getSourceInfo() << ": "; - } - - std::ostream& stream; - AssertionStats const& stats; - AssertionResult const& result; - Colour::Code colour; - std::string passOrFail; - std::string messageLabel; - std::string message; - std::vector messages; - bool printInfoMessages; - }; - - void lazyPrint() { - - if( !currentTestRunInfo.used ) - lazyPrintRunInfo(); - if( !currentGroupInfo.used ) - lazyPrintGroupInfo(); - - if( !m_headerPrinted ) { - printTestCaseAndSectionHeader(); - m_headerPrinted = true; - } - } - void lazyPrintRunInfo() { - stream << '\n' << getLineOfChars<'~'>() << '\n'; - Colour colour( Colour::SecondaryText ); - stream << currentTestRunInfo->name - << " is a Catch v" << libraryVersion() << " host application.\n" - << "Run with -? for options\n\n"; - - if( m_config->rngSeed() != 0 ) - stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n"; - - currentTestRunInfo.used = true; - } - void lazyPrintGroupInfo() { - if( !currentGroupInfo->name.empty() && currentGroupInfo->groupsCounts > 1 ) { - printClosedHeader( "Group: " + currentGroupInfo->name ); - currentGroupInfo.used = true; - } - } - void printTestCaseAndSectionHeader() { - assert( !m_sectionStack.empty() ); - printOpenHeader( currentTestCaseInfo->name ); - - if( m_sectionStack.size() > 1 ) { - Colour colourGuard( Colour::Headers ); - - std::vector::const_iterator - it = m_sectionStack.begin()+1, // Skip first section (test case) - itEnd = m_sectionStack.end(); - for( ; it != itEnd; ++it ) - printHeaderString( it->name, 2 ); - } - - SourceLineInfo lineInfo = m_sectionStack.back().lineInfo; - - if( !lineInfo.empty() ){ - stream << getLineOfChars<'-'>() << '\n'; - Colour colourGuard( Colour::FileName ); - stream << lineInfo << '\n'; - } - stream << getLineOfChars<'.'>() << '\n' << std::endl; - } - - void printClosedHeader( std::string const& _name ) { - printOpenHeader( _name ); - stream << getLineOfChars<'.'>() << '\n'; - } - void printOpenHeader( std::string const& _name ) { - stream << getLineOfChars<'-'>() << '\n'; - { - Colour colourGuard( Colour::Headers ); - printHeaderString( _name ); - } - } - - // if string has a : in first line will set indent to follow it on - // subsequent lines - void printHeaderString( std::string const& _string, std::size_t indent = 0 ) { - std::size_t i = _string.find( ": " ); - if( i != std::string::npos ) - i+=2; - else - i = 0; - stream << Text( _string, TextAttributes() - .setIndent( indent+i) - .setInitialIndent( indent ) ) << '\n'; - } - - struct SummaryColumn { - - SummaryColumn( std::string const& _label, Colour::Code _colour ) - : label( _label ), - colour( _colour ) - {} - SummaryColumn addRow( std::size_t count ) { - std::ostringstream oss; - oss << count; - std::string row = oss.str(); - for( std::vector::iterator it = rows.begin(); it != rows.end(); ++it ) { - while( it->size() < row.size() ) - *it = ' ' + *it; - while( it->size() > row.size() ) - row = ' ' + row; - } - rows.push_back( row ); - return *this; - } - - std::string label; - Colour::Code colour; - std::vector rows; - - }; - - void printTotals( Totals const& totals ) { - if( totals.testCases.total() == 0 ) { - stream << Colour( Colour::Warning ) << "No tests ran\n"; - } - else if( totals.assertions.total() > 0 && totals.testCases.allPassed() ) { - stream << Colour( Colour::ResultSuccess ) << "All tests passed"; - stream << " (" - << pluralise( totals.assertions.passed, "assertion" ) << " in " - << pluralise( totals.testCases.passed, "test case" ) << ')' - << '\n'; - } - else { - - std::vector columns; - columns.push_back( SummaryColumn( "", Colour::None ) - .addRow( totals.testCases.total() ) - .addRow( totals.assertions.total() ) ); - columns.push_back( SummaryColumn( "passed", Colour::Success ) - .addRow( totals.testCases.passed ) - .addRow( totals.assertions.passed ) ); - columns.push_back( SummaryColumn( "failed", Colour::ResultError ) - .addRow( totals.testCases.failed ) - .addRow( totals.assertions.failed ) ); - columns.push_back( SummaryColumn( "failed as expected", Colour::ResultExpectedFailure ) - .addRow( totals.testCases.failedButOk ) - .addRow( totals.assertions.failedButOk ) ); - - printSummaryRow( "test cases", columns, 0 ); - printSummaryRow( "assertions", columns, 1 ); - } - } - void printSummaryRow( std::string const& label, std::vector const& cols, std::size_t row ) { - for( std::vector::const_iterator it = cols.begin(); it != cols.end(); ++it ) { - std::string value = it->rows[row]; - if( it->label.empty() ) { - stream << label << ": "; - if( value != "0" ) - stream << value; - else - stream << Colour( Colour::Warning ) << "- none -"; - } - else if( value != "0" ) { - stream << Colour( Colour::LightGrey ) << " | "; - stream << Colour( it->colour ) - << value << ' ' << it->label; - } - } - stream << '\n'; - } - - static std::size_t makeRatio( std::size_t number, std::size_t total ) { - std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number/ total : 0; - return ( ratio == 0 && number > 0 ) ? 1 : ratio; - } - static std::size_t& findMax( std::size_t& i, std::size_t& j, std::size_t& k ) { - if( i > j && i > k ) - return i; - else if( j > k ) - return j; - else - return k; - } - - void printTotalsDivider( Totals const& totals ) { - if( totals.testCases.total() > 0 ) { - std::size_t failedRatio = makeRatio( totals.testCases.failed, totals.testCases.total() ); - std::size_t failedButOkRatio = makeRatio( totals.testCases.failedButOk, totals.testCases.total() ); - std::size_t passedRatio = makeRatio( totals.testCases.passed, totals.testCases.total() ); - while( failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH-1 ) - findMax( failedRatio, failedButOkRatio, passedRatio )++; - while( failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH-1 ) - findMax( failedRatio, failedButOkRatio, passedRatio )--; - - stream << Colour( Colour::Error ) << std::string( failedRatio, '=' ); - stream << Colour( Colour::ResultExpectedFailure ) << std::string( failedButOkRatio, '=' ); - if( totals.testCases.allPassed() ) - stream << Colour( Colour::ResultSuccess ) << std::string( passedRatio, '=' ); - else - stream << Colour( Colour::Success ) << std::string( passedRatio, '=' ); - } - else { - stream << Colour( Colour::Warning ) << std::string( CATCH_CONFIG_CONSOLE_WIDTH-1, '=' ); - } - stream << '\n'; - } - void printSummaryDivider() { - stream << getLineOfChars<'-'>() << '\n'; - } - - private: - bool m_headerPrinted; - }; - - INTERNAL_CATCH_REGISTER_REPORTER( "console", ConsoleReporter ) - -} // end namespace Catch - -// #included from: ../reporters/catch_reporter_compact.hpp -#define TWOBLUECUBES_CATCH_REPORTER_COMPACT_HPP_INCLUDED - -namespace Catch { - - struct CompactReporter : StreamingReporterBase { - - CompactReporter( ReporterConfig const& _config ) - : StreamingReporterBase( _config ) - {} - - virtual ~CompactReporter(); - - static std::string getDescription() { - return "Reports test results on a single line, suitable for IDEs"; - } - - virtual ReporterPreferences getPreferences() const { - ReporterPreferences prefs; - prefs.shouldRedirectStdOut = false; - return prefs; - } - - virtual void noMatchingTestCases( std::string const& spec ) { - stream << "No test cases matched '" << spec << '\'' << std::endl; - } - - virtual void assertionStarting( AssertionInfo const& ) {} - - virtual bool assertionEnded( AssertionStats const& _assertionStats ) { - AssertionResult const& result = _assertionStats.assertionResult; - - bool printInfoMessages = true; - - // Drop out if result was successful and we're not printing those - if( !m_config->includeSuccessfulResults() && result.isOk() ) { - if( result.getResultType() != ResultWas::Warning ) - return false; - printInfoMessages = false; - } - - AssertionPrinter printer( stream, _assertionStats, printInfoMessages ); - printer.print(); - - stream << std::endl; - return true; - } - - virtual void sectionEnded(SectionStats const& _sectionStats) CATCH_OVERRIDE { - if (m_config->showDurations() == ShowDurations::Always) { - stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl; - } - } - - virtual void testRunEnded( TestRunStats const& _testRunStats ) { - printTotals( _testRunStats.totals ); - stream << '\n' << std::endl; - StreamingReporterBase::testRunEnded( _testRunStats ); - } - - private: - class AssertionPrinter { - void operator= ( AssertionPrinter const& ); - public: - AssertionPrinter( std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages ) - : stream( _stream ) - , stats( _stats ) - , result( _stats.assertionResult ) - , messages( _stats.infoMessages ) - , itMessage( _stats.infoMessages.begin() ) - , printInfoMessages( _printInfoMessages ) - {} - - void print() { - printSourceInfo(); - - itMessage = messages.begin(); - - switch( result.getResultType() ) { - case ResultWas::Ok: - printResultType( Colour::ResultSuccess, passedString() ); - printOriginalExpression(); - printReconstructedExpression(); - if ( ! result.hasExpression() ) - printRemainingMessages( Colour::None ); - else - printRemainingMessages(); - break; - case ResultWas::ExpressionFailed: - if( result.isOk() ) - printResultType( Colour::ResultSuccess, failedString() + std::string( " - but was ok" ) ); - else - printResultType( Colour::Error, failedString() ); - printOriginalExpression(); - printReconstructedExpression(); - printRemainingMessages(); - break; - case ResultWas::ThrewException: - printResultType( Colour::Error, failedString() ); - printIssue( "unexpected exception with message:" ); - printMessage(); - printExpressionWas(); - printRemainingMessages(); - break; - case ResultWas::FatalErrorCondition: - printResultType( Colour::Error, failedString() ); - printIssue( "fatal error condition with message:" ); - printMessage(); - printExpressionWas(); - printRemainingMessages(); - break; - case ResultWas::DidntThrowException: - printResultType( Colour::Error, failedString() ); - printIssue( "expected exception, got none" ); - printExpressionWas(); - printRemainingMessages(); - break; - case ResultWas::Info: - printResultType( Colour::None, "info" ); - printMessage(); - printRemainingMessages(); - break; - case ResultWas::Warning: - printResultType( Colour::None, "warning" ); - printMessage(); - printRemainingMessages(); - break; - case ResultWas::ExplicitFailure: - printResultType( Colour::Error, failedString() ); - printIssue( "explicitly" ); - printRemainingMessages( Colour::None ); - break; - // These cases are here to prevent compiler warnings - case ResultWas::Unknown: - case ResultWas::FailureBit: - case ResultWas::Exception: - printResultType( Colour::Error, "** internal error **" ); - break; - } - } - - private: - // Colour::LightGrey - - static Colour::Code dimColour() { return Colour::FileName; } - -#ifdef CATCH_PLATFORM_MAC - static const char* failedString() { return "FAILED"; } - static const char* passedString() { return "PASSED"; } -#else - static const char* failedString() { return "failed"; } - static const char* passedString() { return "passed"; } -#endif - - void printSourceInfo() const { - Colour colourGuard( Colour::FileName ); - stream << result.getSourceInfo() << ':'; - } - - void printResultType( Colour::Code colour, std::string const& passOrFail ) const { - if( !passOrFail.empty() ) { - { - Colour colourGuard( colour ); - stream << ' ' << passOrFail; - } - stream << ':'; - } - } - - void printIssue( std::string const& issue ) const { - stream << ' ' << issue; - } - - void printExpressionWas() { - if( result.hasExpression() ) { - stream << ';'; - { - Colour colour( dimColour() ); - stream << " expression was:"; - } - printOriginalExpression(); - } - } - - void printOriginalExpression() const { - if( result.hasExpression() ) { - stream << ' ' << result.getExpression(); - } - } - - void printReconstructedExpression() const { - if( result.hasExpandedExpression() ) { - { - Colour colour( dimColour() ); - stream << " for: "; - } - stream << result.getExpandedExpression(); - } - } - - void printMessage() { - if ( itMessage != messages.end() ) { - stream << " '" << itMessage->message << '\''; - ++itMessage; - } - } - - void printRemainingMessages( Colour::Code colour = dimColour() ) { - if ( itMessage == messages.end() ) - return; - - // using messages.end() directly yields compilation error: - std::vector::const_iterator itEnd = messages.end(); - const std::size_t N = static_cast( std::distance( itMessage, itEnd ) ); - - { - Colour colourGuard( colour ); - stream << " with " << pluralise( N, "message" ) << ':'; - } - - for(; itMessage != itEnd; ) { - // If this assertion is a warning ignore any INFO messages - if( printInfoMessages || itMessage->type != ResultWas::Info ) { - stream << " '" << itMessage->message << '\''; - if ( ++itMessage != itEnd ) { - Colour colourGuard( dimColour() ); - stream << " and"; - } - } - } - } - - private: - std::ostream& stream; - AssertionStats const& stats; - AssertionResult const& result; - std::vector messages; - std::vector::const_iterator itMessage; - bool printInfoMessages; - }; - - // Colour, message variants: - // - white: No tests ran. - // - red: Failed [both/all] N test cases, failed [both/all] M assertions. - // - white: Passed [both/all] N test cases (no assertions). - // - red: Failed N tests cases, failed M assertions. - // - green: Passed [both/all] N tests cases with M assertions. - - std::string bothOrAll( std::size_t count ) const { - return count == 1 ? std::string() : count == 2 ? "both " : "all " ; - } - - void printTotals( const Totals& totals ) const { - if( totals.testCases.total() == 0 ) { - stream << "No tests ran."; - } - else if( totals.testCases.failed == totals.testCases.total() ) { - Colour colour( Colour::ResultError ); - const std::string qualify_assertions_failed = - totals.assertions.failed == totals.assertions.total() ? - bothOrAll( totals.assertions.failed ) : std::string(); - stream << - "Failed " << bothOrAll( totals.testCases.failed ) - << pluralise( totals.testCases.failed, "test case" ) << ", " - "failed " << qualify_assertions_failed << - pluralise( totals.assertions.failed, "assertion" ) << '.'; - } - else if( totals.assertions.total() == 0 ) { - stream << - "Passed " << bothOrAll( totals.testCases.total() ) - << pluralise( totals.testCases.total(), "test case" ) - << " (no assertions)."; - } - else if( totals.assertions.failed ) { - Colour colour( Colour::ResultError ); - stream << - "Failed " << pluralise( totals.testCases.failed, "test case" ) << ", " - "failed " << pluralise( totals.assertions.failed, "assertion" ) << '.'; - } - else { - Colour colour( Colour::ResultSuccess ); - stream << - "Passed " << bothOrAll( totals.testCases.passed ) - << pluralise( totals.testCases.passed, "test case" ) << - " with " << pluralise( totals.assertions.passed, "assertion" ) << '.'; - } - } - }; - - INTERNAL_CATCH_REGISTER_REPORTER( "compact", CompactReporter ) - -} // end namespace Catch - -namespace Catch { - // These are all here to avoid warnings about not having any out of line - // virtual methods - NonCopyable::~NonCopyable() {} - IShared::~IShared() {} - IStream::~IStream() CATCH_NOEXCEPT {} - FileStream::~FileStream() CATCH_NOEXCEPT {} - CoutStream::~CoutStream() CATCH_NOEXCEPT {} - DebugOutStream::~DebugOutStream() CATCH_NOEXCEPT {} - StreamBufBase::~StreamBufBase() CATCH_NOEXCEPT {} - IContext::~IContext() {} - IResultCapture::~IResultCapture() {} - ITestCase::~ITestCase() {} - ITestCaseRegistry::~ITestCaseRegistry() {} - IRegistryHub::~IRegistryHub() {} - IMutableRegistryHub::~IMutableRegistryHub() {} - IExceptionTranslator::~IExceptionTranslator() {} - IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() {} - IReporter::~IReporter() {} - IReporterFactory::~IReporterFactory() {} - IReporterRegistry::~IReporterRegistry() {} - IStreamingReporter::~IStreamingReporter() {} - AssertionStats::~AssertionStats() {} - SectionStats::~SectionStats() {} - TestCaseStats::~TestCaseStats() {} - TestGroupStats::~TestGroupStats() {} - TestRunStats::~TestRunStats() {} - CumulativeReporterBase::SectionNode::~SectionNode() {} - CumulativeReporterBase::~CumulativeReporterBase() {} - - StreamingReporterBase::~StreamingReporterBase() {} - ConsoleReporter::~ConsoleReporter() {} - CompactReporter::~CompactReporter() {} - IRunner::~IRunner() {} - IMutableContext::~IMutableContext() {} - IConfig::~IConfig() {} - XmlReporter::~XmlReporter() {} - JunitReporter::~JunitReporter() {} - TestRegistry::~TestRegistry() {} - FreeFunctionTestCase::~FreeFunctionTestCase() {} - IGeneratorInfo::~IGeneratorInfo() {} - IGeneratorsForTest::~IGeneratorsForTest() {} - WildcardPattern::~WildcardPattern() {} - TestSpec::Pattern::~Pattern() {} - TestSpec::NamePattern::~NamePattern() {} - TestSpec::TagPattern::~TagPattern() {} - TestSpec::ExcludedPattern::~ExcludedPattern() {} - Matchers::Impl::MatcherUntypedBase::~MatcherUntypedBase() {} - - void Config::dummy() {} - - namespace TestCaseTracking { - ITracker::~ITracker() {} - TrackerBase::~TrackerBase() {} - SectionTracker::~SectionTracker() {} - IndexTracker::~IndexTracker() {} - } -} - -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - -#endif - -#ifdef CATCH_CONFIG_MAIN -// #included from: internal/catch_default_main.hpp -#define TWOBLUECUBES_CATCH_DEFAULT_MAIN_HPP_INCLUDED - -#ifndef __OBJC__ - -#if defined(WIN32) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN) -// Standard C/C++ Win32 Unicode wmain entry point -extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) { -#else -// Standard C/C++ main entry point -int main (int argc, char * argv[]) { -#endif - - int result = Catch::Session().run( argc, argv ); - return ( result < 0xff ? result : 0xff ); -} - -#else // __OBJC__ - -// Objective-C entry point -int main (int argc, char * const argv[]) { -#if !CATCH_ARC_ENABLED - NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; -#endif - - Catch::registerTestMethods(); - int result = Catch::Session().run( argc, (char* const*)argv ); - -#if !CATCH_ARC_ENABLED - [pool drain]; -#endif - - return ( result < 0xff ? result : 0xff ); -} - -#endif // __OBJC__ - -#endif - -#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED -# undef CLARA_CONFIG_MAIN -#endif - -////// - -// If this config identifier is defined then all CATCH macros are prefixed with CATCH_ -#ifdef CATCH_CONFIG_PREFIX_ALL - -#if defined(CATCH_CONFIG_FAST_COMPILE) -#define CATCH_REQUIRE( expr ) INTERNAL_CATCH_TEST_NO_TRY( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, expr ) -#define CATCH_REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST_NO_TRY( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, expr ) -#else -#define CATCH_REQUIRE( expr ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, expr ) -#define CATCH_REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, expr ) -#endif - -#define CATCH_REQUIRE_THROWS( expr ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, "", expr ) -#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr ) -#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr ) -#define CATCH_REQUIRE_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( "CATCH_REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, expr ) - -#define CATCH_CHECK( expr ) INTERNAL_CATCH_TEST( "CATCH_CHECK", Catch::ResultDisposition::ContinueOnFailure, expr ) -#define CATCH_CHECK_FALSE( expr ) INTERNAL_CATCH_TEST( "CATCH_CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, expr ) -#define CATCH_CHECKED_IF( expr ) INTERNAL_CATCH_IF( "CATCH_CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, expr ) -#define CATCH_CHECKED_ELSE( expr ) INTERNAL_CATCH_ELSE( "CATCH_CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, expr ) -#define CATCH_CHECK_NOFAIL( expr ) INTERNAL_CATCH_TEST( "CATCH_CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, expr ) - -#define CATCH_CHECK_THROWS( expr ) INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, "", expr ) -#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr ) -#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr ) -#define CATCH_CHECK_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, expr ) - -#define CATCH_CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg ) - -#if defined(CATCH_CONFIG_FAST_COMPILE) -#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT_NO_TRY( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg ) -#else -#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg ) -#endif - -#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg ) -#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg ) -#define CATCH_SCOPED_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg ) -#define CATCH_CAPTURE( msg ) INTERNAL_CATCH_INFO( "CATCH_CAPTURE", #msg " := " << Catch::toString(msg) ) -#define CATCH_SCOPED_CAPTURE( msg ) INTERNAL_CATCH_INFO( "CATCH_CAPTURE", #msg " := " << Catch::toString(msg) ) - -#ifdef CATCH_CONFIG_VARIADIC_MACROS - #define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ ) - #define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ ) - #define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ ) - #define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ ) - #define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ ) - #define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ ) - #define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ ) - #define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ ) -#else - #define CATCH_TEST_CASE( name, description ) INTERNAL_CATCH_TESTCASE( name, description ) - #define CATCH_TEST_CASE_METHOD( className, name, description ) INTERNAL_CATCH_TEST_CASE_METHOD( className, name, description ) - #define CATCH_METHOD_AS_TEST_CASE( method, name, description ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, name, description ) - #define CATCH_REGISTER_TEST_CASE( function, name, description ) INTERNAL_CATCH_REGISTER_TESTCASE( function, name, description ) - #define CATCH_SECTION( name, description ) INTERNAL_CATCH_SECTION( name, description ) - #define CATCH_FAIL( msg ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, msg ) - #define CATCH_FAIL_CHECK( msg ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, msg ) - #define CATCH_SUCCEED( msg ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, msg ) -#endif -#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE( "", "" ) - -#define CATCH_REGISTER_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType ) -#define CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) - -#define CATCH_GENERATE( expr) INTERNAL_CATCH_GENERATE( expr ) - -// "BDD-style" convenience wrappers -#ifdef CATCH_CONFIG_VARIADIC_MACROS -#define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ ) -#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ ) -#else -#define CATCH_SCENARIO( name, tags ) CATCH_TEST_CASE( "Scenario: " name, tags ) -#define CATCH_SCENARIO_METHOD( className, name, tags ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " name, tags ) -#endif -#define CATCH_GIVEN( desc ) CATCH_SECTION( std::string( "Given: ") + desc, "" ) -#define CATCH_WHEN( desc ) CATCH_SECTION( std::string( " When: ") + desc, "" ) -#define CATCH_AND_WHEN( desc ) CATCH_SECTION( std::string( " And: ") + desc, "" ) -#define CATCH_THEN( desc ) CATCH_SECTION( std::string( " Then: ") + desc, "" ) -#define CATCH_AND_THEN( desc ) CATCH_SECTION( std::string( " And: ") + desc, "" ) - -// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required -#else - -#if defined(CATCH_CONFIG_FAST_COMPILE) -#define REQUIRE( expr ) INTERNAL_CATCH_TEST_NO_TRY( "REQUIRE", Catch::ResultDisposition::Normal, expr ) -#define REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST_NO_TRY( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, expr ) - -#else -#define REQUIRE( expr ) INTERNAL_CATCH_TEST( "REQUIRE", Catch::ResultDisposition::Normal, expr ) -#define REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, expr ) -#endif - -#define REQUIRE_THROWS( expr ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS", Catch::ResultDisposition::Normal, "", expr ) -#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr ) -#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr ) -#define REQUIRE_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( "REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, expr ) - -#define CHECK( expr ) INTERNAL_CATCH_TEST( "CHECK", Catch::ResultDisposition::ContinueOnFailure, expr ) -#define CHECK_FALSE( expr ) INTERNAL_CATCH_TEST( "CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, expr ) -#define CHECKED_IF( expr ) INTERNAL_CATCH_IF( "CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, expr ) -#define CHECKED_ELSE( expr ) INTERNAL_CATCH_ELSE( "CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, expr ) -#define CHECK_NOFAIL( expr ) INTERNAL_CATCH_TEST( "CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, expr ) - -#define CHECK_THROWS( expr ) INTERNAL_CATCH_THROWS( "CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, "", expr ) -#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr ) -#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( "CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr ) -#define CHECK_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, expr ) - -#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg ) - -#if defined(CATCH_CONFIG_FAST_COMPILE) -#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT_NO_TRY( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg ) -#else -#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg ) -#endif - -#define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg ) -#define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg ) -#define SCOPED_INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg ) -#define CAPTURE( msg ) INTERNAL_CATCH_INFO( "CAPTURE", #msg " := " << Catch::toString(msg) ) -#define SCOPED_CAPTURE( msg ) INTERNAL_CATCH_INFO( "CAPTURE", #msg " := " << Catch::toString(msg) ) - -#ifdef CATCH_CONFIG_VARIADIC_MACROS -#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ ) -#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ ) -#define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ ) -#define REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ ) -#define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ ) -#define FAIL( ... ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ ) -#define FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ ) -#define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ ) -#else -#define TEST_CASE( name, description ) INTERNAL_CATCH_TESTCASE( name, description ) - #define TEST_CASE_METHOD( className, name, description ) INTERNAL_CATCH_TEST_CASE_METHOD( className, name, description ) - #define METHOD_AS_TEST_CASE( method, name, description ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, name, description ) - #define REGISTER_TEST_CASE( method, name, description ) INTERNAL_CATCH_REGISTER_TESTCASE( method, name, description ) - #define SECTION( name, description ) INTERNAL_CATCH_SECTION( name, description ) - #define FAIL( msg ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, msg ) - #define FAIL_CHECK( msg ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, msg ) - #define SUCCEED( msg ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, msg ) -#endif -#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE( "", "" ) - -#define REGISTER_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType ) -#define REGISTER_LEGACY_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) - -#define GENERATE( expr) INTERNAL_CATCH_GENERATE( expr ) - -#endif - -#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) - -// "BDD-style" convenience wrappers -#ifdef CATCH_CONFIG_VARIADIC_MACROS -#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ ) -#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ ) -#else -#define SCENARIO( name, tags ) TEST_CASE( "Scenario: " name, tags ) -#define SCENARIO_METHOD( className, name, tags ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " name, tags ) -#endif -#define GIVEN( desc ) SECTION( std::string(" Given: ") + desc, "" ) -#define WHEN( desc ) SECTION( std::string(" When: ") + desc, "" ) -#define AND_WHEN( desc ) SECTION( std::string("And when: ") + desc, "" ) -#define THEN( desc ) SECTION( std::string(" Then: ") + desc, "" ) -#define AND_THEN( desc ) SECTION( std::string(" And: ") + desc, "" ) - -using Catch::Detail::Approx; - -// #included from: internal/catch_reenable_warnings.h - -#define TWOBLUECUBES_CATCH_REENABLE_WARNINGS_H_INCLUDED - -#ifdef __clang__ -# ifdef __ICC // icpc defines the __clang__ macro -# pragma warning(pop) -# else -# pragma clang diagnostic pop -# endif -#elif defined __GNUC__ -# pragma GCC diagnostic pop -#endif - -#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED - diff --git a/libnnpdf/tests/experiment_test.cc b/libnnpdf/tests/experiment_test.cc deleted file mode 100644 index 67f8457da6..0000000000 --- a/libnnpdf/tests/experiment_test.cc +++ /dev/null @@ -1,67 +0,0 @@ -#include "catch.hpp" - -#include "NNPDF/experiments.h" -#include "NNPDF/pathlib.h" -#include "NNPDF/lhapdfset.h" -using namespace NNPDF; -using namespace std; - -TEST_CASE("Experiment constructor", "[Experiment]") { - - const auto cd = CommonData::ReadFile( - get_data_path() + "commondata/DATA_NMC.dat", - get_data_path() + "commondata/systypes/SYSTYPE_NMC_DEFAULT.dat"); - - const auto fk = FKSet( - FKSet::parseOperator("NULL"), - {new FKTable{get_data_path() + "theory_162/fastkernel/FK_NMC.dat"}}); - - const LHAPDFSet pdf("NNPDF40_nnlo_as_01180", PDFSet::erType::ER_MCT0); - - const auto dset = DataSet{cd, fk}; - - // CHECKING COPY CONSTRUCTION - auto exp = Experiment{{dset}, "NMC"}; - auto exp2 = Experiment{exp}; - - REQUIRE(exp.GetNData() == exp2.GetNData()); - for (int i = 0; i < exp.GetNData(); i++) { - REQUIRE(exp.GetData()[i] == exp2.GetData()[i]); - for (int j = 0; j < exp.GetNData(); j++) - REQUIRE(exp.GetCovMat()(i, j) == exp2.GetCovMat()(i, j)); - } - - // CHECKING T0 - exp.SetT0(pdf); - exp2.SetT0(pdf); - - for (int i = 0; i < exp.GetNData(); i++) { - REQUIRE(exp.GetData()[i] == exp2.GetData()[i]); - for (int j = 0; j < exp.GetNData(); j++) { - REQUIRE(exp.GetCovMat()(i, j) == exp2.GetCovMat()(i, j)); - REQUIRE(exp.GetSqrtCov()(i, j) == exp2.GetSqrtCov()(i, j)); - } - } - - // CHECKING COPY AFTER T0 - auto exp3 = Experiment{exp}; - - for (int i = 0; i < exp.GetNData(); i++) { - REQUIRE(exp.GetData()[i] == exp3.GetData()[i]); - for (int j = 0; j < exp.GetNData(); j++) { - REQUIRE(exp.GetCovMat()(i, j) == exp3.GetCovMat()(i, j)); - REQUIRE(exp.GetSqrtCov()(i, j) == exp3.GetSqrtCov()(i, j)); - } - } - - // CHECKING FURTHER SET T0 - exp3.SetT0(pdf); - - for (int i = 0; i < exp.GetNData(); i++) { - REQUIRE(exp.GetData()[i] == exp3.GetData()[i]); - for (int j = 0; j < exp.GetNData(); j++) { - REQUIRE(exp.GetCovMat()(i, j) == exp3.GetCovMat()(i, j)); - REQUIRE(exp.GetSqrtCov()(i, j) == exp3.GetSqrtCov()(i, j)); - } - } -} diff --git a/libnnpdf/tests/main.cc b/libnnpdf/tests/main.cc deleted file mode 100644 index bc62b986e3..0000000000 --- a/libnnpdf/tests/main.cc +++ /dev/null @@ -1,3 +0,0 @@ -// main driver -#define CATCH_CONFIG_MAIN -#include "catch.hpp" diff --git a/libnnpdf/tests/test_utils.cc b/libnnpdf/tests/test_utils.cc deleted file mode 100644 index ad829d8fd9..0000000000 --- a/libnnpdf/tests/test_utils.cc +++ /dev/null @@ -1,16 +0,0 @@ -#include "catch.hpp" -#include "NNPDF/utils.h" - -using namespace NNPDF; - -TEST_CASE("Test joinpath", "[utils]"){ - REQUIRE(joinpath({""}) == ""); - REQUIRE(joinpath({}) == ""); - REQUIRE(joinpath({"a","b","cd"}) == "a/b/cd"); - REQUIRE(joinpath({"a","","b"}) == "a/b"); - REQUIRE(joinpath({"a","/b","c/"}) == "/b/c/"); - REQUIRE(joinpath({"/a","b","c/"}) == "/a/b/c/"); - auto comps = std::vector{"a", "b", "c"}; - REQUIRE(joinpath(comps) == "a/b/c"); - -} diff --git a/libnnpdf/wrapper/.gitignore b/libnnpdf/wrapper/.gitignore deleted file mode 100644 index fcb96da79f..0000000000 --- a/libnnpdf/wrapper/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -_sources -pylibs -setup.py diff --git a/libnnpdf/wrapper/CMakeLists.txt b/libnnpdf/wrapper/CMakeLists.txt deleted file mode 100644 index 0dd2a7615c..0000000000 --- a/libnnpdf/wrapper/CMakeLists.txt +++ /dev/null @@ -1,62 +0,0 @@ -find_package(SWIG 3.0.10 REQUIRED) -find_package(PythonInterp 3 REQUIRED) -find_package(PythonLibs 3 REQUIRED) - -execute_process( - COMMAND "${PYTHON_EXECUTABLE}" -c "if True: - import numpy as np - print(np.get_include())" - OUTPUT_VARIABLE NUMPY_INCLUDE - RESULT_VARIABLE ret - OUTPUT_STRIP_TRAILING_WHITESPACE) - -if(NOT ret EQUAL "0") - message(FATAL_ERROR "numpy not found") -endif() - -execute_process( - COMMAND "${PYTHON_EXECUTABLE}" -c "if True: - from distutils.sysconfig import get_python_lib; - print(get_python_lib(prefix=\"${CMAKE_INSTALL_PREFIX}\"))" - OUTPUT_VARIABLE PYTHON_SITE_PACKAGES - RESULT_VARIABLE ret - OUTPUT_STRIP_TRAILING_WHITESPACE) - -if(NOT ret EQUAL "0") - message(FATAL_ERROR "Could not get python compiler info") -endif() - -execute_process( - COMMAND "${PYTHON_EXECUTABLE}" -c "if True: - import sysconfig; - lcom = sysconfig.get_config_var(\"LDSHARED\"); - cc, _, flags = lcom.strip().partition(\" \"); - print(flags)" - OUTPUT_VARIABLE PYTHON_EXTENSION_LINKFLAGS - RESULT_VARIABLE ret - OUTPUT_STRIP_TRAILING_WHITESPACE) - -if(NOT ret EQUAL "0") - message(FATAL_ERROR "Could not get python sysconfig info") -endif() - -include(${SWIG_USE_FILE}) -include_directories(${NUMPY_INCLUDE}) -include_directories(${PYTHON_INCLUDE_DIRS}) - -set_source_files_properties(./src/nnpdf.i PROPERTIES CPLUSPLUS ON) -include_directories(../src) - -# Add swig module -SET(CMAKE_SWIG_FLAGS "-threads") -if (${CMAKE_VERSION} VERSION_LESS "3.8.0") - swig_add_module(nnpdf python ./src/nnpdf.i) -else() - swig_add_library(nnpdf LANGUAGE python SOURCES ./src/nnpdf.i) -endif() -swig_link_libraries(nnpdf ${PROJECT_NAME} ${PYTHON_EXTENSION_LINKFLAGS}) - -set(LIBNNPDF_WRAPPER_PREFIX ${PYTHON_SITE_PACKAGES}/NNPDF) -install(TARGETS _nnpdf DESTINATION ${LIBNNPDF_WRAPPER_PREFIX}) -install(FILES ${CMAKE_BINARY_DIR}/libnnpdf/wrapper/nnpdf.py DESTINATION ${LIBNNPDF_WRAPPER_PREFIX}) -install(FILES ${CMAKE_SOURCE_DIR}/libnnpdf/wrapper/src/__init__.py DESTINATION ${LIBNNPDF_WRAPPER_PREFIX}) diff --git a/libnnpdf/wrapper/README.md b/libnnpdf/wrapper/README.md deleted file mode 100644 index 3f19152b71..0000000000 --- a/libnnpdf/wrapper/README.md +++ /dev/null @@ -1,12 +0,0 @@ -SWIG wrappers -============= - -The wrappers here generate the `NNPDF` Python package, which is used within -validphys. They are normally compiled and installed as a part of the NNPDF -setup. - -See - -https://docs.nnpdf.science/get-started/installation.html - -For more details on the setup see `CMakeLists.txt`. diff --git a/libnnpdf/wrapper/src/__init__.py b/libnnpdf/wrapper/src/__init__.py deleted file mode 100644 index 390db8c7d2..0000000000 --- a/libnnpdf/wrapper/src/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .nnpdf import * diff --git a/libnnpdf/wrapper/src/include/excepthandler.i b/libnnpdf/wrapper/src/include/excepthandler.i deleted file mode 100644 index dc849597de..0000000000 --- a/libnnpdf/wrapper/src/include/excepthandler.i +++ /dev/null @@ -1,35 +0,0 @@ -%exception { - try { - $action - } - catch(NNPDF::FileError &_e) { - SWIG_exception(SWIG_IOError, const_cast(_e.what())); - } - catch(NNPDF::EvaluationError &_e) { - SWIG_exception(SWIG_ValueError, const_cast(_e.what())); - } - catch(NNPDF::InitError &_e) { - SWIG_exception(SWIG_RuntimeError, const_cast(_e.what())); - } - catch(NNPDF::RangeError &_e) { - SWIG_exception(SWIG_ValueError, const_cast(_e.what())); - } - catch(NNPDF::LengthError &_e) { - SWIG_exception(SWIG_IndexError, const_cast(_e.what())); - } - catch(NNPDF::LogError &_e) { - SWIG_exception(SWIG_RuntimeError, const_cast(_e.what())); - } - catch(NNPDF::UserError &_e) { - SWIG_exception(SWIG_ValueError, const_cast(_e.what())); - } - catch(NNPDF::RuntimeException &_e) { - SWIG_exception(SWIG_RuntimeError, const_cast(_e.what())); - } - catch(NNPDF::LogicException &_e) { - SWIG_exception(SWIG_ValueError, const_cast(_e.what())); - } - catch (const std::exception& e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } -} diff --git a/libnnpdf/wrapper/src/include/numpy.i b/libnnpdf/wrapper/src/include/numpy.i deleted file mode 100644 index e4bdead0ac..0000000000 --- a/libnnpdf/wrapper/src/include/numpy.i +++ /dev/null @@ -1,3162 +0,0 @@ -/* -*- C -*- (not really, but good for syntax highlighting) */ - -/* - * Copyright (c) 2005-2015, NumPy Developers. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * * Neither the name of the NumPy Developers nor the names of any - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifdef SWIGPYTHON - -%{ -#ifndef SWIG_FILE_WITH_INIT -#define NO_IMPORT_ARRAY -#endif -#include "stdio.h" -#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION -#include -%} - -/**********************************************************************/ - -%fragment("NumPy_Backward_Compatibility", "header") -{ -%#if NPY_API_VERSION < 0x00000007 -%#define NPY_ARRAY_DEFAULT NPY_DEFAULT -%#define NPY_ARRAY_FARRAY NPY_FARRAY -%#define NPY_FORTRANORDER NPY_FORTRAN -%#endif -} - -/**********************************************************************/ - -/* The following code originally appeared in - * enthought/kiva/agg/src/numeric.i written by Eric Jones. It was - * translated from C++ to C by John Hunter. Bill Spotz has modified - * it to fix some minor bugs, upgrade from Numeric to numpy (all - * versions), add some comments and functionality, and convert from - * direct code insertion to SWIG fragments. - */ - -%fragment("NumPy_Macros", "header") -{ -/* Macros to extract array attributes. - */ -%#if NPY_API_VERSION < 0x00000007 -%#define is_array(a) ((a) && PyArray_Check((PyArrayObject*)a)) -%#define array_type(a) (int)(PyArray_TYPE((PyArrayObject*)a)) -%#define array_numdims(a) (((PyArrayObject*)a)->nd) -%#define array_dimensions(a) (((PyArrayObject*)a)->dimensions) -%#define array_size(a,i) (((PyArrayObject*)a)->dimensions[i]) -%#define array_strides(a) (((PyArrayObject*)a)->strides) -%#define array_stride(a,i) (((PyArrayObject*)a)->strides[i]) -%#define array_data(a) (((PyArrayObject*)a)->data) -%#define array_descr(a) (((PyArrayObject*)a)->descr) -%#define array_flags(a) (((PyArrayObject*)a)->flags) -%#define array_enableflags(a,f) (((PyArrayObject*)a)->flags) = f -%#else -%#define is_array(a) ((a) && PyArray_Check(a)) -%#define array_type(a) PyArray_TYPE((PyArrayObject*)a) -%#define array_numdims(a) PyArray_NDIM((PyArrayObject*)a) -%#define array_dimensions(a) PyArray_DIMS((PyArrayObject*)a) -%#define array_strides(a) PyArray_STRIDES((PyArrayObject*)a) -%#define array_stride(a,i) PyArray_STRIDE((PyArrayObject*)a,i) -%#define array_size(a,i) PyArray_DIM((PyArrayObject*)a,i) -%#define array_data(a) PyArray_DATA((PyArrayObject*)a) -%#define array_descr(a) PyArray_DESCR((PyArrayObject*)a) -%#define array_flags(a) PyArray_FLAGS((PyArrayObject*)a) -%#define array_enableflags(a,f) PyArray_ENABLEFLAGS((PyArrayObject*)a,f) -%#endif -%#define array_is_contiguous(a) (PyArray_ISCONTIGUOUS((PyArrayObject*)a)) -%#define array_is_native(a) (PyArray_ISNOTSWAPPED((PyArrayObject*)a)) -%#define array_is_fortran(a) (PyArray_IS_F_CONTIGUOUS((PyArrayObject*)a)) -} - -/**********************************************************************/ - -%fragment("NumPy_Utilities", - "header") -{ - /* Given a PyObject, return a string describing its type. - */ - const char* pytype_string(PyObject* py_obj) - { - if (py_obj == NULL ) return "C NULL value"; - if (py_obj == Py_None ) return "Python None" ; - if (PyCallable_Check(py_obj)) return "callable" ; - if (PyString_Check( py_obj)) return "string" ; - if (PyInt_Check( py_obj)) return "int" ; - if (PyFloat_Check( py_obj)) return "float" ; - if (PyDict_Check( py_obj)) return "dict" ; - if (PyList_Check( py_obj)) return "list" ; - if (PyTuple_Check( py_obj)) return "tuple" ; -%#if PY_MAJOR_VERSION < 3 - if (PyFile_Check( py_obj)) return "file" ; - if (PyModule_Check( py_obj)) return "module" ; - if (PyInstance_Check(py_obj)) return "instance" ; -%#endif - - return "unknown type"; - } - - /* Given a NumPy typecode, return a string describing the type. - */ - const char* typecode_string(int typecode) - { - static const char* type_names[25] = {"bool", - "byte", - "unsigned byte", - "short", - "unsigned short", - "int", - "unsigned int", - "long", - "unsigned long", - "long long", - "unsigned long long", - "float", - "double", - "long double", - "complex float", - "complex double", - "complex long double", - "object", - "string", - "unicode", - "void", - "ntypes", - "notype", - "char", - "unknown"}; - return typecode < 24 ? type_names[typecode] : type_names[24]; - } - - /* Make sure input has correct numpy type. This now just calls - PyArray_EquivTypenums(). - */ - int type_match(int actual_type, - int desired_type) - { - return PyArray_EquivTypenums(actual_type, desired_type); - } - -%#ifdef SWIGPY_USE_CAPSULE - void free_cap(PyObject * cap) - { - void* array = (void*) PyCapsule_GetPointer(cap,SWIGPY_CAPSULE_NAME); - if (array != NULL) free(array); - } -%#endif - - -} - -/**********************************************************************/ - -%fragment("NumPy_Object_to_Array", - "header", - fragment="NumPy_Backward_Compatibility", - fragment="NumPy_Macros", - fragment="NumPy_Utilities") -{ - /* Given a PyObject pointer, cast it to a PyArrayObject pointer if - * legal. If not, set the python error string appropriately and - * return NULL. - */ - PyArrayObject* obj_to_array_no_conversion(PyObject* input, - int typecode) - { - PyArrayObject* ary = NULL; - if (is_array(input) && (typecode == NPY_NOTYPE || - PyArray_EquivTypenums(array_type(input), typecode))) - { - ary = (PyArrayObject*) input; - } - else if is_array(input) - { - const char* desired_type = typecode_string(typecode); - const char* actual_type = typecode_string(array_type(input)); - PyErr_Format(PyExc_TypeError, - "Array of type '%s' required. Array of type '%s' given", - desired_type, actual_type); - ary = NULL; - } - else - { - const char* desired_type = typecode_string(typecode); - const char* actual_type = pytype_string(input); - PyErr_Format(PyExc_TypeError, - "Array of type '%s' required. A '%s' was given", - desired_type, - actual_type); - ary = NULL; - } - return ary; - } - - /* Convert the given PyObject to a NumPy array with the given - * typecode. On success, return a valid PyArrayObject* with the - * correct type. On failure, the python error string will be set and - * the routine returns NULL. - */ - PyArrayObject* obj_to_array_allow_conversion(PyObject* input, - int typecode, - int* is_new_object) - { - PyArrayObject* ary = NULL; - PyObject* py_obj; - if (is_array(input) && (typecode == NPY_NOTYPE || - PyArray_EquivTypenums(array_type(input),typecode))) - { - ary = (PyArrayObject*) input; - *is_new_object = 0; - } - else - { - py_obj = PyArray_FROMANY(input, typecode, 0, 0, NPY_ARRAY_DEFAULT); - /* If NULL, PyArray_FromObject will have set python error value.*/ - ary = (PyArrayObject*) py_obj; - *is_new_object = 1; - } - return ary; - } - - /* Given a PyArrayObject, check to see if it is contiguous. If so, - * return the input pointer and flag it as not a new object. If it is - * not contiguous, create a new PyArrayObject using the original data, - * flag it as a new object and return the pointer. - */ - PyArrayObject* make_contiguous(PyArrayObject* ary, - int* is_new_object, - int min_dims, - int max_dims) - { - PyArrayObject* result; - if (array_is_contiguous(ary)) - { - result = ary; - *is_new_object = 0; - } - else - { - result = (PyArrayObject*) PyArray_ContiguousFromObject((PyObject*)ary, - array_type(ary), - min_dims, - max_dims); - *is_new_object = 1; - } - return result; - } - - /* Given a PyArrayObject, check to see if it is Fortran-contiguous. - * If so, return the input pointer, but do not flag it as not a new - * object. If it is not Fortran-contiguous, create a new - * PyArrayObject using the original data, flag it as a new object - * and return the pointer. - */ - PyArrayObject* make_fortran(PyArrayObject* ary, - int* is_new_object) - { - PyArrayObject* result; - if (array_is_fortran(ary)) - { - result = ary; - *is_new_object = 0; - } - else - { - Py_INCREF(array_descr(ary)); - result = (PyArrayObject*) PyArray_FromArray(ary, - array_descr(ary), - NPY_ARRAY_F_CONTIGUOUS); - *is_new_object = 1; - } - return result; - } - - /* Convert a given PyObject to a contiguous PyArrayObject of the - * specified type. If the input object is not a contiguous - * PyArrayObject, a new one will be created and the new object flag - * will be set. - */ - PyArrayObject* obj_to_array_contiguous_allow_conversion(PyObject* input, - int typecode, - int* is_new_object) - { - int is_new1 = 0; - int is_new2 = 0; - PyArrayObject* ary2; - PyArrayObject* ary1 = obj_to_array_allow_conversion(input, - typecode, - &is_new1); - if (ary1) - { - ary2 = make_contiguous(ary1, &is_new2, 0, 0); - if ( is_new1 && is_new2) - { - Py_DECREF(ary1); - } - ary1 = ary2; - } - *is_new_object = is_new1 || is_new2; - return ary1; - } - - /* Convert a given PyObject to a Fortran-ordered PyArrayObject of the - * specified type. If the input object is not a Fortran-ordered - * PyArrayObject, a new one will be created and the new object flag - * will be set. - */ - PyArrayObject* obj_to_array_fortran_allow_conversion(PyObject* input, - int typecode, - int* is_new_object) - { - int is_new1 = 0; - int is_new2 = 0; - PyArrayObject* ary2; - PyArrayObject* ary1 = obj_to_array_allow_conversion(input, - typecode, - &is_new1); - if (ary1) - { - ary2 = make_fortran(ary1, &is_new2); - if (is_new1 && is_new2) - { - Py_DECREF(ary1); - } - ary1 = ary2; - } - *is_new_object = is_new1 || is_new2; - return ary1; - } -} /* end fragment */ - -/**********************************************************************/ - -%fragment("NumPy_Array_Requirements", - "header", - fragment="NumPy_Backward_Compatibility", - fragment="NumPy_Macros") -{ - /* Test whether a python object is contiguous. If array is - * contiguous, return 1. Otherwise, set the python error string and - * return 0. - */ - int require_contiguous(PyArrayObject* ary) - { - int contiguous = 1; - if (!array_is_contiguous(ary)) - { - PyErr_SetString(PyExc_TypeError, - "Array must be contiguous. A non-contiguous array was given"); - contiguous = 0; - } - return contiguous; - } - - /* Test whether a python object is (C_ or F_) contiguous. If array is - * contiguous, return 1. Otherwise, set the python error string and - * return 0. - */ - int require_c_or_f_contiguous(PyArrayObject* ary) - { - int contiguous = 1; - if (!(array_is_contiguous(ary) || array_is_fortran(ary))) - { - PyErr_SetString(PyExc_TypeError, - "Array must be contiguous (C_ or F_). A non-contiguous array was given"); - contiguous = 0; - } - return contiguous; - } - - /* Require that a numpy array is not byte-swapped. If the array is - * not byte-swapped, return 1. Otherwise, set the python error string - * and return 0. - */ - int require_native(PyArrayObject* ary) - { - int native = 1; - if (!array_is_native(ary)) - { - PyErr_SetString(PyExc_TypeError, - "Array must have native byteorder. " - "A byte-swapped array was given"); - native = 0; - } - return native; - } - - /* Require the given PyArrayObject to have a specified number of - * dimensions. If the array has the specified number of dimensions, - * return 1. Otherwise, set the python error string and return 0. - */ - int require_dimensions(PyArrayObject* ary, - int exact_dimensions) - { - int success = 1; - if (array_numdims(ary) != exact_dimensions) - { - PyErr_Format(PyExc_TypeError, - "Array must have %d dimensions. Given array has %d dimensions", - exact_dimensions, - array_numdims(ary)); - success = 0; - } - return success; - } - - /* Require the given PyArrayObject to have one of a list of specified - * number of dimensions. If the array has one of the specified number - * of dimensions, return 1. Otherwise, set the python error string - * and return 0. - */ - int require_dimensions_n(PyArrayObject* ary, - int* exact_dimensions, - int n) - { - int success = 0; - int i; - char dims_str[255] = ""; - char s[255]; - for (i = 0; i < n && !success; i++) - { - if (array_numdims(ary) == exact_dimensions[i]) - { - success = 1; - } - } - if (!success) - { - for (i = 0; i < n-1; i++) - { - sprintf(s, "%d, ", exact_dimensions[i]); - strcat(dims_str,s); - } - sprintf(s, " or %d", exact_dimensions[n-1]); - strcat(dims_str,s); - PyErr_Format(PyExc_TypeError, - "Array must have %s dimensions. Given array has %d dimensions", - dims_str, - array_numdims(ary)); - } - return success; - } - - /* Require the given PyArrayObject to have a specified shape. If the - * array has the specified shape, return 1. Otherwise, set the python - * error string and return 0. - */ - int require_size(PyArrayObject* ary, - npy_intp* size, - int n) - { - int i; - int success = 1; - int len; - char desired_dims[255] = "["; - char s[255]; - char actual_dims[255] = "["; - for(i=0; i < n;i++) - { - if (size[i] != -1 && size[i] != array_size(ary,i)) - { - success = 0; - } - } - if (!success) - { - for (i = 0; i < n; i++) - { - if (size[i] == -1) - { - sprintf(s, "*,"); - } - else - { - sprintf(s, "%ld,", (long int)size[i]); - } - strcat(desired_dims,s); - } - len = strlen(desired_dims); - desired_dims[len-1] = ']'; - for (i = 0; i < n; i++) - { - sprintf(s, "%ld,", (long int)array_size(ary,i)); - strcat(actual_dims,s); - } - len = strlen(actual_dims); - actual_dims[len-1] = ']'; - PyErr_Format(PyExc_TypeError, - "Array must have shape of %s. Given array has shape of %s", - desired_dims, - actual_dims); - } - return success; - } - - /* Require the given PyArrayObject to to be Fortran ordered. If the - * the PyArrayObject is already Fortran ordered, do nothing. Else, - * set the Fortran ordering flag and recompute the strides. - */ - int require_fortran(PyArrayObject* ary) - { - int success = 1; - int nd = array_numdims(ary); - int i; - npy_intp * strides = array_strides(ary); - if (array_is_fortran(ary)) return success; - /* Set the Fortran ordered flag */ - array_enableflags(ary,NPY_ARRAY_FARRAY); - /* Recompute the strides */ - strides[0] = strides[nd-1]; - for (i=1; i < nd; ++i) - strides[i] = strides[i-1] * array_size(ary,i-1); - return success; - } -} - -/* Combine all NumPy fragments into one for convenience */ -%fragment("NumPy_Fragments", - "header", - fragment="NumPy_Backward_Compatibility", - fragment="NumPy_Macros", - fragment="NumPy_Utilities", - fragment="NumPy_Object_to_Array", - fragment="NumPy_Array_Requirements") -{ -} - -/* End John Hunter translation (with modifications by Bill Spotz) - */ - -/* %numpy_typemaps() macro - * - * This macro defines a family of 75 typemaps that allow C arguments - * of the form - * - * 1. (DATA_TYPE IN_ARRAY1[ANY]) - * 2. (DATA_TYPE* IN_ARRAY1, DIM_TYPE DIM1) - * 3. (DIM_TYPE DIM1, DATA_TYPE* IN_ARRAY1) - * - * 4. (DATA_TYPE IN_ARRAY2[ANY][ANY]) - * 5. (DATA_TYPE* IN_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - * 6. (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_ARRAY2) - * 7. (DATA_TYPE* IN_FARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - * 8. (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_FARRAY2) - * - * 9. (DATA_TYPE IN_ARRAY3[ANY][ANY][ANY]) - * 10. (DATA_TYPE* IN_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) - * 11. (DATA_TYPE** IN_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) - * 12. (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* IN_ARRAY3) - * 13. (DATA_TYPE* IN_FARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) - * 14. (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* IN_FARRAY3) - * - * 15. (DATA_TYPE IN_ARRAY4[ANY][ANY][ANY][ANY]) - * 16. (DATA_TYPE* IN_ARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) - * 17. (DATA_TYPE** IN_ARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) - * 18. (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, , DIM_TYPE DIM4, DATA_TYPE* IN_ARRAY4) - * 19. (DATA_TYPE* IN_FARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) - * 20. (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4, DATA_TYPE* IN_FARRAY4) - * - * 21. (DATA_TYPE INPLACE_ARRAY1[ANY]) - * 22. (DATA_TYPE* INPLACE_ARRAY1, DIM_TYPE DIM1) - * 23. (DIM_TYPE DIM1, DATA_TYPE* INPLACE_ARRAY1) - * - * 24. (DATA_TYPE INPLACE_ARRAY2[ANY][ANY]) - * 25. (DATA_TYPE* INPLACE_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - * 26. (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_ARRAY2) - * 27. (DATA_TYPE* INPLACE_FARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - * 28. (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_FARRAY2) - * - * 29. (DATA_TYPE INPLACE_ARRAY3[ANY][ANY][ANY]) - * 30. (DATA_TYPE* INPLACE_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) - * 31. (DATA_TYPE** INPLACE_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) - * 32. (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* INPLACE_ARRAY3) - * 33. (DATA_TYPE* INPLACE_FARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) - * 34. (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* INPLACE_FARRAY3) - * - * 35. (DATA_TYPE INPLACE_ARRAY4[ANY][ANY][ANY][ANY]) - * 36. (DATA_TYPE* INPLACE_ARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) - * 37. (DATA_TYPE** INPLACE_ARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) - * 38. (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4, DATA_TYPE* INPLACE_ARRAY4) - * 39. (DATA_TYPE* INPLACE_FARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) - * 40. (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4, DATA_TYPE* INPLACE_FARRAY4) - * - * 41. (DATA_TYPE ARGOUT_ARRAY1[ANY]) - * 42. (DATA_TYPE* ARGOUT_ARRAY1, DIM_TYPE DIM1) - * 43. (DIM_TYPE DIM1, DATA_TYPE* ARGOUT_ARRAY1) - * - * 44. (DATA_TYPE ARGOUT_ARRAY2[ANY][ANY]) - * - * 45. (DATA_TYPE ARGOUT_ARRAY3[ANY][ANY][ANY]) - * - * 46. (DATA_TYPE ARGOUT_ARRAY4[ANY][ANY][ANY][ANY]) - * - * 47. (DATA_TYPE** ARGOUTVIEW_ARRAY1, DIM_TYPE* DIM1) - * 48. (DIM_TYPE* DIM1, DATA_TYPE** ARGOUTVIEW_ARRAY1) - * - * 49. (DATA_TYPE** ARGOUTVIEW_ARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2) - * 50. (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEW_ARRAY2) - * 51. (DATA_TYPE** ARGOUTVIEW_FARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2) - * 52. (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEW_FARRAY2) - * - * 53. (DATA_TYPE** ARGOUTVIEW_ARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3) - * 54. (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DATA_TYPE** ARGOUTVIEW_ARRAY3) - * 55. (DATA_TYPE** ARGOUTVIEW_FARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3) - * 56. (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DATA_TYPE** ARGOUTVIEW_FARRAY3) - * - * 57. (DATA_TYPE** ARGOUTVIEW_ARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4) - * 58. (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4, DATA_TYPE** ARGOUTVIEW_ARRAY4) - * 59. (DATA_TYPE** ARGOUTVIEW_FARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4) - * 60. (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4, DATA_TYPE** ARGOUTVIEW_FARRAY4) - * - * 61. (DATA_TYPE** ARGOUTVIEWM_ARRAY1, DIM_TYPE* DIM1) - * 62. (DIM_TYPE* DIM1, DATA_TYPE** ARGOUTVIEWM_ARRAY1) - * - * 63. (DATA_TYPE** ARGOUTVIEWM_ARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2) - * 64. (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEWM_ARRAY2) - * 65. (DATA_TYPE** ARGOUTVIEWM_FARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2) - * 66. (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEWM_FARRAY2) - * - * 67. (DATA_TYPE** ARGOUTVIEWM_ARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3) - * 68. (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DATA_TYPE** ARGOUTVIEWM_ARRAY3) - * 69. (DATA_TYPE** ARGOUTVIEWM_FARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3) - * 70. (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DATA_TYPE** ARGOUTVIEWM_FARRAY3) - * - * 71. (DATA_TYPE** ARGOUTVIEWM_ARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4) - * 72. (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4, DATA_TYPE** ARGOUTVIEWM_ARRAY4) - * 73. (DATA_TYPE** ARGOUTVIEWM_FARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4) - * 74. (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4, DATA_TYPE** ARGOUTVIEWM_FARRAY4) - * - * 75. (DATA_TYPE* INPLACE_ARRAY_FLAT, DIM_TYPE DIM_FLAT) - * - * where "DATA_TYPE" is any type supported by the NumPy module, and - * "DIM_TYPE" is any int-like type suitable for specifying dimensions. - * The difference between "ARRAY" typemaps and "FARRAY" typemaps is - * that the "FARRAY" typemaps expect Fortran ordering of - * multidimensional arrays. In python, the dimensions will not need - * to be specified (except for the "DATA_TYPE* ARGOUT_ARRAY1" - * typemaps). The IN_ARRAYs can be a numpy array or any sequence that - * can be converted to a numpy array of the specified type. The - * INPLACE_ARRAYs must be numpy arrays of the appropriate type. The - * ARGOUT_ARRAYs will be returned as new numpy arrays of the - * appropriate type. - * - * These typemaps can be applied to existing functions using the - * %apply directive. For example: - * - * %apply (double* IN_ARRAY1, int DIM1) {(double* series, int length)}; - * double prod(double* series, int length); - * - * %apply (int DIM1, int DIM2, double* INPLACE_ARRAY2) - * {(int rows, int cols, double* matrix )}; - * void floor(int rows, int cols, double* matrix, double f); - * - * %apply (double IN_ARRAY3[ANY][ANY][ANY]) - * {(double tensor[2][2][2] )}; - * %apply (double ARGOUT_ARRAY3[ANY][ANY][ANY]) - * {(double low[2][2][2] )}; - * %apply (double ARGOUT_ARRAY3[ANY][ANY][ANY]) - * {(double upp[2][2][2] )}; - * void luSplit(double tensor[2][2][2], - * double low[2][2][2], - * double upp[2][2][2] ); - * - * or directly with - * - * double prod(double* IN_ARRAY1, int DIM1); - * - * void floor(int DIM1, int DIM2, double* INPLACE_ARRAY2, double f); - * - * void luSplit(double IN_ARRAY3[ANY][ANY][ANY], - * double ARGOUT_ARRAY3[ANY][ANY][ANY], - * double ARGOUT_ARRAY3[ANY][ANY][ANY]); - */ - -%define %numpy_typemaps(DATA_TYPE, DATA_TYPECODE, DIM_TYPE) - -/************************/ -/* Input Array Typemaps */ -/************************/ - -/* Typemap suite for (DATA_TYPE IN_ARRAY1[ANY]) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE IN_ARRAY1[ANY]) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE IN_ARRAY1[ANY]) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[1] = { $1_dim0 }; - array = obj_to_array_contiguous_allow_conversion($input, - DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 1) || - !require_size(array, size, 1)) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} -%typemap(freearg) - (DATA_TYPE IN_ARRAY1[ANY]) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DATA_TYPE* IN_ARRAY1, DIM_TYPE DIM1) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* IN_ARRAY1, DIM_TYPE DIM1) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* IN_ARRAY1, DIM_TYPE DIM1) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[1] = { -1 }; - array = obj_to_array_contiguous_allow_conversion($input, - DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 1) || - !require_size(array, size, 1)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); -} -%typemap(freearg) - (DATA_TYPE* IN_ARRAY1, DIM_TYPE DIM1) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DIM_TYPE DIM1, DATA_TYPE* IN_ARRAY1) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DATA_TYPE* IN_ARRAY1) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DATA_TYPE* IN_ARRAY1) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[1] = {-1}; - array = obj_to_array_contiguous_allow_conversion($input, - DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 1) || - !require_size(array, size, 1)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DATA_TYPE*) array_data(array); -} -%typemap(freearg) - (DIM_TYPE DIM1, DATA_TYPE* IN_ARRAY1) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DATA_TYPE IN_ARRAY2[ANY][ANY]) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE IN_ARRAY2[ANY][ANY]) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE IN_ARRAY2[ANY][ANY]) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[2] = { $1_dim0, $1_dim1 }; - array = obj_to_array_contiguous_allow_conversion($input, - DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 2) || - !require_size(array, size, 2)) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} -%typemap(freearg) - (DATA_TYPE IN_ARRAY2[ANY][ANY]) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DATA_TYPE* IN_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* IN_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* IN_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[2] = { -1, -1 }; - array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 2) || - !require_size(array, size, 2)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); - $3 = (DIM_TYPE) array_size(array,1); -} -%typemap(freearg) - (DATA_TYPE* IN_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_ARRAY2) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_ARRAY2) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_ARRAY2) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[2] = { -1, -1 }; - array = obj_to_array_contiguous_allow_conversion($input, - DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 2) || - !require_size(array, size, 2)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DIM_TYPE) array_size(array,1); - $3 = (DATA_TYPE*) array_data(array); -} -%typemap(freearg) - (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_ARRAY2) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DATA_TYPE* IN_FARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* IN_FARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* IN_FARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[2] = { -1, -1 }; - array = obj_to_array_fortran_allow_conversion($input, - DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 2) || - !require_size(array, size, 2) || !require_fortran(array)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); - $3 = (DIM_TYPE) array_size(array,1); -} -%typemap(freearg) - (DATA_TYPE* IN_FARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_FARRAY2) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_FARRAY2) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_FARRAY2) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[2] = { -1, -1 }; - array = obj_to_array_fortran_allow_conversion($input, - DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 2) || - !require_size(array, size, 2) || !require_fortran(array)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DIM_TYPE) array_size(array,1); - $3 = (DATA_TYPE*) array_data(array); -} -%typemap(freearg) - (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_FARRAY2) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DATA_TYPE IN_ARRAY3[ANY][ANY][ANY]) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE IN_ARRAY3[ANY][ANY][ANY]) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE IN_ARRAY3[ANY][ANY][ANY]) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[3] = { $1_dim0, $1_dim1, $1_dim2 }; - array = obj_to_array_contiguous_allow_conversion($input, - DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 3) || - !require_size(array, size, 3)) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} -%typemap(freearg) - (DATA_TYPE IN_ARRAY3[ANY][ANY][ANY]) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DATA_TYPE* IN_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, - * DIM_TYPE DIM3) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* IN_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* IN_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[3] = { -1, -1, -1 }; - array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 3) || - !require_size(array, size, 3)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); - $3 = (DIM_TYPE) array_size(array,1); - $4 = (DIM_TYPE) array_size(array,2); -} -%typemap(freearg) - (DATA_TYPE* IN_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DATA_TYPE** IN_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, - * DIM_TYPE DIM3) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE** IN_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) -{ - /* for now, only concerned with lists */ - $1 = PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE** IN_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) - (DATA_TYPE** array=NULL, PyArrayObject** object_array=NULL, int* is_new_object_array=NULL) -{ - npy_intp size[2] = { -1, -1 }; - PyArrayObject* temp_array; - Py_ssize_t i; - int is_new_object; - - /* length of the list */ - $2 = PyList_Size($input); - - /* the arrays */ - array = (DATA_TYPE **)malloc($2*sizeof(DATA_TYPE *)); - object_array = (PyArrayObject **)calloc($2,sizeof(PyArrayObject *)); - is_new_object_array = (int *)calloc($2,sizeof(int)); - - if (array == NULL || object_array == NULL || is_new_object_array == NULL) - { - SWIG_fail; - } - - for (i=0; i<$2; i++) - { - temp_array = obj_to_array_contiguous_allow_conversion(PySequence_GetItem($input,i), DATA_TYPECODE, &is_new_object); - - /* the new array must be stored so that it can be destroyed in freearg */ - object_array[i] = temp_array; - is_new_object_array[i] = is_new_object; - - if (!temp_array || !require_dimensions(temp_array, 2)) SWIG_fail; - - /* store the size of the first array in the list, then use that for comparison. */ - if (i == 0) - { - size[0] = array_size(temp_array,0); - size[1] = array_size(temp_array,1); - } - - if (!require_size(temp_array, size, 2)) SWIG_fail; - - array[i] = (DATA_TYPE*) array_data(temp_array); - } - - $1 = (DATA_TYPE**) array; - $3 = (DIM_TYPE) size[0]; - $4 = (DIM_TYPE) size[1]; -} -%typemap(freearg) - (DATA_TYPE** IN_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) -{ - Py_ssize_t i; - - if (array$argnum!=NULL) free(array$argnum); - - /*freeing the individual arrays if needed */ - if (object_array$argnum!=NULL) - { - if (is_new_object_array$argnum!=NULL) - { - for (i=0; i<$2; i++) - { - if (object_array$argnum[i] != NULL && is_new_object_array$argnum[i]) - { Py_DECREF(object_array$argnum[i]); } - } - free(is_new_object_array$argnum); - } - free(object_array$argnum); - } -} - -/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, - * DATA_TYPE* IN_ARRAY3) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* IN_ARRAY3) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* IN_ARRAY3) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[3] = { -1, -1, -1 }; - array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 3) || - !require_size(array, size, 3)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DIM_TYPE) array_size(array,1); - $3 = (DIM_TYPE) array_size(array,2); - $4 = (DATA_TYPE*) array_data(array); -} -%typemap(freearg) - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* IN_ARRAY3) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DATA_TYPE* IN_FARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, - * DIM_TYPE DIM3) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* IN_FARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* IN_FARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[3] = { -1, -1, -1 }; - array = obj_to_array_fortran_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 3) || - !require_size(array, size, 3) | !require_fortran(array)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); - $3 = (DIM_TYPE) array_size(array,1); - $4 = (DIM_TYPE) array_size(array,2); -} -%typemap(freearg) - (DATA_TYPE* IN_FARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, - * DATA_TYPE* IN_FARRAY3) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* IN_FARRAY3) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* IN_FARRAY3) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[3] = { -1, -1, -1 }; - array = obj_to_array_fortran_allow_conversion($input, - DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 3) || - !require_size(array, size, 3) || !require_fortran(array)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DIM_TYPE) array_size(array,1); - $3 = (DIM_TYPE) array_size(array,2); - $4 = (DATA_TYPE*) array_data(array); -} -%typemap(freearg) - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* IN_FARRAY3) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DATA_TYPE IN_ARRAY4[ANY][ANY][ANY][ANY]) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE IN_ARRAY4[ANY][ANY][ANY][ANY]) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE IN_ARRAY4[ANY][ANY][ANY][ANY]) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[4] = { $1_dim0, $1_dim1, $1_dim2 , $1_dim3}; - array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 4) || - !require_size(array, size, 4)) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} -%typemap(freearg) - (DATA_TYPE IN_ARRAY4[ANY][ANY][ANY][ANY]) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DATA_TYPE* IN_ARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, - * DIM_TYPE DIM3, DIM_TYPE DIM4) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* IN_ARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* IN_ARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[4] = { -1, -1, -1, -1 }; - array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 4) || - !require_size(array, size, 4)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); - $3 = (DIM_TYPE) array_size(array,1); - $4 = (DIM_TYPE) array_size(array,2); - $5 = (DIM_TYPE) array_size(array,3); -} -%typemap(freearg) - (DATA_TYPE* IN_ARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DATA_TYPE** IN_ARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, - * DIM_TYPE DIM3, DIM_TYPE DIM4) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE** IN_ARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) -{ - /* for now, only concerned with lists */ - $1 = PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE** IN_ARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) - (DATA_TYPE** array=NULL, PyArrayObject** object_array=NULL, int* is_new_object_array=NULL) -{ - npy_intp size[3] = { -1, -1, -1 }; - PyArrayObject* temp_array; - Py_ssize_t i; - int is_new_object; - - /* length of the list */ - $2 = PyList_Size($input); - - /* the arrays */ - array = (DATA_TYPE **)malloc($2*sizeof(DATA_TYPE *)); - object_array = (PyArrayObject **)calloc($2,sizeof(PyArrayObject *)); - is_new_object_array = (int *)calloc($2,sizeof(int)); - - if (array == NULL || object_array == NULL || is_new_object_array == NULL) - { - SWIG_fail; - } - - for (i=0; i<$2; i++) - { - temp_array = obj_to_array_contiguous_allow_conversion(PySequence_GetItem($input,i), DATA_TYPECODE, &is_new_object); - - /* the new array must be stored so that it can be destroyed in freearg */ - object_array[i] = temp_array; - is_new_object_array[i] = is_new_object; - - if (!temp_array || !require_dimensions(temp_array, 3)) SWIG_fail; - - /* store the size of the first array in the list, then use that for comparison. */ - if (i == 0) - { - size[0] = array_size(temp_array,0); - size[1] = array_size(temp_array,1); - size[2] = array_size(temp_array,2); - } - - if (!require_size(temp_array, size, 3)) SWIG_fail; - - array[i] = (DATA_TYPE*) array_data(temp_array); - } - - $1 = (DATA_TYPE**) array; - $3 = (DIM_TYPE) size[0]; - $4 = (DIM_TYPE) size[1]; - $5 = (DIM_TYPE) size[2]; -} -%typemap(freearg) - (DATA_TYPE** IN_ARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) -{ - Py_ssize_t i; - - if (array$argnum!=NULL) free(array$argnum); - - /*freeing the individual arrays if needed */ - if (object_array$argnum!=NULL) - { - if (is_new_object_array$argnum!=NULL) - { - for (i=0; i<$2; i++) - { - if (object_array$argnum[i] != NULL && is_new_object_array$argnum[i]) - { Py_DECREF(object_array$argnum[i]); } - } - free(is_new_object_array$argnum); - } - free(object_array$argnum); - } -} - -/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4, - * DATA_TYPE* IN_ARRAY4) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4, DATA_TYPE* IN_ARRAY4) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4, DATA_TYPE* IN_ARRAY4) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[4] = { -1, -1, -1 , -1}; - array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 4) || - !require_size(array, size, 4)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DIM_TYPE) array_size(array,1); - $3 = (DIM_TYPE) array_size(array,2); - $4 = (DIM_TYPE) array_size(array,3); - $5 = (DATA_TYPE*) array_data(array); -} -%typemap(freearg) - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4, DATA_TYPE* IN_ARRAY4) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DATA_TYPE* IN_FARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, - * DIM_TYPE DIM3, DIM_TYPE DIM4) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* IN_FARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* IN_FARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[4] = { -1, -1, -1, -1 }; - array = obj_to_array_fortran_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 4) || - !require_size(array, size, 4) | !require_fortran(array)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); - $3 = (DIM_TYPE) array_size(array,1); - $4 = (DIM_TYPE) array_size(array,2); - $5 = (DIM_TYPE) array_size(array,3); -} -%typemap(freearg) - (DATA_TYPE* IN_FARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4, - * DATA_TYPE* IN_FARRAY4) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4, DATA_TYPE* IN_FARRAY4) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4, DATA_TYPE* IN_FARRAY4) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[4] = { -1, -1, -1 , -1 }; - array = obj_to_array_fortran_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 4) || - !require_size(array, size, 4) || !require_fortran(array)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DIM_TYPE) array_size(array,1); - $3 = (DIM_TYPE) array_size(array,2); - $4 = (DIM_TYPE) array_size(array,3); - $5 = (DATA_TYPE*) array_data(array); -} -%typemap(freearg) - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4, DATA_TYPE* IN_FARRAY4) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/***************************/ -/* In-Place Array Typemaps */ -/***************************/ - -/* Typemap suite for (DATA_TYPE INPLACE_ARRAY1[ANY]) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE INPLACE_ARRAY1[ANY]) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE INPLACE_ARRAY1[ANY]) - (PyArrayObject* array=NULL) -{ - npy_intp size[1] = { $1_dim0 }; - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,1) || !require_size(array, size, 1) || - !require_contiguous(array) || !require_native(array)) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} - -/* Typemap suite for (DATA_TYPE* INPLACE_ARRAY1, DIM_TYPE DIM1) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* INPLACE_ARRAY1, DIM_TYPE DIM1) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* INPLACE_ARRAY1, DIM_TYPE DIM1) - (PyArrayObject* array=NULL, int i=1) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,1) || !require_contiguous(array) - || !require_native(array)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = 1; - for (i=0; i < array_numdims(array); ++i) $2 *= array_size(array,i); -} - -/* Typemap suite for (DIM_TYPE DIM1, DATA_TYPE* INPLACE_ARRAY1) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DATA_TYPE* INPLACE_ARRAY1) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DATA_TYPE* INPLACE_ARRAY1) - (PyArrayObject* array=NULL, int i=0) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,1) || !require_contiguous(array) - || !require_native(array)) SWIG_fail; - $1 = 1; - for (i=0; i < array_numdims(array); ++i) $1 *= array_size(array,i); - $2 = (DATA_TYPE*) array_data(array); -} - -/* Typemap suite for (DATA_TYPE INPLACE_ARRAY2[ANY][ANY]) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE INPLACE_ARRAY2[ANY][ANY]) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE INPLACE_ARRAY2[ANY][ANY]) - (PyArrayObject* array=NULL) -{ - npy_intp size[2] = { $1_dim0, $1_dim1 }; - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,2) || !require_size(array, size, 2) || - !require_contiguous(array) || !require_native(array)) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} - -/* Typemap suite for (DATA_TYPE* INPLACE_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* INPLACE_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* INPLACE_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - (PyArrayObject* array=NULL) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,2) || !require_contiguous(array) - || !require_native(array)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); - $3 = (DIM_TYPE) array_size(array,1); -} - -/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_ARRAY2) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_ARRAY2) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_ARRAY2) - (PyArrayObject* array=NULL) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,2) || !require_contiguous(array) || - !require_native(array)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DIM_TYPE) array_size(array,1); - $3 = (DATA_TYPE*) array_data(array); -} - -/* Typemap suite for (DATA_TYPE* INPLACE_FARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* INPLACE_FARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* INPLACE_FARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - (PyArrayObject* array=NULL) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,2) || !require_contiguous(array) - || !require_native(array) || !require_fortran(array)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); - $3 = (DIM_TYPE) array_size(array,1); -} - -/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_FARRAY2) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_FARRAY2) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_FARRAY2) - (PyArrayObject* array=NULL) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,2) || !require_contiguous(array) || - !require_native(array) || !require_fortran(array)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DIM_TYPE) array_size(array,1); - $3 = (DATA_TYPE*) array_data(array); -} - -/* Typemap suite for (DATA_TYPE INPLACE_ARRAY3[ANY][ANY][ANY]) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE INPLACE_ARRAY3[ANY][ANY][ANY]) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE INPLACE_ARRAY3[ANY][ANY][ANY]) - (PyArrayObject* array=NULL) -{ - npy_intp size[3] = { $1_dim0, $1_dim1, $1_dim2 }; - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,3) || !require_size(array, size, 3) || - !require_contiguous(array) || !require_native(array)) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} - -/* Typemap suite for (DATA_TYPE* INPLACE_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, - * DIM_TYPE DIM3) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* INPLACE_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* INPLACE_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) - (PyArrayObject* array=NULL) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,3) || !require_contiguous(array) || - !require_native(array)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); - $3 = (DIM_TYPE) array_size(array,1); - $4 = (DIM_TYPE) array_size(array,2); -} - -/* Typemap suite for (DATA_TYPE** INPLACE_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, - * DIM_TYPE DIM3) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE** INPLACE_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) -{ - $1 = PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE** INPLACE_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) - (DATA_TYPE** array=NULL, PyArrayObject** object_array=NULL) -{ - npy_intp size[2] = { -1, -1 }; - PyArrayObject* temp_array; - Py_ssize_t i; - - /* length of the list */ - $2 = PyList_Size($input); - - /* the arrays */ - array = (DATA_TYPE **)malloc($2*sizeof(DATA_TYPE *)); - object_array = (PyArrayObject **)calloc($2,sizeof(PyArrayObject *)); - - if (array == NULL || object_array == NULL) - { - SWIG_fail; - } - - for (i=0; i<$2; i++) - { - temp_array = obj_to_array_no_conversion(PySequence_GetItem($input,i), DATA_TYPECODE); - - /* the new array must be stored so that it can be destroyed in freearg */ - object_array[i] = temp_array; - - if ( !temp_array || !require_dimensions(temp_array, 2) || - !require_contiguous(temp_array) || - !require_native(temp_array) || - !PyArray_EquivTypenums(array_type(temp_array), DATA_TYPECODE) - ) SWIG_fail; - - /* store the size of the first array in the list, then use that for comparison. */ - if (i == 0) - { - size[0] = array_size(temp_array,0); - size[1] = array_size(temp_array,1); - } - - if (!require_size(temp_array, size, 2)) SWIG_fail; - - array[i] = (DATA_TYPE*) array_data(temp_array); - } - - $1 = (DATA_TYPE**) array; - $3 = (DIM_TYPE) size[0]; - $4 = (DIM_TYPE) size[1]; -} -%typemap(freearg) - (DATA_TYPE** INPLACE_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) -{ - if (array$argnum!=NULL) free(array$argnum); - if (object_array$argnum!=NULL) free(object_array$argnum); -} - -/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, - * DATA_TYPE* INPLACE_ARRAY3) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* INPLACE_ARRAY3) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* INPLACE_ARRAY3) - (PyArrayObject* array=NULL) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,3) || !require_contiguous(array) - || !require_native(array)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DIM_TYPE) array_size(array,1); - $3 = (DIM_TYPE) array_size(array,2); - $4 = (DATA_TYPE*) array_data(array); -} - -/* Typemap suite for (DATA_TYPE* INPLACE_FARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, - * DIM_TYPE DIM3) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* INPLACE_FARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* INPLACE_FARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) - (PyArrayObject* array=NULL) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,3) || !require_contiguous(array) || - !require_native(array) || !require_fortran(array)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); - $3 = (DIM_TYPE) array_size(array,1); - $4 = (DIM_TYPE) array_size(array,2); -} - -/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, - * DATA_TYPE* INPLACE_FARRAY3) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* INPLACE_FARRAY3) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* INPLACE_FARRAY3) - (PyArrayObject* array=NULL) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,3) || !require_contiguous(array) - || !require_native(array) || !require_fortran(array)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DIM_TYPE) array_size(array,1); - $3 = (DIM_TYPE) array_size(array,2); - $4 = (DATA_TYPE*) array_data(array); -} - -/* Typemap suite for (DATA_TYPE INPLACE_ARRAY4[ANY][ANY][ANY][ANY]) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE INPLACE_ARRAY4[ANY][ANY][ANY][ANY]) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE INPLACE_ARRAY4[ANY][ANY][ANY][ANY]) - (PyArrayObject* array=NULL) -{ - npy_intp size[4] = { $1_dim0, $1_dim1, $1_dim2 , $1_dim3 }; - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,4) || !require_size(array, size, 4) || - !require_contiguous(array) || !require_native(array)) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} - -/* Typemap suite for (DATA_TYPE* INPLACE_ARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, - * DIM_TYPE DIM3, DIM_TYPE DIM4) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* INPLACE_ARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* INPLACE_ARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) - (PyArrayObject* array=NULL) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,4) || !require_contiguous(array) || - !require_native(array)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); - $3 = (DIM_TYPE) array_size(array,1); - $4 = (DIM_TYPE) array_size(array,2); - $5 = (DIM_TYPE) array_size(array,3); -} - -/* Typemap suite for (DATA_TYPE** INPLACE_ARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, - * DIM_TYPE DIM3, DIM_TYPE DIM4) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE** INPLACE_ARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) -{ - $1 = PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE** INPLACE_ARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) - (DATA_TYPE** array=NULL, PyArrayObject** object_array=NULL) -{ - npy_intp size[3] = { -1, -1, -1 }; - PyArrayObject* temp_array; - Py_ssize_t i; - - /* length of the list */ - $2 = PyList_Size($input); - - /* the arrays */ - array = (DATA_TYPE **)malloc($2*sizeof(DATA_TYPE *)); - object_array = (PyArrayObject **)calloc($2,sizeof(PyArrayObject *)); - - if (array == NULL || object_array == NULL) - { - SWIG_fail; - } - - for (i=0; i<$2; i++) - { - temp_array = obj_to_array_no_conversion(PySequence_GetItem($input,i), DATA_TYPECODE); - - /* the new array must be stored so that it can be destroyed in freearg */ - object_array[i] = temp_array; - - if ( !temp_array || !require_dimensions(temp_array, 3) || - !require_contiguous(temp_array) || - !require_native(temp_array) || - !PyArray_EquivTypenums(array_type(temp_array), DATA_TYPECODE) - ) SWIG_fail; - - /* store the size of the first array in the list, then use that for comparison. */ - if (i == 0) - { - size[0] = array_size(temp_array,0); - size[1] = array_size(temp_array,1); - size[2] = array_size(temp_array,2); - } - - if (!require_size(temp_array, size, 3)) SWIG_fail; - - array[i] = (DATA_TYPE*) array_data(temp_array); - } - - $1 = (DATA_TYPE**) array; - $3 = (DIM_TYPE) size[0]; - $4 = (DIM_TYPE) size[1]; - $5 = (DIM_TYPE) size[2]; -} -%typemap(freearg) - (DATA_TYPE** INPLACE_ARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) -{ - if (array$argnum!=NULL) free(array$argnum); - if (object_array$argnum!=NULL) free(object_array$argnum); -} - -/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4, - * DATA_TYPE* INPLACE_ARRAY4) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4, DATA_TYPE* INPLACE_ARRAY4) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4, DATA_TYPE* INPLACE_ARRAY4) - (PyArrayObject* array=NULL) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,4) || !require_contiguous(array) - || !require_native(array)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DIM_TYPE) array_size(array,1); - $3 = (DIM_TYPE) array_size(array,2); - $4 = (DIM_TYPE) array_size(array,3); - $5 = (DATA_TYPE*) array_data(array); -} - -/* Typemap suite for (DATA_TYPE* INPLACE_FARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, - * DIM_TYPE DIM3, DIM_TYPE DIM4) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* INPLACE_FARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* INPLACE_FARRAY4, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4) - (PyArrayObject* array=NULL) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,4) || !require_contiguous(array) || - !require_native(array) || !require_fortran(array)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); - $3 = (DIM_TYPE) array_size(array,1); - $4 = (DIM_TYPE) array_size(array,2); - $5 = (DIM_TYPE) array_size(array,3); -} - -/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, - * DATA_TYPE* INPLACE_FARRAY4) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4, DATA_TYPE* INPLACE_FARRAY4) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DIM_TYPE DIM4, DATA_TYPE* INPLACE_FARRAY4) - (PyArrayObject* array=NULL) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,4) || !require_contiguous(array) - || !require_native(array) || !require_fortran(array)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DIM_TYPE) array_size(array,1); - $3 = (DIM_TYPE) array_size(array,2); - $4 = (DIM_TYPE) array_size(array,3); - $5 = (DATA_TYPE*) array_data(array); -} - -/*************************/ -/* Argout Array Typemaps */ -/*************************/ - -/* Typemap suite for (DATA_TYPE ARGOUT_ARRAY1[ANY]) - */ -%typemap(in,numinputs=0, - fragment="NumPy_Backward_Compatibility,NumPy_Macros") - (DATA_TYPE ARGOUT_ARRAY1[ANY]) - (PyObject* array = NULL) -{ - npy_intp dims[1] = { $1_dim0 }; - array = PyArray_SimpleNew(1, dims, DATA_TYPECODE); - if (!array) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} -%typemap(argout) - (DATA_TYPE ARGOUT_ARRAY1[ANY]) -{ - $result = SWIG_Python_AppendOutput($result,(PyObject*)array$argnum); -} - -/* Typemap suite for (DATA_TYPE* ARGOUT_ARRAY1, DIM_TYPE DIM1) - */ -%typemap(in,numinputs=1, - fragment="NumPy_Fragments") - (DATA_TYPE* ARGOUT_ARRAY1, DIM_TYPE DIM1) - (PyObject* array = NULL) -{ - npy_intp dims[1]; - if (!PyInt_Check($input)) - { - const char* typestring = pytype_string($input); - PyErr_Format(PyExc_TypeError, - "Int dimension expected. '%s' given.", - typestring); - SWIG_fail; - } - $2 = (DIM_TYPE) PyInt_AsLong($input); - dims[0] = (npy_intp) $2; - array = PyArray_SimpleNew(1, dims, DATA_TYPECODE); - if (!array) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); -} -%typemap(argout) - (DATA_TYPE* ARGOUT_ARRAY1, DIM_TYPE DIM1) -{ - $result = SWIG_Python_AppendOutput($result,(PyObject*)array$argnum); -} - -/* Typemap suite for (DIM_TYPE DIM1, DATA_TYPE* ARGOUT_ARRAY1) - */ -%typemap(in,numinputs=1, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DATA_TYPE* ARGOUT_ARRAY1) - (PyObject* array = NULL) -{ - npy_intp dims[1]; - if (!PyInt_Check($input)) - { - const char* typestring = pytype_string($input); - PyErr_Format(PyExc_TypeError, - "Int dimension expected. '%s' given.", - typestring); - SWIG_fail; - } - $1 = (DIM_TYPE) PyInt_AsLong($input); - dims[0] = (npy_intp) $1; - array = PyArray_SimpleNew(1, dims, DATA_TYPECODE); - if (!array) SWIG_fail; - $2 = (DATA_TYPE*) array_data(array); -} -%typemap(argout) - (DIM_TYPE DIM1, DATA_TYPE* ARGOUT_ARRAY1) -{ - $result = SWIG_Python_AppendOutput($result,(PyObject*)array$argnum); -} - -/* Typemap suite for (DATA_TYPE ARGOUT_ARRAY2[ANY][ANY]) - */ -%typemap(in,numinputs=0, - fragment="NumPy_Backward_Compatibility,NumPy_Macros") - (DATA_TYPE ARGOUT_ARRAY2[ANY][ANY]) - (PyObject* array = NULL) -{ - npy_intp dims[2] = { $1_dim0, $1_dim1 }; - array = PyArray_SimpleNew(2, dims, DATA_TYPECODE); - if (!array) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} -%typemap(argout) - (DATA_TYPE ARGOUT_ARRAY2[ANY][ANY]) -{ - $result = SWIG_Python_AppendOutput($result,(PyObject*)array$argnum); -} - -/* Typemap suite for (DATA_TYPE ARGOUT_ARRAY3[ANY][ANY][ANY]) - */ -%typemap(in,numinputs=0, - fragment="NumPy_Backward_Compatibility,NumPy_Macros") - (DATA_TYPE ARGOUT_ARRAY3[ANY][ANY][ANY]) - (PyObject* array = NULL) -{ - npy_intp dims[3] = { $1_dim0, $1_dim1, $1_dim2 }; - array = PyArray_SimpleNew(3, dims, DATA_TYPECODE); - if (!array) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} -%typemap(argout) - (DATA_TYPE ARGOUT_ARRAY3[ANY][ANY][ANY]) -{ - $result = SWIG_Python_AppendOutput($result,(PyObject*)array$argnum); -} - -/* Typemap suite for (DATA_TYPE ARGOUT_ARRAY4[ANY][ANY][ANY][ANY]) - */ -%typemap(in,numinputs=0, - fragment="NumPy_Backward_Compatibility,NumPy_Macros") - (DATA_TYPE ARGOUT_ARRAY4[ANY][ANY][ANY][ANY]) - (PyObject* array = NULL) -{ - npy_intp dims[4] = { $1_dim0, $1_dim1, $1_dim2, $1_dim3 }; - array = PyArray_SimpleNew(4, dims, DATA_TYPECODE); - if (!array) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} -%typemap(argout) - (DATA_TYPE ARGOUT_ARRAY4[ANY][ANY][ANY][ANY]) -{ - $result = SWIG_Python_AppendOutput($result,(PyObject*)array$argnum); -} - -/*****************************/ -/* Argoutview Array Typemaps */ -/*****************************/ - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEW_ARRAY1, DIM_TYPE* DIM1) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEW_ARRAY1, DIM_TYPE* DIM1 ) - (DATA_TYPE* data_temp = NULL , DIM_TYPE dim_temp) -{ - $1 = &data_temp; - $2 = &dim_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility") - (DATA_TYPE** ARGOUTVIEW_ARRAY1, DIM_TYPE* DIM1) -{ - npy_intp dims[1] = { *$2 }; - PyObject* obj = PyArray_SimpleNewFromData(1, dims, DATA_TYPECODE, (void*)(*$1)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DATA_TYPE** ARGOUTVIEW_ARRAY1) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1 , DATA_TYPE** ARGOUTVIEW_ARRAY1) - (DIM_TYPE dim_temp, DATA_TYPE* data_temp = NULL ) -{ - $1 = &dim_temp; - $2 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility") - (DIM_TYPE* DIM1, DATA_TYPE** ARGOUTVIEW_ARRAY1) -{ - npy_intp dims[1] = { *$1 }; - PyObject* obj = PyArray_SimpleNewFromData(1, dims, DATA_TYPECODE, (void*)(*$2)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEW_ARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEW_ARRAY2, DIM_TYPE* DIM1 , DIM_TYPE* DIM2 ) - (DATA_TYPE* data_temp = NULL , DIM_TYPE dim1_temp, DIM_TYPE dim2_temp) -{ - $1 = &data_temp; - $2 = &dim1_temp; - $3 = &dim2_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility") - (DATA_TYPE** ARGOUTVIEW_ARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2) -{ - npy_intp dims[2] = { *$2, *$3 }; - PyObject* obj = PyArray_SimpleNewFromData(2, dims, DATA_TYPECODE, (void*)(*$1)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEW_ARRAY2) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DATA_TYPE** ARGOUTVIEW_ARRAY2) - (DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DATA_TYPE* data_temp = NULL ) -{ - $1 = &dim1_temp; - $2 = &dim2_temp; - $3 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility") - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEW_ARRAY2) -{ - npy_intp dims[2] = { *$1, *$2 }; - PyObject* obj = PyArray_SimpleNewFromData(2, dims, DATA_TYPECODE, (void*)(*$3)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEW_FARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEW_FARRAY2, DIM_TYPE* DIM1 , DIM_TYPE* DIM2 ) - (DATA_TYPE* data_temp = NULL , DIM_TYPE dim1_temp, DIM_TYPE dim2_temp) -{ - $1 = &data_temp; - $2 = &dim1_temp; - $3 = &dim2_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements") - (DATA_TYPE** ARGOUTVIEW_FARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2) -{ - npy_intp dims[2] = { *$2, *$3 }; - PyObject* obj = PyArray_SimpleNewFromData(2, dims, DATA_TYPECODE, (void*)(*$1)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array || !require_fortran(array)) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEW_FARRAY2) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DATA_TYPE** ARGOUTVIEW_FARRAY2) - (DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DATA_TYPE* data_temp = NULL ) -{ - $1 = &dim1_temp; - $2 = &dim2_temp; - $3 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements") - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEW_FARRAY2) -{ - npy_intp dims[2] = { *$1, *$2 }; - PyObject* obj = PyArray_SimpleNewFromData(2, dims, DATA_TYPECODE, (void*)(*$3)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array || !require_fortran(array)) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEW_ARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, - DIM_TYPE* DIM3) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEW_ARRAY3, DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DIM_TYPE* DIM3 ) - (DATA_TYPE* data_temp = NULL , DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp) -{ - $1 = &data_temp; - $2 = &dim1_temp; - $3 = &dim2_temp; - $4 = &dim3_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility") - (DATA_TYPE** ARGOUTVIEW_ARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3) -{ - npy_intp dims[3] = { *$2, *$3, *$4 }; - PyObject* obj = PyArray_SimpleNewFromData(3, dims, DATA_TYPECODE, (void*)(*$1)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, - DATA_TYPE** ARGOUTVIEW_ARRAY3) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DATA_TYPE** ARGOUTVIEW_ARRAY3) - (DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp, DATA_TYPE* data_temp = NULL) -{ - $1 = &dim1_temp; - $2 = &dim2_temp; - $3 = &dim3_temp; - $4 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility") - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DATA_TYPE** ARGOUTVIEW_ARRAY3) -{ - npy_intp dims[3] = { *$1, *$2, *$3 }; - PyObject* obj = PyArray_SimpleNewFromData(3, dims, DATA_TYPECODE, (void*)(*$4)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEW_FARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, - DIM_TYPE* DIM3) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEW_FARRAY3, DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DIM_TYPE* DIM3 ) - (DATA_TYPE* data_temp = NULL , DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp) -{ - $1 = &data_temp; - $2 = &dim1_temp; - $3 = &dim2_temp; - $4 = &dim3_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements") - (DATA_TYPE** ARGOUTVIEW_FARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3) -{ - npy_intp dims[3] = { *$2, *$3, *$4 }; - PyObject* obj = PyArray_SimpleNewFromData(3, dims, DATA_TYPECODE, (void*)(*$1)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array || !require_fortran(array)) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, - DATA_TYPE** ARGOUTVIEW_FARRAY3) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DIM_TYPE* DIM3 , DATA_TYPE** ARGOUTVIEW_FARRAY3) - (DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp, DATA_TYPE* data_temp = NULL ) -{ - $1 = &dim1_temp; - $2 = &dim2_temp; - $3 = &dim3_temp; - $4 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements") - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DATA_TYPE** ARGOUTVIEW_FARRAY3) -{ - npy_intp dims[3] = { *$1, *$2, *$3 }; - PyObject* obj = PyArray_SimpleNewFromData(3, dims, DATA_TYPECODE, (void*)(*$4)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array || !require_fortran(array)) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEW_ARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2, - DIM_TYPE* DIM3, DIM_TYPE* DIM4) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEW_ARRAY4, DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DIM_TYPE* DIM3 , DIM_TYPE* DIM4 ) - (DATA_TYPE* data_temp = NULL , DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp, DIM_TYPE dim4_temp) -{ - $1 = &data_temp; - $2 = &dim1_temp; - $3 = &dim2_temp; - $4 = &dim3_temp; - $5 = &dim4_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility") - (DATA_TYPE** ARGOUTVIEW_ARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4) -{ - npy_intp dims[4] = { *$2, *$3, *$4 , *$5 }; - PyObject* obj = PyArray_SimpleNewFromData(4, dims, DATA_TYPECODE, (void*)(*$1)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4, - DATA_TYPE** ARGOUTVIEW_ARRAY4) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DIM_TYPE* DIM3 , DIM_TYPE* DIM4 , DATA_TYPE** ARGOUTVIEW_ARRAY4) - (DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp, DIM_TYPE dim4_temp, DATA_TYPE* data_temp = NULL ) -{ - $1 = &dim1_temp; - $2 = &dim2_temp; - $3 = &dim3_temp; - $4 = &dim4_temp; - $5 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility") - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4, DATA_TYPE** ARGOUTVIEW_ARRAY4) -{ - npy_intp dims[4] = { *$1, *$2, *$3 , *$4 }; - PyObject* obj = PyArray_SimpleNewFromData(4, dims, DATA_TYPECODE, (void*)(*$5)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEW_FARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2, - DIM_TYPE* DIM3, DIM_TYPE* DIM4) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEW_FARRAY4, DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DIM_TYPE* DIM3 , DIM_TYPE* DIM4 ) - (DATA_TYPE* data_temp = NULL , DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp, DIM_TYPE dim4_temp) -{ - $1 = &data_temp; - $2 = &dim1_temp; - $3 = &dim2_temp; - $4 = &dim3_temp; - $5 = &dim4_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements") - (DATA_TYPE** ARGOUTVIEW_FARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4) -{ - npy_intp dims[4] = { *$2, *$3, *$4 , *$5 }; - PyObject* obj = PyArray_SimpleNewFromData(4, dims, DATA_TYPECODE, (void*)(*$1)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array || !require_fortran(array)) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4, - DATA_TYPE** ARGOUTVIEW_FARRAY4) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DIM_TYPE* DIM3 , DIM_TYPE* DIM4 , DATA_TYPE** ARGOUTVIEW_FARRAY4) - (DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp, DIM_TYPE dim4_temp, DATA_TYPE* data_temp = NULL ) -{ - $1 = &dim1_temp; - $2 = &dim2_temp; - $3 = &dim3_temp; - $4 = &dim4_temp; - $5 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements") - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4, DATA_TYPE** ARGOUTVIEW_FARRAY4) -{ - npy_intp dims[4] = { *$1, *$2, *$3 , *$4 }; - PyObject* obj = PyArray_SimpleNewFromData(4, dims, DATA_TYPECODE, (void*)(*$5)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array || !require_fortran(array)) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,obj); -} - -/*************************************/ -/* Managed Argoutview Array Typemaps */ -/*************************************/ - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEWM_ARRAY1, DIM_TYPE* DIM1) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEWM_ARRAY1, DIM_TYPE* DIM1 ) - (DATA_TYPE* data_temp = NULL , DIM_TYPE dim_temp) -{ - $1 = &data_temp; - $2 = &dim_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Utilities") - (DATA_TYPE** ARGOUTVIEWM_ARRAY1, DIM_TYPE* DIM1) -{ - npy_intp dims[1] = { *$2 }; - PyObject* obj = PyArray_SimpleNewFromData(1, dims, DATA_TYPECODE, (void*)(*$1)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array) SWIG_fail; - -%#ifdef SWIGPY_USE_CAPSULE - PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); -%#else - PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free); -%#endif - -%#if NPY_API_VERSION < 0x00000007 - PyArray_BASE(array) = cap; -%#else - PyArray_SetBaseObject(array,cap); -%#endif - - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DATA_TYPE** ARGOUTVIEWM_ARRAY1) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1 , DATA_TYPE** ARGOUTVIEWM_ARRAY1) - (DIM_TYPE dim_temp, DATA_TYPE* data_temp = NULL ) -{ - $1 = &dim_temp; - $2 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Utilities") - (DIM_TYPE* DIM1, DATA_TYPE** ARGOUTVIEWM_ARRAY1) -{ - npy_intp dims[1] = { *$1 }; - PyObject* obj = PyArray_SimpleNewFromData(1, dims, DATA_TYPECODE, (void*)(*$2)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array) SWIG_fail; - -%#ifdef SWIGPY_USE_CAPSULE - PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); -%#else - PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free); -%#endif - -%#if NPY_API_VERSION < 0x00000007 - PyArray_BASE(array) = cap; -%#else - PyArray_SetBaseObject(array,cap); -%#endif - - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEWM_ARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEWM_ARRAY2, DIM_TYPE* DIM1 , DIM_TYPE* DIM2 ) - (DATA_TYPE* data_temp = NULL , DIM_TYPE dim1_temp, DIM_TYPE dim2_temp) -{ - $1 = &data_temp; - $2 = &dim1_temp; - $3 = &dim2_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Utilities") - (DATA_TYPE** ARGOUTVIEWM_ARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2) -{ - npy_intp dims[2] = { *$2, *$3 }; - PyObject* obj = PyArray_SimpleNewFromData(2, dims, DATA_TYPECODE, (void*)(*$1)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array) SWIG_fail; - -%#ifdef SWIGPY_USE_CAPSULE - PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); -%#else - PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free); -%#endif - -%#if NPY_API_VERSION < 0x00000007 - PyArray_BASE(array) = cap; -%#else - PyArray_SetBaseObject(array,cap); -%#endif - - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEWM_ARRAY2) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DATA_TYPE** ARGOUTVIEWM_ARRAY2) - (DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DATA_TYPE* data_temp = NULL ) -{ - $1 = &dim1_temp; - $2 = &dim2_temp; - $3 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Utilities") - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEWM_ARRAY2) -{ - npy_intp dims[2] = { *$1, *$2 }; - PyObject* obj = PyArray_SimpleNewFromData(2, dims, DATA_TYPECODE, (void*)(*$3)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array) SWIG_fail; - -%#ifdef SWIGPY_USE_CAPSULE - PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); -%#else - PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free); -%#endif - -%#if NPY_API_VERSION < 0x00000007 - PyArray_BASE(array) = cap; -%#else - PyArray_SetBaseObject(array,cap); -%#endif - - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEWM_FARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEWM_FARRAY2, DIM_TYPE* DIM1 , DIM_TYPE* DIM2 ) - (DATA_TYPE* data_temp = NULL , DIM_TYPE dim1_temp, DIM_TYPE dim2_temp) -{ - $1 = &data_temp; - $2 = &dim1_temp; - $3 = &dim2_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements,NumPy_Utilities") - (DATA_TYPE** ARGOUTVIEWM_FARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2) -{ - npy_intp dims[2] = { *$2, *$3 }; - PyObject* obj = PyArray_SimpleNewFromData(2, dims, DATA_TYPECODE, (void*)(*$1)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array || !require_fortran(array)) SWIG_fail; - -%#ifdef SWIGPY_USE_CAPSULE - PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); -%#else - PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free); -%#endif - -%#if NPY_API_VERSION < 0x00000007 - PyArray_BASE(array) = cap; -%#else - PyArray_SetBaseObject(array,cap); -%#endif - - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEWM_FARRAY2) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DATA_TYPE** ARGOUTVIEWM_FARRAY2) - (DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DATA_TYPE* data_temp = NULL ) -{ - $1 = &dim1_temp; - $2 = &dim2_temp; - $3 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements,NumPy_Utilities") - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEWM_FARRAY2) -{ - npy_intp dims[2] = { *$1, *$2 }; - PyObject* obj = PyArray_SimpleNewFromData(2, dims, DATA_TYPECODE, (void*)(*$3)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array || !require_fortran(array)) SWIG_fail; - -%#ifdef SWIGPY_USE_CAPSULE - PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); -%#else - PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free); -%#endif - -%#if NPY_API_VERSION < 0x00000007 - PyArray_BASE(array) = cap; -%#else - PyArray_SetBaseObject(array,cap); -%#endif - - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEWM_ARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, - DIM_TYPE* DIM3) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEWM_ARRAY3, DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DIM_TYPE* DIM3 ) - (DATA_TYPE* data_temp = NULL , DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp) -{ - $1 = &data_temp; - $2 = &dim1_temp; - $3 = &dim2_temp; - $4 = &dim3_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Utilities") - (DATA_TYPE** ARGOUTVIEWM_ARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3) -{ - npy_intp dims[3] = { *$2, *$3, *$4 }; - PyObject* obj = PyArray_SimpleNewFromData(3, dims, DATA_TYPECODE, (void*)(*$1)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array) SWIG_fail; - -%#ifdef SWIGPY_USE_CAPSULE - PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); -%#else - PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free); -%#endif - -%#if NPY_API_VERSION < 0x00000007 - PyArray_BASE(array) = cap; -%#else - PyArray_SetBaseObject(array,cap); -%#endif - - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, - DATA_TYPE** ARGOUTVIEWM_ARRAY3) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DIM_TYPE* DIM3 , DATA_TYPE** ARGOUTVIEWM_ARRAY3) - (DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp, DATA_TYPE* data_temp = NULL ) -{ - $1 = &dim1_temp; - $2 = &dim2_temp; - $3 = &dim3_temp; - $4 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Utilities") - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DATA_TYPE** ARGOUTVIEWM_ARRAY3) -{ - npy_intp dims[3] = { *$1, *$2, *$3 }; - PyObject* obj= PyArray_SimpleNewFromData(3, dims, DATA_TYPECODE, (void*)(*$4)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array) SWIG_fail; - -%#ifdef SWIGPY_USE_CAPSULE - PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); -%#else - PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free); -%#endif - -%#if NPY_API_VERSION < 0x00000007 - PyArray_BASE(array) = cap; -%#else - PyArray_SetBaseObject(array,cap); -%#endif - - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEWM_FARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, - DIM_TYPE* DIM3) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEWM_FARRAY3, DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DIM_TYPE* DIM3 ) - (DATA_TYPE* data_temp = NULL , DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp) -{ - $1 = &data_temp; - $2 = &dim1_temp; - $3 = &dim2_temp; - $4 = &dim3_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements,NumPy_Utilities") - (DATA_TYPE** ARGOUTVIEWM_FARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3) -{ - npy_intp dims[3] = { *$2, *$3, *$4 }; - PyObject* obj = PyArray_SimpleNewFromData(3, dims, DATA_TYPECODE, (void*)(*$1)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array || !require_fortran(array)) SWIG_fail; - -%#ifdef SWIGPY_USE_CAPSULE - PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); -%#else - PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free); -%#endif - -%#if NPY_API_VERSION < 0x00000007 - PyArray_BASE(array) = cap; -%#else - PyArray_SetBaseObject(array,cap); -%#endif - - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, - DATA_TYPE** ARGOUTVIEWM_FARRAY3) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DIM_TYPE* DIM3 , DATA_TYPE** ARGOUTVIEWM_FARRAY3) - (DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp, DATA_TYPE* data_temp = NULL ) -{ - $1 = &dim1_temp; - $2 = &dim2_temp; - $3 = &dim3_temp; - $4 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements,NumPy_Utilities") - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DATA_TYPE** ARGOUTVIEWM_FARRAY3) -{ - npy_intp dims[3] = { *$1, *$2, *$3 }; - PyObject* obj = PyArray_SimpleNewFromData(3, dims, DATA_TYPECODE, (void*)(*$4)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array || !require_fortran(array)) SWIG_fail; - -%#ifdef SWIGPY_USE_CAPSULE - PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); -%#else - PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free); -%#endif - -%#if NPY_API_VERSION < 0x00000007 - PyArray_BASE(array) = cap; -%#else - PyArray_SetBaseObject(array,cap); -%#endif - - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEWM_ARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2, - DIM_TYPE* DIM3, DIM_TYPE* DIM4) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEWM_ARRAY4, DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DIM_TYPE* DIM3 , DIM_TYPE* DIM4 ) - (DATA_TYPE* data_temp = NULL , DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp, DIM_TYPE dim4_temp) -{ - $1 = &data_temp; - $2 = &dim1_temp; - $3 = &dim2_temp; - $4 = &dim3_temp; - $5 = &dim4_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Utilities") - (DATA_TYPE** ARGOUTVIEWM_ARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4) -{ - npy_intp dims[4] = { *$2, *$3, *$4 , *$5 }; - PyObject* obj = PyArray_SimpleNewFromData(4, dims, DATA_TYPECODE, (void*)(*$1)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array) SWIG_fail; - -%#ifdef SWIGPY_USE_CAPSULE - PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); -%#else - PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free); -%#endif - -%#if NPY_API_VERSION < 0x00000007 - PyArray_BASE(array) = cap; -%#else - PyArray_SetBaseObject(array,cap); -%#endif - - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4, - DATA_TYPE** ARGOUTVIEWM_ARRAY4) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DIM_TYPE* DIM3 , DIM_TYPE* DIM4 , DATA_TYPE** ARGOUTVIEWM_ARRAY4) - (DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp, DIM_TYPE dim4_temp, DATA_TYPE* data_temp = NULL ) -{ - $1 = &dim1_temp; - $2 = &dim2_temp; - $3 = &dim3_temp; - $4 = &dim4_temp; - $5 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Utilities") - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4, DATA_TYPE** ARGOUTVIEWM_ARRAY4) -{ - npy_intp dims[4] = { *$1, *$2, *$3 , *$4 }; - PyObject* obj = PyArray_SimpleNewFromData(4, dims, DATA_TYPECODE, (void*)(*$5)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array) SWIG_fail; - -%#ifdef SWIGPY_USE_CAPSULE - PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); -%#else - PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free); -%#endif - -%#if NPY_API_VERSION < 0x00000007 - PyArray_BASE(array) = cap; -%#else - PyArray_SetBaseObject(array,cap); -%#endif - - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEWM_FARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2, - DIM_TYPE* DIM3, DIM_TYPE* DIM4) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEWM_FARRAY4, DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DIM_TYPE* DIM3 , DIM_TYPE* DIM4 ) - (DATA_TYPE* data_temp = NULL , DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp, DIM_TYPE dim4_temp) -{ - $1 = &data_temp; - $2 = &dim1_temp; - $3 = &dim2_temp; - $4 = &dim3_temp; - $5 = &dim4_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements,NumPy_Utilities") - (DATA_TYPE** ARGOUTVIEWM_FARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3) -{ - npy_intp dims[4] = { *$2, *$3, *$4 , *$5 }; - PyObject* obj = PyArray_SimpleNewFromData(4, dims, DATA_TYPECODE, (void*)(*$1)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array || !require_fortran(array)) SWIG_fail; - -%#ifdef SWIGPY_USE_CAPSULE - PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); -%#else - PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free); -%#endif - -%#if NPY_API_VERSION < 0x00000007 - PyArray_BASE(array) = cap; -%#else - PyArray_SetBaseObject(array,cap); -%#endif - - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4, - DATA_TYPE** ARGOUTVIEWM_FARRAY4) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DIM_TYPE* DIM3 , DIM_TYPE* DIM4 , DATA_TYPE** ARGOUTVIEWM_FARRAY4) - (DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp, DIM_TYPE dim4_temp, DATA_TYPE* data_temp = NULL ) -{ - $1 = &dim1_temp; - $2 = &dim2_temp; - $3 = &dim3_temp; - $4 = &dim4_temp; - $5 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements,NumPy_Utilities") - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4, DATA_TYPE** ARGOUTVIEWM_FARRAY4) -{ - npy_intp dims[4] = { *$1, *$2, *$3 , *$4 }; - PyObject* obj = PyArray_SimpleNewFromData(4, dims, DATA_TYPECODE, (void*)(*$5)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array || !require_fortran(array)) SWIG_fail; - -%#ifdef SWIGPY_USE_CAPSULE - PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); -%#else - PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free); -%#endif - -%#if NPY_API_VERSION < 0x00000007 - PyArray_BASE(array) = cap; -%#else - PyArray_SetBaseObject(array,cap); -%#endif - - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEWM_ARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2, - DIM_TYPE* DIM3, DIM_TYPE* DIM4) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEWM_ARRAY4, DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DIM_TYPE* DIM3 , DIM_TYPE* DIM4 ) - (DATA_TYPE* data_temp = NULL , DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp, DIM_TYPE dim4_temp) -{ - $1 = &data_temp; - $2 = &dim1_temp; - $3 = &dim2_temp; - $4 = &dim3_temp; - $5 = &dim4_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Utilities") - (DATA_TYPE** ARGOUTVIEWM_ARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4) -{ - npy_intp dims[4] = { *$2, *$3, *$4 , *$5 }; - PyObject* obj = PyArray_SimpleNewFromData(4, dims, DATA_TYPECODE, (void*)(*$1)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array) SWIG_fail; - -%#ifdef SWIGPY_USE_CAPSULE - PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); -%#else - PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free); -%#endif - -%#if NPY_API_VERSION < 0x00000007 - PyArray_BASE(array) = cap; -%#else - PyArray_SetBaseObject(array,cap); -%#endif - - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4, - DATA_TYPE** ARGOUTVIEWM_ARRAY4) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DIM_TYPE* DIM3 , DIM_TYPE* DIM4 , DATA_TYPE** ARGOUTVIEWM_ARRAY4) - (DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp, DIM_TYPE dim4_temp, DATA_TYPE* data_temp = NULL ) -{ - $1 = &dim1_temp; - $2 = &dim2_temp; - $3 = &dim3_temp; - $4 = &dim4_temp; - $5 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Utilities") - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4, DATA_TYPE** ARGOUTVIEWM_ARRAY4) -{ - npy_intp dims[4] = { *$1, *$2, *$3 , *$4 }; - PyObject* obj = PyArray_SimpleNewFromData(4, dims, DATA_TYPECODE, (void*)(*$5)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array) SWIG_fail; - -%#ifdef SWIGPY_USE_CAPSULE - PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); -%#else - PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free); -%#endif - -%#if NPY_API_VERSION < 0x00000007 - PyArray_BASE(array) = cap; -%#else - PyArray_SetBaseObject(array,cap); -%#endif - - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEWM_FARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2, - DIM_TYPE* DIM3, DIM_TYPE* DIM4) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEWM_FARRAY4, DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DIM_TYPE* DIM3 , DIM_TYPE* DIM4 ) - (DATA_TYPE* data_temp = NULL , DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp, DIM_TYPE dim4_temp) -{ - $1 = &data_temp; - $2 = &dim1_temp; - $3 = &dim2_temp; - $4 = &dim3_temp; - $5 = &dim4_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements,NumPy_Utilities") - (DATA_TYPE** ARGOUTVIEWM_FARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4) -{ - npy_intp dims[4] = { *$2, *$3, *$4 , *$5 }; - PyObject* obj = PyArray_SimpleNewFromData(4, dims, DATA_TYPECODE, (void*)(*$1)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array || !require_fortran(array)) SWIG_fail; - -%#ifdef SWIGPY_USE_CAPSULE - PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); -%#else - PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free); -%#endif - -%#if NPY_API_VERSION < 0x00000007 - PyArray_BASE(array) = cap; -%#else - PyArray_SetBaseObject(array,cap); -%#endif - - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4, - DATA_TYPE** ARGOUTVIEWM_FARRAY4) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DIM_TYPE* DIM3 , DIM_TYPE* DIM4 , DATA_TYPE** ARGOUTVIEWM_FARRAY4) - (DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp, DIM_TYPE dim4_temp, DATA_TYPE* data_temp = NULL ) -{ - $1 = &dim1_temp; - $2 = &dim2_temp; - $3 = &dim3_temp; - $4 = &dim4_temp; - $5 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements,NumPy_Utilities") - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4, DATA_TYPE** ARGOUTVIEWM_FARRAY4) -{ - npy_intp dims[4] = { *$1, *$2, *$3 , *$4 }; - PyObject* obj = PyArray_SimpleNewFromData(4, dims, DATA_TYPECODE, (void*)(*$5)); - PyArrayObject* array = (PyArrayObject*) obj; - - if (!array || !require_fortran(array)) SWIG_fail; - -%#ifdef SWIGPY_USE_CAPSULE - PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); -%#else - PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free); -%#endif - -%#if NPY_API_VERSION < 0x00000007 - PyArray_BASE(array) = cap; -%#else - PyArray_SetBaseObject(array,cap); -%#endif - - $result = SWIG_Python_AppendOutput($result,obj); -} - -/**************************************/ -/* In-Place Array Typemap - flattened */ -/**************************************/ - -/* Typemap suite for (DATA_TYPE* INPLACE_ARRAY_FLAT, DIM_TYPE DIM_FLAT) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* INPLACE_ARRAY_FLAT, DIM_TYPE DIM_FLAT) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* INPLACE_ARRAY_FLAT, DIM_TYPE DIM_FLAT) - (PyArrayObject* array=NULL, int i=1) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_c_or_f_contiguous(array) - || !require_native(array)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = 1; - for (i=0; i < array_numdims(array); ++i) $2 *= array_size(array,i); -} - -%enddef /* %numpy_typemaps() macro */ -/* *************************************************************** */ - -/* Concrete instances of the %numpy_typemaps() macro: Each invocation - * below applies all of the typemaps above to the specified data type. - */ -%numpy_typemaps(signed char , NPY_BYTE , int) -%numpy_typemaps(unsigned char , NPY_UBYTE , int) -%numpy_typemaps(short , NPY_SHORT , int) -%numpy_typemaps(unsigned short , NPY_USHORT , int) -%numpy_typemaps(int , NPY_INT , int) -%numpy_typemaps(unsigned int , NPY_UINT , int) -%numpy_typemaps(long , NPY_LONG , int) -%numpy_typemaps(unsigned long , NPY_ULONG , int) -%numpy_typemaps(long long , NPY_LONGLONG , int) -%numpy_typemaps(unsigned long long, NPY_ULONGLONG, int) -%numpy_typemaps(float , NPY_FLOAT , int) -%numpy_typemaps(double , NPY_DOUBLE , int) - -/* *************************************************************** - * The follow macro expansion does not work, because C++ bool is 4 - * bytes and NPY_BOOL is 1 byte - * - * %numpy_typemaps(bool, NPY_BOOL, int) - */ - -/* *************************************************************** - * On my Mac, I get the following warning for this macro expansion: - * 'swig/python detected a memory leak of type 'long double *', no destructor found.' - * - * %numpy_typemaps(long double, NPY_LONGDOUBLE, int) - */ - -#ifdef __cplusplus - -%include - -%numpy_typemaps(std::complex, NPY_CFLOAT , int) -%numpy_typemaps(std::complex, NPY_CDOUBLE, int) - -#endif - -#endif /* SWIGPYTHON */ - diff --git a/libnnpdf/wrapper/src/include/real_typemap.i b/libnnpdf/wrapper/src/include/real_typemap.i deleted file mode 100644 index d322d4f218..0000000000 --- a/libnnpdf/wrapper/src/include/real_typemap.i +++ /dev/null @@ -1,2 +0,0 @@ -#define REALDOUBLE 0 -%numpy_typemaps(NNPDF::real, NPY_FLOAT , int) diff --git a/libnnpdf/wrapper/src/nnpdf.i b/libnnpdf/wrapper/src/nnpdf.i deleted file mode 100644 index 86875de31c..0000000000 --- a/libnnpdf/wrapper/src/nnpdf.i +++ /dev/null @@ -1,379 +0,0 @@ -%module(package="NNPDF") nnpdf - %{ -#define SWIG_FILE_WITH_INIT -#include "NNPDF/exceptions.h" -#include "NNPDF/common.h" -#include "NNPDF/utils.h" -#include "NNPDF/randomgenerator.h" -#include "NNPDF/pathlib.h" -#include "NNPDF/logger.h" -#include "NNPDF/lhapdfset.h" -#include "LHAPDF/LHAPDF.h" -#include "NNPDF/dataset.h" -#include "NNPDF/experiments.h" -#include "NNPDF/thpredictions.h" -#include "NNPDF/positivity.h" -#include "NNPDF/chisquared.h" - %} - - -%include "std_string.i" -%include "std_vector.i" -%include "std_map.i" - -%include "include/numpy.i" - -%init %{ - import_array(); -%} - -/* Parse the header file to generate wrappers */ - -%feature("autodoc", "3"); - -%include "include/excepthandler.i" -%include "include/real_typemap.i" - -%template(vector_str) std::vector; -%template(vector_double) std::vector; -%template(vector_int) std::vector; - -%typemap(out) NNPDF::matrix { - auto size = $1.size(0)*$1.size(1); - /*Have to cast to long explicitly in clang*/ - npy_intp dims[2] = {(long) $1.size(0), (long) $1.size(1)}; - auto data = (double*) malloc(sizeof(double)*size); - std::copy($1.data(), $1.data()+size,data); - $result = PyArray_SimpleNewFromData(2, dims, NPY_DOUBLE, data); -} - -/* Simpler headers without a lot of dependencies and headers */ - -%include "NNPDF/common.h" -%include "NNPDF/utils.h" - -%template(matrix_double) NNPDF::matrix; - -%include "NNPDF/randomgenerator.h" -%include "NNPDF/pathlib.h" -%include "NNPDF/logger.h" - - -%template(map_str_vector_str) std::map >; -/* Parse the header file to generate wrappers */ - -%feature("autodoc", "3"); - -%include "include/excepthandler.i" - -/* Commondata */ - -/* typemaps for numpy */ - -%apply (double** ARGOUTVIEWM_ARRAY2, int* DIM1, int* DIM2) {(double** datamat, int* n, int* m)} -%apply (double** ARGOUTVIEWM_ARRAY1, int* DIM1) {(double** cv, int* n)} - -%ignore NNPDF::swap; -%ignore NNPDF::CommonData::operator=; -%ignore NNPDF::CommonData::CommonData(CommonData &&); -%include "NNPDF/commondata.h" - -%extend NNPDF::CommonData{ - -void get_kintable(double** datamat, int* n, int* m){ - int len = $self->GetNData(); - double* result = (decltype(result)) malloc(sizeof(*result)*len*3); - for (int i = 0; i < len; i++){ - int pos = 3*i; - result[pos] = $self->GetKinematics(i, 0); - result[pos + 1] = $self->GetKinematics(i, 1); - result[pos + 2] = $self->GetKinematics(i, 2); - } - *n = len; - *m = 3; - *datamat = result; -} - -void get_cv (double **cv, int* n){ - auto len = $self->GetNData(); - auto * result = (double*) malloc(sizeof(double)*len); - auto *data = self->GetData(); - for (int i = 0; i < len; i++){ - result[i] = data[i]; - } - *cv = result; - *n = len; -} - -%pythoncode{ - -def __len__(self): - return self.GetNData(); - -} - -} - -/* PDF stuff */ - -%include "NNPDF/pdfset.h" -%rename(single_replica) NNPDF::LHAPDFSet::LHAPDFSet(std::string const &,int const &); - -%apply (NNPDF::real** ARGOUTVIEWM_ARRAY4, int* DIM1, int* DIM2, int* DIM3,\ - int* DIM4)\ -{(NNPDF::real** datamat, int* nrep_out, int* nf_out, int* nx_out,\ -int* nq_out)} - -%apply (NNPDF::real* IN_ARRAY1, int DIM1) {(NNPDF::real* xmat, int nx_in)} -%apply (int* IN_ARRAY1, int DIM1) {(int* flmat, int nf_in)} -%apply (NNPDF::real* IN_ARRAY1, int DIM1) {(NNPDF::real* qmat, int nq_in)} -%include "NNPDF/lhapdfset.h" - -%rename(SetLHAPDFVerbosity) LHAPDF::setVerbosity(int v); -namespace LHAPDF{ - int verbosity(); - void setVerbosity(int v); -} - -%extend NNPDF::LHAPDFSet{ - -void grid_values( - int* flmat, int nf_in, - NNPDF::real* xmat, int nx_in, - NNPDF::real* qmat, int nq_in, - NNPDF::real** datamat, - int* nrep_out, int* nf_out, - int* nx_out, int* nq_out - ) -{ - int nrep = self->GetMembers(); - *nrep_out = nrep; - *nx_out = nx_in; - *nf_out = nf_in; - *nq_out = nq_in; - NNPDF::real* result = (decltype(result)) malloc(sizeof(*result)*nrep*nx_in*nf_in*nq_in); - for (int irep=0; irepxfxQ(xmat[ix], qmat[iq], irep, flmat[ifl]); - } - } - } - } - *datamat = result; -} -} - -/* FKtable stuff */ - -%apply (double** ARGOUTVIEWM_ARRAY1, int* DIM1) {(double** data, int* n)} -%apply (NNPDF::real** ARGOUTVIEWM_ARRAY1, int* DIM1) {(NNPDF::real** data, int* n)} -%apply (int** ARGOUTVIEWM_ARRAY1, int* DIM1) {(int** data, int* n)} - -%include "NNPDF/fastkernel.h" -%template (vector_fktable_p) std::vector; -%ignore NNPDF::swap; -%ignore NNPDF::FKSet::operator=; -%ignore NNPDF::FKSet::FKSet(FKSet &&); -%include "NNPDF/fkset.h" - - -%extend NNPDF::FKTable{ - -void get_xgrid(double **data, int* n){ - int len = $self->GetNx(); - double* result = (double*) malloc(sizeof(double)*len); - double* xgrid = $self->GetXGrid(); - std::copy(xgrid, xgrid+len, result); - *data = result; - *n = len; -} - -void get_sigma(NNPDF::real **data, int* n){ - int len = $self->GetDSz()*$self->GetNData(); - NNPDF::real* result = (decltype(result)) malloc(sizeof(*result)*len); - NNPDF::real* sigma = $self->GetSigma(); - std::copy(sigma, sigma+len, result); - *data = result; - *n = len; -} - -void get_flmap(int **data, int* n){ - int len = $self->IsHadronic() ? 2*$self->GetNonZero() : $self->GetNonZero(); - int* result = (int*) malloc(sizeof(int)*len); - int* flmap = $self->GetFlmap(); - std::copy(flmap, flmap+len, result); - *data = result; - *n = len; -} - -} - -/* Dataset */ - -/* We copy the arrays for every reason. It's too dangerous to pass by - * reference with too little benefict. */ -%apply (double** ARGOUTVIEWM_ARRAY2, int* DIM1, int* DIM2) {(double** datamat, int* n, int* m)} - -%ignore NNPDF::swap; -%ignore NNPDF::DataSet::operator=; -%ignore NNPDF::DataSet::DataSet(DataSet &&); -%include "NNPDF/dataset.h" - -%feature("docstring") NNPDF::DataSet::get_covmat -"Return a copy of the experiment covariance matrix." -%feature("docstring") NNPDF::DataSet::get_cv -"Return a copy of the central values for the experiment." - -%extend NNPDF::DataSet{ - -void get_covmat(double ** datamat, int* n, int* m){ - int len = $self->GetNData(); - auto data = $self->GetCovMat().data(); - auto size = len*len; - auto result = (double*) malloc(sizeof(double)*size); - std::copy(data, data + size, result); - *datamat = result; - *m = *n = len; -} - - -void get_sqrtcovmat(double ** datamat, int* n, int* m){ - int len = $self->GetNData(); - auto data = $self->GetSqrtCov().data(); - auto size = len*len; - auto result = (double*) malloc(sizeof(double)*size); - std::copy(data, data + size, result); - *datamat = result; - *m = *n = len; -} - - -%pythoncode{ - -def __len__(self): - return self.GetNData(); - -} - -} - - -/*Experiments*/ - -%ignore std::vector::vector(size_type); -%ignore std::vector::resize; -%template (vector_dataset) std::vector; - -%ignore std::vector::vector(size_type); -%ignore std::vector::resize; -%template (vector_thpredictions) std::vector; - - -%template (vector_experiment_pointer) std::vector; - -%include "NNPDF/experiments.h" - -%feature("docstring") NNPDF::Experiment::get_covmat -"Return a copy of the experiment covariance matrix." -%feature("docstring") NNPDF::Experiment::get_cv -"Return a copy of the central values for the experiment." - -%extend NNPDF::Experiment{ - -void get_covmat(double ** datamat, int* n, int* m){ - int len = $self->GetNData(); - auto data = $self->GetCovMat().data(); - auto size = len*len; - auto result = (double*) malloc(sizeof(double)*size); - std::copy(data, data + size, result); - *datamat = result; - *m = *n = len; -} - - -void get_sqrtcovmat(double ** datamat, int* n, int* m){ - int len = $self->GetNData(); - auto data = $self->GetSqrtCov().data(); - auto size = len*len; - auto result = (double*) malloc(sizeof(double)*size); - std::copy(data, data + size, result); - *datamat = result; - *m = *n = len; -} - -void get_cv (double **cv, int* n){ - int len = $self->GetNData(); - auto result = (double*) malloc(sizeof(double)*len); - const double *data = self->GetData(); - for (int i = 0; i < len; i++){ - result[i] = data[i]; - } - *cv = result; - *n = len; -} - -} -/*Theory predictions */ -%apply (NNPDF::real** ARGOUTVIEWM_ARRAY1, int* DIM1) {(NNPDF::real** data, int* n)} -%apply (NNPDF::real** ARGOUTVIEWM_ARRAY2, int* DIM1, int* DIM2){(NNPDF::real** data, int*m, int* n)} -%ignore NNPDF::ThPredictions::operator=; -%ignore NNPDF::ThPredictions::ThPredictions(ThPredictions &&); -%include "NNPDF/thpredictions.h" -%extend NNPDF::ThPredictions{ - -void get_data(NNPDF::real **data, int* m, int* n){ - *m = $self->GetNData(); - *n = $self->GetNPdf(); - int len = (*m) * (*n); - NNPDF::real * result = (decltype(result)) malloc(sizeof(*result)*len); - NNPDF::real* obs = $self->GetObs(); - std::copy(obs, obs+len ,result); - *data = result; -} - -void get_cv (NNPDF::real **data, int* n){ - int len = $self->GetNData(); - NNPDF::real * result = (decltype(result)) malloc(sizeof(*result)*len); - for (int i = 0; i < len; i++){ - result[i] = self->GetObsCV(i); - } - *data = result; - *n = len; -} - -void get_error (NNPDF::real **data, int* n){ - int len = $self->GetNData(); - NNPDF::real * result = (decltype(result)) malloc(sizeof(*result)*len); - for (int i = 0; i < len; i++){ - result[i] = self->GetObsError(i); - } - *data = result; - *n = len; -} - -%pythoncode{ - -def __len__(self): - return self.GetNData() - - -def __iter__(self): - for i in range(len(self)): - yield self.GetObsCV(i), self.GetObsError(i) - -} -} - -/*Positivity*/ -%apply int *OUTPUT {int *res}; -%apply (NNPDF::real** ARGOUTVIEWM_ARRAY2, int* DIM1, int* DIM2)\ -{(NNPDF::real** result, int* ndata, int* npdf)} - -%include "NNPDF/positivity.h" - - - -%include "NNPDF/chisquared.h" diff --git a/n3fit/evolven3fit/version.h b/n3fit/evolven3fit/version.h deleted file mode 100644 index f84864988a..0000000000 --- a/n3fit/evolven3fit/version.h +++ /dev/null @@ -1 +0,0 @@ -#define SVN_REV 3.1 diff --git a/n3fit/setup.py b/n3fit/setup.py deleted file mode 100644 index e81c54809b..0000000000 --- a/n3fit/setup.py +++ /dev/null @@ -1,21 +0,0 @@ -from setuptools import setup, find_packages - -setup( - name="n3fit", - version="4.0", - package_dir = {'':'src'}, - packages=find_packages('src'), - zip_safe=False, - package_data = { - '':['*.json', '*.yml', '*.h5'], - 'tests/regressions': ['*'], - }, - - entry_points = {'console_scripts': - ['n3fit = n3fit.scripts.n3fit_exec:main', - 'evolven3fit_new = n3fit.scripts.evolven3fit_new:main', - 'vp-setupfit = n3fit.scripts.vp_setupfit:main', - 'varflavors = n3fit.scripts.varflavors:main', - ] - }, -) diff --git a/n3fit/src/evolven3fit_new/__init__.py b/n3fit/src/evolven3fit_new/__init__.py index e69de29bb2..7346cacc8b 100644 --- a/n3fit/src/evolven3fit_new/__init__.py +++ b/n3fit/src/evolven3fit_new/__init__.py @@ -0,0 +1 @@ +from validphys._version import __version__ diff --git a/n3fit/src/n3fit/__init__.py b/n3fit/src/n3fit/__init__.py index 73a5163bc9..7346cacc8b 100644 --- a/n3fit/src/n3fit/__init__.py +++ b/n3fit/src/n3fit/__init__.py @@ -1,2 +1 @@ -from n3fit.version import build_version -__version__ = build_version +from validphys._version import __version__ diff --git a/n3fit/src/n3fit/checks.py b/n3fit/src/n3fit/checks.py index 7b509f0065..885785a268 100644 --- a/n3fit/src/n3fit/checks.py +++ b/n3fit/src/n3fit/checks.py @@ -108,12 +108,29 @@ def check_initializer(initializer): raise CheckError(f"Initializer {initializer} not accepted by {MetaLayer}") +def check_layer_type_implemented(parameters): + """Checks whether the layer_type is implemented""" + layer_type = parameters.get("layer_type") + implemented_types = ["dense", "dense_per_flavour"] + if layer_type not in implemented_types: + raise CheckError( + f"Layer type {layer_type} not implemented, must be one of {implemented_types}" + ) + + def check_dropout(parameters): """Checks the dropout setup (positive and smaller than 1.0)""" dropout = parameters.get("dropout") if dropout is not None and not 0.0 <= dropout <= 1.0: raise CheckError(f"Dropout must be between 0 and 1, got: {dropout}") + layer_type = parameters.get("layer_type") + if dropout is not None and dropout > 0.0 and layer_type == "dense_per_flavour": + raise CheckError( + "Dropout is not compatible with the dense_per_flavour layer type, " + "please use instead `parameters::layer_type: dense`" + ) + def check_tensorboard(tensorboard): """Check that the tensorbard callback can be enabled correctly""" @@ -168,6 +185,7 @@ def wrapper_check_NN(basis, tensorboard, save, load, parameters): check_consistent_layers(parameters) check_basis_with_layers(basis, parameters) check_stopping(parameters) + check_layer_type_implemented(parameters) check_dropout(parameters) check_lagrange_multipliers(parameters, "integrability") check_lagrange_multipliers(parameters, "positivity") diff --git a/n3fit/src/n3fit/model_gen.py b/n3fit/src/n3fit/model_gen.py index ae6ed01182..09f337dbca 100644 --- a/n3fit/src/n3fit/model_gen.py +++ b/n3fit/src/n3fit/model_gen.py @@ -299,103 +299,6 @@ def observable_generator( return layer_info -# Network generation functions -def generate_dense_network( - nodes_in: int, - nodes: int, - activations: List[str], - initializer_name: str = "glorot_normal", - seed: int = 0, - dropout_rate: float = 0.0, - regularizer: str = None, -): - """ - Generates a dense network - - the dropout rate, if selected, is set - for the next to last layer (i.e., the last layer of the dense network before getting to - the output layer for the basis choice) - """ - list_of_pdf_layers = [] - number_of_layers = len(nodes) - if dropout_rate > 0: - dropout_layer = number_of_layers - 2 - else: - dropout_layer = -1 - for i, (nodes_out, activation) in enumerate(zip(nodes, activations)): - # if we have dropout set up, add it to the list - if dropout_rate > 0 and i == dropout_layer: - list_of_pdf_layers.append(base_layer_selector("dropout", rate=dropout_rate)) - - # select the initializer and move the seed - init = MetaLayer.select_initializer(initializer_name, seed=seed + i) - - # set the arguments that will define the layer - arguments = { - "kernel_initializer": init, - "units": int(nodes_out), - "activation": activation, - "input_shape": (nodes_in,), - "kernel_regularizer": regularizer, - } - - layer = base_layer_selector("dense", **arguments) - - list_of_pdf_layers.append(layer) - nodes_in = int(nodes_out) - return list_of_pdf_layers - - -def generate_dense_per_flavour_network( - nodes_in, nodes, activations, initializer_name="glorot_normal", seed=0, basis_size=8 -): - """ - For each flavour generates a dense network of the chosen size - - """ - list_of_pdf_layers = [] - number_of_layers = len(nodes) - current_seed = seed - for i, (nodes_out, activation) in enumerate(zip(nodes, activations)): - initializers = [] - for _ in range(basis_size): - # select the initializer and move the seed - initializers.append(MetaLayer.select_initializer(initializer_name, seed=current_seed)) - current_seed += 1 - - # set the arguments that will define the layer - # but careful, the last layer must be nodes = 1 - # TODO the mismatch is due to the fact that basis_size - # is set to the number of nodes of the last layer when it should - # come from the runcard - if i == number_of_layers - 1: - nodes_out = 1 - arguments = { - "kernel_initializer": initializers, - "units": nodes_out, - "activation": activation, - "input_shape": (nodes_in,), - "basis_size": basis_size, - } - - layer = base_layer_selector("dense_per_flavour", **arguments) - - if i == number_of_layers - 1: - # For the last layer, apply concatenate - concat = base_layer_selector("concatenate") - - def output_layer(ilayer): - result = layer(ilayer) - return concat(result) - - list_of_pdf_layers.append(output_layer) - else: - list_of_pdf_layers.append(layer) - - nodes_in = int(nodes_out) - return list_of_pdf_layers - - def generate_pdf_model( nodes: List[int] = None, activations: List[str] = None, @@ -670,7 +573,6 @@ def pdfNN_layer_generator( sumrule_layer = lambda x: x # Only these layers change from replica to replica: - nn_replicas = [] preprocessing_factor_replicas = [] for i_replica, replica_seed in enumerate(seed): preprocessing_factor_replicas.append( @@ -682,21 +584,19 @@ def pdfNN_layer_generator( large_x=not subtract_one, ) ) - nn_replicas.append( - generate_nn( - layer_type=layer_type, - input_dimensions=nn_input_dimensions, - nodes=nodes, - activations=activations, - initializer_name=initializer_name, - replica_seed=replica_seed, - dropout=dropout, - regularizer=regularizer, - regularizer_args=regularizer_args, - last_layer_nodes=last_layer_nodes, - name=f"NN_{i_replica}", - ) - ) + + nn_replicas = generate_nn( + layer_type=layer_type, + nodes_in=nn_input_dimensions, + nodes=nodes, + activations=activations, + initializer_name=initializer_name, + replica_seeds=seed, + dropout=dropout, + regularizer=regularizer, + regularizer_args=regularizer_args, + last_layer_nodes=last_layer_nodes, + ) # Apply NN layers for all replicas to a given input grid def neural_network_replicas(x, postfix=""): @@ -780,44 +680,118 @@ def compute_unnormalized_pdf(x, postfix=""): def generate_nn( layer_type: str, - input_dimensions: int, + nodes_in: int, nodes: List[int], activations: List[str], initializer_name: str, - replica_seed: int, + replica_seeds: List[int], dropout: float, regularizer: str, regularizer_args: dict, last_layer_nodes: int, - name: str, ) -> MetaModel: """ Create the part of the model that contains all of the actual neural network - layers. + layers, for each replica. + + Parameters + ---------- + layer_type: str + Type of layer to use. Can be "dense" or "dense_per_flavour". + nodes_in: int + Number of nodes in the input layer. + nodes: List[int] + Number of nodes in each hidden layer. + activations: List[str] + Activation function to use in each hidden layer. + initializer_name: str + Name of the initializer to use. + replica_seeds: List[int] + List of seeds to use for each replica. + dropout: float + Dropout rate to use (if 0, no dropout is used). + regularizer: str + Name of the regularizer to use. + regularizer_args: dict + Arguments to pass to the regularizer. + last_layer_nodes: int + Number of nodes in the last layer. + + Returns + ------- + nn_replicas: List[MetaModel] + List of MetaModel objects, one for each replica. """ - common_args = { - 'nodes_in': input_dimensions, - 'nodes': nodes, - 'activations': activations, - 'initializer_name': initializer_name, - 'seed': replica_seed, - } - if layer_type == "dense": + nodes_list = list(nodes) # so we can modify it + x_input = Input(shape=(None, nodes_in), batch_size=1, name='xgrids_processed') + + custom_args = {} + if layer_type == "dense_per_flavour": + # set the arguments that will define the layer + # but careful, the last layer must be nodes = 1 + # TODO the mismatch is due to the fact that basis_size + # is set to the number of nodes of the last layer when it should + # come from the runcard + nodes_list[-1] = 1 + basis_size = last_layer_nodes + custom_args['basis_size'] = basis_size + + def initializer_generator(seed, i_layer): + seed += i_layer * basis_size + initializers = [ + MetaLayer.select_initializer(initializer_name, seed=seed + b) + for b in range(basis_size) + ] + return initializers + + elif layer_type == "dense": reg = regularizer_selector(regularizer, **regularizer_args) - list_of_pdf_layers = generate_dense_network( - **common_args, dropout_rate=dropout, regularizer=reg - ) - elif layer_type == "dense_per_flavour": - list_of_pdf_layers = generate_dense_per_flavour_network( - **common_args, basis_size=last_layer_nodes - ) + custom_args['regularizer'] = reg + + def initializer_generator(seed, i_layer): + seed += i_layer + return MetaLayer.select_initializer(initializer_name, seed=seed) + + # First create all the layers... + # list_of_pdf_layers[d][r] is the layer at depth d for replica r + list_of_pdf_layers = [] + for i_layer, (nodes_out, activation) in enumerate(zip(nodes_list, activations)): + layers = [ + base_layer_selector( + layer_type, + kernel_initializer=initializer_generator(replica_seed, i_layer), + units=nodes_out, + activation=activation, + input_shape=(nodes_in,), + **custom_args, + ) + for replica_seed in replica_seeds + ] + list_of_pdf_layers.append(layers) + nodes_in = int(nodes_out) + + # add dropout as second to last layer + if dropout > 0: + dropout_layer = base_layer_selector("dropout", rate=dropout) + list_of_pdf_layers.insert(-2, dropout_layer) + + # In case of per flavour network, concatenate at the last layer + if layer_type == "dense_per_flavour": + concat = base_layer_selector("concatenate") + list_of_pdf_layers[-1] = [lambda x: concat(layer(x)) for layer in list_of_pdf_layers[-1]] + + # Apply all layers to the input to create the models + pdfs = [layer(x_input) for layer in list_of_pdf_layers[0]] + for layers in list_of_pdf_layers[1:]: + # Since some layers (dropout) are shared, we have to treat them separately + if type(layers) is list: + pdfs = [layer(x) for layer, x in zip(layers, pdfs)] + else: + pdfs = [layers(x) for x in pdfs] - # Note: using a Sequential model would be more appropriate, but it would require - # creating a MetaSequential model. - x = Input(shape=(None, input_dimensions), batch_size=1, name='xgrids_processed') - pdf = x - for layer in list_of_pdf_layers: - pdf = layer(pdf) + models = [ + MetaModel({'NN_input': x_input}, pdf, name=f"NN_{i_replica}") + for i_replica, pdf in enumerate(pdfs) + ] - model = MetaModel({'NN_input': x}, pdf, name=name) - return model + return models diff --git a/n3fit/src/n3fit/tests/test_modelgen.py b/n3fit/src/n3fit/tests/test_modelgen.py index 4cec4574ee..d50b98728a 100644 --- a/n3fit/src/n3fit/tests/test_modelgen.py +++ b/n3fit/src/n3fit/tests/test_modelgen.py @@ -5,62 +5,48 @@ It checks that both the number of layers and the shape of the weights of the layers are what is expected """ -import numpy as np -import n3fit.model_gen -from n3fit.backends import MetaModel -from n3fit.backends import operations as op +from n3fit.model_gen import generate_nn INSIZE = 16 OUT_SIZES = (4, 3) BASIS_SIZE = 3 +COMMON_ARGS = { + "nodes_in": INSIZE, + "nodes": OUT_SIZES, + "activations": ["sigmoid", "tanh"], + "initializer_name": "glorot_uniform", + "replica_seeds": [0], + "dropout": 0.0, + "regularizer": None, + "regularizer_args": {}, + "last_layer_nodes": BASIS_SIZE, +} + def test_generate_dense_network(): - nodes_in = INSIZE - nodes_out = OUT_SIZES - activations = ["sigmoid", "tanh"] - layers = n3fit.model_gen.generate_dense_network(nodes_in, nodes_out, activations) - arr = np.random.rand(1, INSIZE) - input_layer = op.numpy_to_input(arr) - curr_layer = input_layer - for layer in layers: - curr_layer = layer(curr_layer) - modelito = MetaModel({"input": input_layer}, curr_layer) + nn = generate_nn("dense", **COMMON_ARGS)[0] + # The number of layers should be input layer + len(OUT_SIZES) - assert len(modelito.layers) == len(OUT_SIZES) + 1 + assert len(nn.layers) == len(OUT_SIZES) + 1 # Check that the number of parameters is as expected # We expect 4 weights where the two first ones are # (INSIZE, OUT_SIZE[0]) (OUT_SIZE[0],) # and the second one # (OUT_SIZE[0], OUT_SIZE[1]) (OUT_SIZE[1],) - expected_sizes = [ - (INSIZE, OUT_SIZES[0]), - (OUT_SIZES[0],), - OUT_SIZES, - (OUT_SIZES[1],), - ] - for weight, esize in zip(modelito.weights, expected_sizes): + expected_sizes = [(INSIZE, OUT_SIZES[0]), (OUT_SIZES[0],), OUT_SIZES, (OUT_SIZES[1],)] + for weight, esize in zip(nn.weights, expected_sizes): assert weight.shape == esize def test_generate_dense_per_flavour_network(): - nodes_in = INSIZE - nodes_out = OUT_SIZES - activations = ["sigmoid", "tanh"] - layers = n3fit.model_gen.generate_dense_per_flavour_network( - nodes_in, nodes_out, activations, basis_size=BASIS_SIZE - ) - arr = np.random.rand(1, INSIZE) - input_layer = op.numpy_to_input(arr) - curr_layer = input_layer - for layer in layers: - curr_layer = layer(curr_layer) - modelito = MetaModel({"input": input_layer}, curr_layer) + nn = generate_nn("dense_per_flavour", **COMMON_ARGS)[0] + # The number of layers should be input + BASIS_SIZE*len(OUT_SIZES) + concatenate - assert len(modelito.layers) == BASIS_SIZE * len(OUT_SIZES) + 2 + assert len(nn.layers) == BASIS_SIZE * len(OUT_SIZES) + 2 # The shape for this network of denses for flavours will depend on the basis_size expected_sizes = [] expected_sizes += BASIS_SIZE * [(INSIZE, OUT_SIZES[0]), (OUT_SIZES[0],)] expected_sizes += BASIS_SIZE * [(OUT_SIZES[0], 1), (1,)] - for weight, esize in zip(modelito.weights, expected_sizes): + for weight, esize in zip(nn.weights, expected_sizes): assert weight.shape == esize diff --git a/n3fit/src/n3fit/tests/test_preprocessing.py b/n3fit/src/n3fit/tests/test_preprocessing.py index 3bf6a8966c..42b020bdd4 100644 --- a/n3fit/src/n3fit/tests/test_preprocessing.py +++ b/n3fit/src/n3fit/tests/test_preprocessing.py @@ -64,4 +64,4 @@ def test_preprocessing(): ] ] prefactors = prepro(test_x) - np.testing.assert_allclose(test_prefactors, prefactors) + np.testing.assert_allclose(test_prefactors, prefactors, rtol=1e-6) diff --git a/n3fit/src/n3fit/version.py b/n3fit/src/n3fit/version.py deleted file mode 100644 index adf81433ef..0000000000 --- a/n3fit/src/n3fit/version.py +++ /dev/null @@ -1,41 +0,0 @@ -# This file gets overwritten on deployemt, don't modify -def __give_git(): - # Get the path to this file - from pathlib import Path - - file_dir = Path(__file__).parent - from subprocess import run, CalledProcessError - - try: - result = run( - ["git", "describe", "--tags", "--long", "--dirty=-dev"], - capture_output=True, - text=True, - check=True, - cwd=file_dir, - ).stdout.strip() - tag = run( - ["git", "describe", "--abbrev=0", "--tags"], - capture_output=True, - text=True, - check=True, - cwd=file_dir, - ).stdout.strip() - githash = run( - ["git", "rev-parse", "--short", "HEAD"], - capture_output=True, - text=True, - check=True, - cwd=file_dir, - ).stdout.strip() - version = result.replace(f"-g{githash}", f"+g{githash}").replace( - f"{tag}-", f"{tag}." - ) - except CalledProcessError: - # In principle this function should not exist on an installed version - # but who knows. Also maybe git doesn't work on the machine or whatever - version = "unknown" - return version - - -build_version = __give_git() diff --git a/nnpdfcpp/CMakeLists.txt b/nnpdfcpp/CMakeLists.txt deleted file mode 100644 index 35d0a6f5ed..0000000000 --- a/nnpdfcpp/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -# export version to file -configure_file( - "${PROJECT_SOURCE_DIR}/nnpdfcpp/src/common/inc/version.h.in" - "${PROJECT_BINARY_DIR}/nnpdfcpp/src/common/inc/version.h" -) -include_directories(${PROJECT_BINARY_DIR}/nnpdfcpp/src/common/inc/) -include_directories(${PROJECT_SOURCE_DIR}/libnnpdf/src/) -set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/binaries) - -# execute project specific targets -add_subdirectory(src) - -# install data -install(DIRECTORY ${PROJECT_SOURCE_DIR}/nnpdfcpp/data/ DESTINATION ${PROFILE_PREFIX}/data/ MESSAGE_NEVER) - -# install results -install(DIRECTORY DESTINATION ${PROFILE_PREFIX}/results/) -install(DIRECTORY DESTINATION ${PROFILE_PREFIX}/hyperscan_results/) - -file(WRITE ${PROJECT_BINARY_DIR}/nnpdfcpp/README.md "Store here your fit output.") -install(FILES ${PROJECT_BINARY_DIR}/nnpdfcpp/README.md DESTINATION ${PROFILE_PREFIX}/results/) - -# install configs -install(DIRECTORY ${PROJECT_SOURCE_DIR}/nnpdfcpp/config/ DESTINATION ${PROFILE_PREFIX}/config/) diff --git a/nnpdfcpp/README.md b/nnpdfcpp/README.md deleted file mode 100644 index 5c972bf81c..0000000000 --- a/nnpdfcpp/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# nnpdfcpp -The main programs used in the NNPDF fitting framework. - -## Project summary and aim - -This project contains the principle fitting code of the NNPDF collaboration, -along with it's associated utility programs. - -The main projects are -- filter: Performs fit setup and data kinematic cuts according to an input - runcard. -- nnfit: Performs a NNPDF replica fit based upon the results directory output - but filter. - -and the extra optional programs: -- evolvefit: evolve PDF neural network using APFEL -- fiatlux: generate a T0 set with the photon PDF via `libfiatlux` diff --git a/nnpdfcpp/config/NNPDF31_nlo_as_0118.yml b/nnpdfcpp/config/NNPDF31_nlo_as_0118.yml deleted file mode 100644 index df514ac9d0..0000000000 --- a/nnpdfcpp/config/NNPDF31_nlo_as_0118.yml +++ /dev/null @@ -1,217 +0,0 @@ -# -# Configuration file for NNPDF++ -# - -############################################################ -description: NNPDF3.1 NLO fitted charm global dataset - -############################################################ -# frac: training fraction -# ewk: apply ewk k-factors -# sys: systematics treatment (see systypes) -experiments: -# Fixed target DIS - - experiment: NMC - datasets: - - { dataset: NMCPD, frac: 0.5 } - - { dataset: NMC, frac: 0.5 } - - experiment: SLAC - datasets: - - { dataset: SLACP, frac: 0.5} - - { dataset: SLACD, frac: 0.5} - - experiment: BCDMS - datasets: - - { dataset: BCDMSP, frac: 0.5} - - { dataset: BCDMSD, frac: 0.5} - - experiment: CHORUS - datasets: - - { dataset: CHORUSNU, frac: 0.5} - - { dataset: CHORUSNB, frac: 0.5} - - experiment: NTVDMN - datasets: - - { dataset: NTVNUDMN, frac: 0.5} - - { dataset: NTVNBDMN, frac: 0.5} -# EMC F2C data -# - experiment: EMCF2C -# datasets: -# - { dataset: EMCF2C, frac: 1.0} -# HERA data - - experiment: HERACOMB - datasets: - - { dataset: HERACOMBNCEM , frac: 0.5} - - { dataset: HERACOMBNCEP460, frac: 0.5} - - { dataset: HERACOMBNCEP575, frac: 0.5} - - { dataset: HERACOMBNCEP820, frac: 0.5} - - { dataset: HERACOMBNCEP920, frac: 0.5} - - { dataset: HERACOMBCCEM , frac: 0.5} - - { dataset: HERACOMBCCEP , frac: 0.5} -# Combined HERA charm production cross-sections - - experiment: HERAF2CHARM - datasets: - - { dataset: HERAF2CHARM, frac: 0.5} -# F2bottom data - - experiment: F2BOTTOM - datasets: - - { dataset: H1HERAF2B, frac: 1.0} - - { dataset: ZEUSHERAF2B, frac: 1.0} - # Fixed target Drell-Yan - - experiment: DYE886 - datasets: - - { dataset: DYE886R, frac: 1.0 } - - { dataset: DYE886P, frac: 0.5 } - - experiment: DYE605 - datasets: - - { dataset: DYE605, frac: 0.5 } -# Tevatron jets and W,Z production - - experiment: CDF - datasets: - - { dataset: CDFZRAP, frac: 1.0 } - - { dataset: CDFR2KT, frac: 0.5 } - - experiment: D0 - datasets: - - { dataset: D0ZRAP, frac: 1.0 } - - { dataset: D0WEASY, frac: 1.0 } - - { dataset: D0WMASY, frac: 1.0 } - # ATLAS - - experiment: ATLAS - datasets: -# ATLAS EWK - - { dataset: ATLASWZRAP36PB, frac: 1.0 } - - { dataset: ATLASZHIGHMASS49FB, frac: 1.0 } - - { dataset: ATLASLOMASSDY11EXT, frac: 1.0 } - - { dataset: ATLASWZRAP11, frac: 0.5 } -# ATLAS jets - - { dataset: ATLASR04JETS36PB, frac: 0.5 } - - { dataset: ATLASR04JETS2P76TEV, frac: 0.5 } - - { dataset: ATLAS1JET11, frac: 0.5 } -# ATLAS Z pt -# - { dataset: ATLASZPT7TEV, frac: 0.5, cfac: [NRM] } - - { dataset: ATLASZPT8TEVMDIST, frac: 0.5 } - - { dataset: ATLASZPT8TEVYDIST, frac: 0.5 } -# ATLAS top - - { dataset: ATLASTTBARTOT, frac: 1.0 } - - { dataset: ATLASTOPDIFF8TEVTRAPNORM, frac: 1.0 } -# CMS - - experiment: CMS - datasets: -# CMS EWK - - { dataset: CMSWEASY840PB, frac: 1.0 } - - { dataset: CMSWMASY47FB, frac: 1.0 } - - { dataset: CMSWCHARMTOT, frac: 1.0 } - - { dataset: CMSWCHARMRAT, frac: 1.0 } - - { dataset: CMSDY2D11, frac: 0.5 } - - { dataset: CMSWMU8TEV, frac: 1.0 } -# CMS jets - - { dataset: CMSJETS11, frac: 0.5 } - - { dataset: CMS1JET276TEV, frac: 0.5 } -# CMS Z pt - - { dataset: CMSZDIFF12, frac: 1.0, cfac: [NRM] } -# CMS ttbar - - { dataset: CMSTTBARTOT, frac: 1.0 } - - { dataset: CMSTOPDIFF8TEVTTRAPNORM, frac: 1.0 } - # LHCb - - experiment: LHCb - datasets: - - { dataset: LHCBZ940PB, frac: 1.0 } - - { dataset: LHCBZEE2FB, frac: 1.0 } - - { dataset: LHCBWZMU7TEV, frac: 1.0, cfac: [NRM] } - - { dataset: LHCBWZMU8TEV, frac: 1.0, cfac: [NRM] } - -############################################################ -datacuts: - t0pdfset : 170206-004 # PDF set to generate t0 covmat - q2min : 3.49 # Q2 minimum - w2min : 12.5 # W2 minimum - combocuts : NNPDF31 # NNPDF3.0 final kin. cuts - jetptcut_tev : 0 # jet pt cut for tevatron - jetptcut_lhc : 0 # jet pt cut for lhc - wptcut_lhc : 30.0 # Minimum pT for W pT diff distributions - jetycut_tev : 1e30 # jet rap. cut for tevatron - jetycut_lhc : 1e30 # jet rap. cut for lhc - dymasscut_min: 0 # dy inv.mass. min cut - dymasscut_max: 1e30 # dy inv.mass. max cut - jetcfactcut : 1e30 # jet cfact. cut - -############################################################ -theory: - theoryid: 52 # database id - -############################################################ -fitting: - seed : 65532133529 # set the seed for the random generator - genrep : true # true = generate MC replicas, false = use real data - rngalgo : 0 # 0 = ranlux, 1 = cmrg, see randomgenerator.cc - fitmethod: NGA # Minimization algorithm - ngen : 30000 # Maximum number of generations - nmutants : 80 # Number of mutants for replica - paramtype: NN - nnodes : [2,5,3,1] - - # NN23(QED) = sng=0,g=1,v=2,t3=3,ds=4,sp=5,sm=6,(pht=7) - # EVOL(QED) = sng=0,g=1,v=2,v3=3,v8=4,t3=5,t8=6,(pht=7) - # EVOLS(QED)= sng=0,g=1,v=2,v8=4,t3=4,t8=5,ds=6,(pht=7) - # FLVR(QED) = g=0, u=1, ubar=2, d=3, dbar=4, s=5, sbar=6, (pht=7) - fitbasis: NN31IC # EVOL (7), EVOLQED (8), etc. - basis: - # remeber to change the name of PDF accordingly with fitbasis - # pos: true for NN squared - # mutsize: mutation size - # mutprob: mutation probability - # smallx, largex: preprocessing ranges - - { fl: sng, pos: false, mutsize: [15], mutprob: [0.05], smallx: [1.05,1.19], largex: [1.47,2.70] } - - { fl: g, pos: false, mutsize: [15], mutprob: [0.05], smallx: [0.94,1.25], largex: [0.11,5.87] } - - { fl: v, pos: false, mutsize: [15], mutprob: [0.05], smallx: [0.54,0.75], largex: [1.15,2.76] } - - { fl: v3, pos: false, mutsize: [15], mutprob: [0.05], smallx: [0.21,0.57], largex: [1.35,3.08] } - - { fl: v8, pos: false, mutsize: [15], mutprob: [0.05], smallx: [0.52,0.76], largex: [0.77,3.56] } - - { fl: t3, pos: false, mutsize: [15], mutprob: [0.05], smallx: [-0.37,1.52], largex: [1.74,3.39] } - - { fl: t8, pos: false, mutsize: [15], mutprob: [0.05], smallx: [0.56,1.29], largex: [1.45,3.03] } - - { fl: cp, pos: false, mutsize: [15], mutprob: [0.05], smallx: [0.12,1.19], largex: [1.83,6.70] } - -############################################################ -stopping: - stopmethod: LOOKBACK # Stopping method - lbdelta : 0 # Delta for look-back stopping - mingen : 0 # Minimum number of generations - window : 500 # Window for moving average - minchi2 : 3.5 # Minimum chi2 - minchi2exp: 6.0 # Minimum chi2 for experiments - nsmear : 200 # Smear for stopping - deltasm : 200 # Delta smear for stopping - rv : 2 # Ratio for validation stopping - rt : 0.5 # Ratio for training stopping - epsilon : 1e-6 # Gradient epsilon - -############################################################ -positivity: - posdatasets: - - { dataset: POSF2U, poslambda: 1e6 } # Positivity Lagrange Multiplier - - { dataset: POSF2DW, poslambda: 1e6 } - - { dataset: POSF2S, poslambda: 1e6 } - - { dataset: POSFLL, poslambda: 1e6 } - - { dataset: POSDYU, poslambda: 1e10 } - - { dataset: POSDYD, poslambda: 1e10 } - - { dataset: POSDYS, poslambda: 1e10 } - -############################################################ -closuretest: - filterseed : 0 # Random seed to be used in filtering data partitions - fakedata : false # true = to use FAKEPDF to generate pseudo-data - fakepdf : MSTW2008nlo68cl # Theory input for pseudo-data - errorsize : 1.0 # uncertainties rescaling - fakenoise : false # true = to add random fluctuations to pseudo-data - rancutprob : 1.0 # Fraction of data to be included in the fit - rancutmethod: 0 # Method to select rancutprob data fraction - rancuttrnval: false # 0(1) to output training(valiation) chi2 in report - printpdf4gen: false # To print info on PDFs during minimization - -############################################################ -lhagrid: - nx : 150 - xmin: 1e-9 - xmed: 0.1 - xmax: 1.0 - nq : 50 - qmax: 1e5 - -############################################################ -debug: false diff --git a/nnpdfcpp/config/NNPDF31_nnlo_as_0118.yml b/nnpdfcpp/config/NNPDF31_nnlo_as_0118.yml deleted file mode 100644 index a335475f14..0000000000 --- a/nnpdfcpp/config/NNPDF31_nnlo_as_0118.yml +++ /dev/null @@ -1,217 +0,0 @@ -# -# Configuration file for NNPDF++ -# - -############################################################ -description: NNPDF3.1 NNLO fitted charm global dataset - -############################################################ -# frac: training fraction -# ewk: apply ewk k-factors -# sys: systematics treatment (see systypes) -experiments: -# Fixed target DIS - - experiment: NMC - datasets: - - { dataset: NMCPD, frac: 0.5 } - - { dataset: NMC, frac: 0.5 } - - experiment: SLAC - datasets: - - { dataset: SLACP, frac: 0.5} - - { dataset: SLACD, frac: 0.5} - - experiment: BCDMS - datasets: - - { dataset: BCDMSP, frac: 0.5} - - { dataset: BCDMSD, frac: 0.5} - - experiment: CHORUS - datasets: - - { dataset: CHORUSNU, frac: 0.5} - - { dataset: CHORUSNB, frac: 0.5} - - experiment: NTVDMN - datasets: - - { dataset: NTVNUDMN, frac: 0.5} - - { dataset: NTVNBDMN, frac: 0.5} -# EMC F2C data -# - experiment: EMCF2C -# datasets: -# - { dataset: EMCF2C, frac: 1.0} -# HERA data - - experiment: HERACOMB - datasets: - - { dataset: HERACOMBNCEM , frac: 0.5} - - { dataset: HERACOMBNCEP460, frac: 0.5} - - { dataset: HERACOMBNCEP575, frac: 0.5} - - { dataset: HERACOMBNCEP820, frac: 0.5} - - { dataset: HERACOMBNCEP920, frac: 0.5} - - { dataset: HERACOMBCCEM , frac: 0.5} - - { dataset: HERACOMBCCEP , frac: 0.5} -# Combined HERA charm production cross-sections - - experiment: HERAF2CHARM - datasets: - - { dataset: HERAF2CHARM, frac: 0.5} -# F2bottom data - - experiment: F2BOTTOM - datasets: - - { dataset: H1HERAF2B, frac: 1.0} - - { dataset: ZEUSHERAF2B, frac: 1.0} - # Fixed target Drell-Yan - - experiment: DYE886 - datasets: - - { dataset: DYE886R, frac: 1.0 } - - { dataset: DYE886P, frac: 0.5, cfac: [QCD] } - - experiment: DYE605 - datasets: - - { dataset: DYE605, frac: 0.5, cfac: [QCD] } -# Tevatron jets and W,Z production - - experiment: CDF - datasets: - - { dataset: CDFZRAP, frac: 1.0, cfac: [QCD] } - - { dataset: CDFR2KT, frac: 0.5, sys: 10 } - - experiment: D0 - datasets: - - { dataset: D0ZRAP, frac: 1.0, cfac: [QCD] } - - { dataset: D0WEASY, frac: 1.0, cfac: [QCD] } - - { dataset: D0WMASY, frac: 1.0, cfac: [QCD] } - # ATLAS - - experiment: ATLAS - datasets: -# ATLAS EWK - - { dataset: ATLASWZRAP36PB, frac: 1.0, cfac: [QCD] } - - { dataset: ATLASZHIGHMASS49FB, frac: 1.0, cfac: [QCD] } - - { dataset: ATLASLOMASSDY11EXT, frac: 1.0, cfac: [QCD] } - - { dataset: ATLASWZRAP11, frac: 0.5, cfac: [QCD] } -# ATLAS jets - - { dataset: ATLASR04JETS36PB, frac: 0.5, sys: 10 } - - { dataset: ATLASR04JETS2P76TEV, frac: 0.5, sys: 10 } - - { dataset: ATLAS1JET11, frac: 0.5, sys: 10 } -# ATLAS Z pt -# - { dataset: ATLASZPT7TEV, frac: 0.5, cfac: [QCD,NRM], sys: 10 } - - { dataset: ATLASZPT8TEVMDIST, frac: 0.5, cfac: [QCD], sys: 10 } - - { dataset: ATLASZPT8TEVYDIST, frac: 0.5, cfac: [QCD], sys: 10 } -# ATLAS top - - { dataset: ATLASTTBARTOT, frac: 1.0, cfac: [QCD] } - - { dataset: ATLASTOPDIFF8TEVTRAPNORM, frac: 1.0, cfac: [QCD] } -# CMS - - experiment: CMS - datasets: -# CMS EWK - - { dataset: CMSWEASY840PB, frac: 1.0, cfac: [QCD] } - - { dataset: CMSWMASY47FB, frac: 1.0, cfac: [QCD] } -# - { dataset: CMSWCHARMTOT, frac: 1.0 } -# - { dataset: CMSWCHARMRAT, frac: 1.0 } - - { dataset: CMSDY2D11, frac: 0.5, cfac: [QCD] } - - { dataset: CMSWMU8TEV, frac: 1.0, cfac: [QCD] } -# CMS jets - - { dataset: CMSJETS11, frac: 0.5, sys: 10 } - - { dataset: CMS1JET276TEV, frac: 0.5, sys: 10 } -# CMS Z pt - - { dataset: CMSZDIFF12, frac: 1.0, cfac: [QCD,NRM], sys: 10 } -# CMS ttbar - - { dataset: CMSTTBARTOT, frac: 1.0, cfac: [QCD] } - - { dataset: CMSTOPDIFF8TEVTTRAPNORM, frac: 1.0, cfac: [QCD] } - # LHCb - - experiment: LHCb - datasets: - - { dataset: LHCBZ940PB, frac: 1.0, cfac: [QCD] } - - { dataset: LHCBZEE2FB, frac: 1.0, cfac: [QCD] } - - { dataset: LHCBWZMU7TEV, frac: 1.0, cfac: [NRM,QCD] } - - { dataset: LHCBWZMU8TEV, frac: 1.0, cfac: [NRM,QCD] } - -############################################################ -datacuts: - t0pdfset : 170206-003 # PDF set to generate t0 covmat - q2min : 3.49 # Q2 minimum - w2min : 12.5 # W2 minimum - combocuts : NNPDF31 # NNPDF3.0 final kin. cuts - jetptcut_tev : 0 # jet pt cut for tevatron - jetptcut_lhc : 0 # jet pt cut for lhc - wptcut_lhc : 30.0 # Minimum pT for W pT diff distributions - jetycut_tev : 1e30 # jet rap. cut for tevatron - jetycut_lhc : 1e30 # jet rap. cut for lhc - dymasscut_min: 0 # dy inv.mass. min cut - dymasscut_max: 1e30 # dy inv.mass. max cut - jetcfactcut : 1e30 # jet cfact. cut - -############################################################ -theory: - theoryid: 53 # database id - -############################################################ -fitting: - seed : 9453862133528 # set the seed for the random generator - genrep : true # true = generate MC replicas, false = use real data - rngalgo : 0 # 0 = ranlux, 1 = cmrg, see randomgenerator.cc - fitmethod: NGA # Minimization algorithm - ngen : 30000 # Maximum number of generations - nmutants : 80 # Number of mutants for replica - paramtype: NN - nnodes : [2,5,3,1] - - # NN23(QED) = sng=0,g=1,v=2,t3=3,ds=4,sp=5,sm=6,(pht=7) - # EVOL(QED) = sng=0,g=1,v=2,v3=3,v8=4,t3=5,t8=6,(pht=7) - # EVOLS(QED)= sng=0,g=1,v=2,v8=4,t3=4,t8=5,ds=6,(pht=7) - # FLVR(QED) = g=0, u=1, ubar=2, d=3, dbar=4, s=5, sbar=6, (pht=7) - fitbasis: NN31IC # EVOL (7), EVOLQED (8), etc. - basis: - # remeber to change the name of PDF accordingly with fitbasis - # pos: true for NN squared - # mutsize: mutation size - # mutprob: mutation probability - # smallx, largex: preprocessing ranges - - { fl: sng, pos: false, mutsize: [15], mutprob: [0.05], smallx: [1.04,1.20], largex: [1.45,2.64] } - - { fl: g, pos: false, mutsize: [15], mutprob: [0.05], smallx: [0.82,1.31], largex: [0.20,6.17] } - - { fl: v, pos: false, mutsize: [15], mutprob: [0.05], smallx: [0.51,0.71], largex: [1.24,2.80] } - - { fl: v3, pos: false, mutsize: [15], mutprob: [0.05], smallx: [0.23,0.63], largex: [1.02,3.14] } - - { fl: v8, pos: false, mutsize: [15], mutprob: [0.05], smallx: [0.53,0.75], largex: [0.70,3.31] } - - { fl: t3, pos: false, mutsize: [15], mutprob: [0.05], smallx: [-0.45,1.41], largex: [1.78,3.21] } - - { fl: t8, pos: false, mutsize: [15], mutprob: [0.05], smallx: [0.49,1.32], largex: [1.42,3.13] } - - { fl: cp, pos: false, mutsize: [15], mutprob: [0.05], smallx: [-0.07,1.13], largex: [1.73,7.37] } - -############################################################ -stopping: - stopmethod: LOOKBACK # Stopping method - lbdelta : 0 # Delta for look-back stopping - mingen : 0 # Minimum number of generations - window : 500 # Window for moving average - minchi2 : 3.5 # Minimum chi2 - minchi2exp: 6.0 # Minimum chi2 for experiments - nsmear : 200 # Smear for stopping - deltasm : 200 # Delta smear for stopping - rv : 2 # Ratio for validation stopping - rt : 0.5 # Ratio for training stopping - epsilon : 1e-6 # Gradient epsilon - -############################################################ -positivity: - posdatasets: - - { dataset: POSF2U, poslambda: 1e6 } # Positivity Lagrange Multiplier - - { dataset: POSF2DW, poslambda: 1e6 } - - { dataset: POSF2S, poslambda: 1e6 } - - { dataset: POSFLL, poslambda: 1e6 } - - { dataset: POSDYU, poslambda: 1e10 } - - { dataset: POSDYD, poslambda: 1e10 } - - { dataset: POSDYS, poslambda: 1e10 } - -############################################################ -closuretest: - filterseed : 0 # Random seed to be used in filtering data partitions - fakedata : false # true = to use FAKEPDF to generate pseudo-data - fakepdf : MSTW2008nlo68cl # Theory input for pseudo-data - errorsize : 1.0 # uncertainties rescaling - fakenoise : false # true = to add random fluctuations to pseudo-data - rancutprob : 1.0 # Fraction of data to be included in the fit - rancutmethod: 0 # Method to select rancutprob data fraction - rancuttrnval: false # 0(1) to output training(valiation) chi2 in report - printpdf4gen: false # To print info on PDFs during minimization - -############################################################ -lhagrid: - nx : 150 - xmin: 1e-9 - xmed: 0.1 - xmax: 1.0 - nq : 50 - qmax: 1e5 - -############################################################ -debug: false diff --git a/nnpdfcpp/config/fiatlux.yml b/nnpdfcpp/config/fiatlux.yml deleted file mode 100644 index d4d7696c34..0000000000 --- a/nnpdfcpp/config/fiatlux.yml +++ /dev/null @@ -1,32 +0,0 @@ -# runcard for libluxqed -qed_running: true # determines the running of alpha. -q2_max : 1e9 # the maximum allowed Q2. -eps_base : 1e-5 # precision on final integration of double integral. -eps_rel : 1e-1 # extra precision on any single integration. -mproton : 0.938272046 # proton mass from 2015 update of PDG review -mum_proton : 2.792847356 # proton magnetic moment, from -# http://pdglive.lbl.gov/DataBlock.action?node=S016MM which itself -# gets it from arXiv:1203.5425 (CODATA) - -# the elastic param type, options: -# dipole -# A1_world_spline -# A1_world_pol_spline -elastic_param: A1_world_pol_spline -elastic_electric_rescale: 1 -elastic_magnetic_rescale: 1 - -# the inelastic param type, options: -inelastic_param: LHAPDF_Hermes_ALLM_CLAS # Hermes_ALLM_CLAS, LHAPDF_Hermes_ALLM_CLAS -rescale_r_twist4: 0 -rescale_r: 1 -allm_limits: 0 -rescale_non_resonance: 1 -rescale_resonance: 1 -use_mu2_as_upper_limit: false -q2min_inel_override: 0.0 -q2max_inel_override: 1E300 -lhapdf_transition_q2: 9 - -# general -verbose: true diff --git a/nnpdfcpp/config/nPDF.yml b/nnpdfcpp/config/nPDF.yml deleted file mode 100644 index 269710b147..0000000000 --- a/nnpdfcpp/config/nPDF.yml +++ /dev/null @@ -1,136 +0,0 @@ -# -# Configuration file for nNNPDF1.0 -# - -############################################################ -description: nNNPDF1.0 NLO fitted nuclear PDF - -############################################################ -# frac: training fraction -# ewk: apply ewk k-factors -# sys: systematics treatment (see systypes) -experiments: -# Fixed target DIS - - experiment: NMC - datasets: - - { dataset: nNMCCD, frac: 0.5 } - - { dataset: nNMCHED,frac: 0.5 } - - { dataset: nNMCCAD,frac: 0.5 } - - { dataset: nNMCLID,frac: 0.5 } - - - experiment: SLAC - datasets: - - { dataset: nE139AGD,frac: 0.5 } - - { dataset: nE139ALD,frac: 0.5 } - - { dataset: nE139AUD,frac: 0.5 } - - { dataset: nE139BED,frac: 0.5 } - - { dataset: nE139CAD,frac: 0.5 } - - { dataset: nE139CD ,frac: 0.5 } - - { dataset: nE139FED,frac: 0.5 } - - { dataset: nE139HED,frac: 0.5 } - - - experiment: EMC - datasets: - - { dataset: nEMCC ,frac: 0.5 } - - { dataset: nEMCCA,frac: 0.5 } - - { dataset: nEMCCAD,frac: 0.5 } - - { dataset: nEMCCD,frac: 0.5 } - - { dataset: nEMCCUD,frac: 0.5 } - - { dataset: nEMCFE ,frac: 0.5 } - - { dataset: nEMCFED,frac: 0.5} - - { dataset: nEMCSND,frac: 0.5 } - - -############################################################ -datacuts: - t0pdfset : NNPDF30_nlo_as_0118 # PDF set to generate t0 covmat - q2min : 1.69 # Q2 minimum - w2min : 0.01 # W2 minimum - combocuts : NNPDF31 # NNPDF3.0 final kin. cuts - jetptcut_tev : 0 # jet pt cut for tevatron - jetptcut_lhc : 0 # jet pt cut for lhc - wptcut_lhc : 30.0 # Minimum pT for W pT diff distributions - jetycut_tev : 1e30 # jet rap. cut for tevatron - jetycut_lhc : 1e30 # jet rap. cut for lhc - dymasscut_min: 0 # dy inv.mass. min cut - dymasscut_max: 1e30 # dy inv.mass. max cut - jetcfactcut : 1e30 # jet cfact. cut - -############################################################ -theory: - theoryid: 200 # database id - -############################################################ -fitting: - seed : 65532133529 # set the seed for the random generator - genrep : false # true = generate MC replicas, false = use real data - rngalgo : 0 # 0 = ranlux, 1 = cmrg, see randomgenerator.cc - fitmethod: NGA # Minimization algorithm - ngen : 30000 # Maximum number of generations - nmutants : 80 # Number of mutants for replica - paramtype: NN - nnodes : [2,5,3,1] - - # NN23(QED) = sng=0,g=1,v=2,t3=3,ds=4,sp=5,sm=6,(pht=7) - # EVOL(QED) = sng=0,g=1,v=2,v3=3,v8=4,t3=5,t8=6,(pht=7) - # EVOLS(QED)= sng=0,g=1,v=2,v8=4,t3=4,t8=5,ds=6,(pht=7) - # FLVR(QED) = g=0, u=1, ubar=2, d=3, dbar=4, s=5, sbar=6, (pht=7) - fitbasis: DISEVOL #, EVOLQED (8), etc. - basis: - # remeber to change the name of PDF accordingly with fitbasis - # pos: true for NN squared - # mutsize: mutation size - # mutprob: mutation probability - # smallx, largex: preprocessing ranges - - { fl: sng, pos: false, mutsize: [15], mutprob: [0.05], smallx: [1.05,1.19], largex: [1.47,2.70] } - - { fl: g, pos: false, mutsize: [15], mutprob: [0.05], smallx: [0.94,1.25], largex: [0.11,5.87] } - - { fl: t8, pos: false, mutsize: [15], mutprob: [0.05], smallx: [-0.37,1.52], largex: [1.74,3.39] } - -############################################################ -stopping: - stopmethod: LOOKBACK # Stopping method - lbdelta : 0 # Delta for look-back stopping - mingen : 0 # Minimum number of generations - window : 500 # Window for moving average - minchi2 : 3.5 # Minimum chi2 - minchi2exp: 6.0 # Minimum chi2 for experiments - nsmear : 200 # Smear for stopping - deltasm : 200 # Delta smear for stopping - rv : 2 # Ratio for validation stopping - rt : 0.5 # Ratio for training stopping - epsilon : 1e-6 # Gradient epsilon - -############################################################ -positivity: - posdatasets: - - { dataset: POSF2U, poslambda: 1e6 } # Positivity Lagrange Multiplier - - { dataset: POSF2DW, poslambda: 1e6 } - - { dataset: POSF2S, poslambda: 1e6 } - - { dataset: POSFLL, poslambda: 1e6 } - - { dataset: POSDYU, poslambda: 1e10 } - - { dataset: POSDYD, poslambda: 1e10 } - - { dataset: POSDYS, poslambda: 1e10 } - -############################################################ -closuretest: - filterseed : 0 # Random seed to be used in filtering data partitions - fakedata : false # true = to use FAKEPDF to generate pseudo-data - fakepdf : MSTW2008nlo68cl # Theory input for pseudo-data - errorsize : 1.0 # uncertainties rescaling - fakenoise : false # true = to add random fluctuations to pseudo-data - rancutprob : 1.0 # Fraction of data to be included in the fit - rancutmethod: 0 # Method to select rancutprob data fraction - rancuttrnval: false # 0(1) to output training(valiation) chi2 in report - printpdf4gen: false # To print info on PDFs during minimization - -############################################################ -lhagrid: - nx : 150 - xmin: 1e-9 - xmed: 0.1 - xmax: 1.0 - nq : 50 - qmax: 1e5 - -############################################################ -debug: false diff --git a/nnpdfcpp/config/plotting.yml b/nnpdfcpp/config/plotting.yml deleted file mode 100644 index 9c21a10758..0000000000 --- a/nnpdfcpp/config/plotting.yml +++ /dev/null @@ -1,18 +0,0 @@ -# -# Configuration file for plotting options -# - -############################################################ -uset0 : false # use t0 in chi2check, validphys -pdfcteq : CT14nlo -pdfmstw : MMHT2014nlo68cl -plotformat : eps # root file format -errorband : true # 1 for 1sigma, 0 for 68% c.l. -nxpoints : 100 # points in x -q2 : 2.0 # Q2 for plots -ymaxdistances : 20.0 # maximum y for distances plot -preproc : true # yes/no preprocessing analysis -plotreplicas : true # yes/no plot pdf replicas -plotratios : false # yes/no plot pdf ratios -plotarclengths: true # yes/no plot pdf arclengths -verbose : true # yes/no show prediction details in report diff --git a/nnpdfcpp/config/testconfig.yml b/nnpdfcpp/config/testconfig.yml deleted file mode 100644 index f8ccde0a71..0000000000 --- a/nnpdfcpp/config/testconfig.yml +++ /dev/null @@ -1,104 +0,0 @@ -# -# Configuration file for NNPDF++ -# - -############################################################ -description: NNPDF3.1 NLO fitted charm global dataset - -############################################################ -# frac: training fraction -# ewk: apply ewk k-factors -# sys: systematics treatment (see systypes) -experiments: -# Fixed target DIS - - experiment: NMC - datasets: - - { dataset: NMCPD, frac: 0.5 } - - { dataset: NMC, frac: 0.5, weight: 10000} - -############################################################ -datacuts: - t0pdfset : NNPDF31_nnlo_as_0118 # PDF set to generate t0 covmat - q2min : 3.49 # Q2 minimum - w2min : 12.5 # W2 minimum - combocuts : NNPDF31 # NNPDF3.0 final kin. cuts - jetptcut_tev : 0 # jet pt cut for tevatron - jetptcut_lhc : 0 # jet pt cut for lhc - wptcut_lhc : 30.0 # Minimum pT for W pT diff distributions - jetycut_tev : 1e30 # jet rap. cut for tevatron - jetycut_lhc : 1e30 # jet rap. cut for lhc - dymasscut_min: 0 # dy inv.mass. min cut - dymasscut_max: 1e30 # dy inv.mass. max cut - jetcfactcut : 1e30 # jet cfact. cut - -############################################################ -theory: - theoryid: 162 # database id - -############################################################ -fitting: - seed : 65532133529 # set the seed for the random generator - genrep : true # true = generate MC replicas, false = use real data - rngalgo : 0 # 0 = ranlux, 1 = cmrg, see randomgenerator.cc - fitmethod: NGA # Minimization algorithm - ngen : 30000 # Maximum number of generations - nmutants : 80 # Number of mutants for replica - paramtype: NN - nnodes : [2,5,3,1] - - # NN23(QED) = sng=0,g=1,v=2,t3=3,ds=4,sp=5,sm=6,(pht=7) - # EVOL(QED) = sng=0,g=1,v=2,v3=3,v8=4,t3=5,t8=6,(pht=7) - # EVOLS(QED)= sng=0,g=1,v=2,v8=4,t3=4,t8=5,ds=6,(pht=7) - # FLVR(QED) = g=0, u=1, ubar=2, d=3, dbar=4, s=5, sbar=6, (pht=7) - fitbasis: NN31IC # EVOL (7), EVOLQED (8), etc. - basis: - # remeber to change the name of PDF accordingly with fitbasis - # pos: true for NN squared - # mutsize: mutation size - # mutprob: mutation probability - # smallx, largex: preprocessing ranges - - { fl: sng, pos: false, mutsize: [15], mutprob: [0.05], smallx: [1.05,1.19], largex: [1.47,2.70] } - - { fl: g, pos: false, mutsize: [15], mutprob: [0.05], smallx: [0.94,1.25], largex: [0.11,5.87] } - - { fl: v, pos: false, mutsize: [15], mutprob: [0.05], smallx: [0.54,0.75], largex: [1.15,2.76] } - - { fl: v3, pos: false, mutsize: [15], mutprob: [0.05], smallx: [0.21,0.57], largex: [1.35,3.08] } - - { fl: v8, pos: false, mutsize: [15], mutprob: [0.05], smallx: [0.52,0.76], largex: [0.77,3.56] } - - { fl: t3, pos: false, mutsize: [15], mutprob: [0.05], smallx: [-0.37,1.52], largex: [1.74,3.39] } - - { fl: t8, pos: false, mutsize: [15], mutprob: [0.05], smallx: [0.56,1.29], largex: [1.45,3.03] } - - { fl: cp, pos: false, mutsize: [15], mutprob: [0.05], smallx: [0.12,1.19], largex: [1.83,6.70] } - -############################################################ -stopping: - stopmethod: LOOKBACK # Stopping method - lbdelta : 0 # Delta for look-back stopping - mingen : 0 # Minimum number of generations - window : 500 # Window for moving average - minchi2 : 3.5 # Minimum chi2 - minchi2exp: 6.0 # Minimum chi2 for experiments - nsmear : 200 # Smear for stopping - deltasm : 200 # Delta smear for stopping - rv : 2 # Ratio for validation stopping - rt : 0.5 # Ratio for training stopping - epsilon : 1e-6 # Gradient epsilon - -############################################################ -positivity: - posdatasets: - - { dataset: POSF2U, poslambda: 1e6 } # Positivity Lagrange Multiplier - - { dataset: POSF2DW, poslambda: 1e6 } - - { dataset: POSF2S, poslambda: 1e6 } - - { dataset: POSFLL, poslambda: 1e6 } - - { dataset: POSDYU, poslambda: 1e10 } - - { dataset: POSDYD, poslambda: 1e10 } - - { dataset: POSDYS, poslambda: 1e10 } - -############################################################ -closuretest: - filterseed : 0 # Random seed to be used in filtering data partitions - fakedata : false # true = to use FAKEPDF to generate pseudo-data - errorsize : 1.0 # uncertainties rescaling - fakenoise : false # on = to add random fluctuations to pseudo-data - printpdf4gen: false # To print info on PDFs during minimization - -############################################################ -debug: false - diff --git a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN01.dat b/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN01.dat deleted file mode 100644 index d7d6c2aac8..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN01.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN01 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0000 0.00000 -0.0000 0.00000 -0.0000 0.00000 -0.0000 0.00000 -0.0002 0.00000 -0.0006 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN02.dat b/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN02.dat deleted file mode 100644 index ad719fd3b1..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN02.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN02 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0000 0.00000 -0.0000 0.00000 -0.0001 0.00000 -0.0015 0.00000 -0.0035 0.00000 -0.0052 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN03.dat b/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN03.dat deleted file mode 100644 index 14bda9be88..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN03.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN03 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0000 0.00000 -0.0000 0.00000 -0.0023 0.00000 -0.0078 0.00000 -0.0120 0.00000 -0.0125 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN04.dat b/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN04.dat deleted file mode 100644 index f1dbb802ba..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN04.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN04 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0000 0.00000 -0.0007 0.00000 -0.0105 0.00000 -0.0176 0.00000 -0.0207 0.00000 -0.0203 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN05.dat b/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN05.dat deleted file mode 100644 index 77c3aac13c..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN05.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN05 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0000 0.00000 -0.0071 0.00000 -0.0205 0.00000 -0.0270 0.00000 -0.0298 0.00000 -0.0268 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN06.dat b/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN06.dat deleted file mode 100644 index 565c19f43b..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN06.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN06 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0007 0.00000 -0.0188 0.00000 -0.0298 0.00000 -0.0364 0.00000 -0.0379 0.00000 -0.0336 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN07.dat b/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN07.dat deleted file mode 100644 index d4801d0ba6..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN07.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN07 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0064 0.00000 -0.0299 0.00000 -0.0384 0.00000 -0.0436 0.00000 -0.0455 0.00000 -0.0374 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN08.dat b/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN08.dat deleted file mode 100644 index 4cc8398804..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN08.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN08 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0175 0.00000 -0.0366 0.00000 -0.0456 0.00000 -0.0499 0.00000 -0.0518 0.00000 -0.0405 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN09.dat b/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN09.dat deleted file mode 100644 index 7f4a0e5495..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN09.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN09 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0304 0.00000 -0.0432 0.00000 -0.0510 0.00000 -0.0550 0.00000 -0.0544 0.00000 -0.0415 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN10.dat b/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN10.dat deleted file mode 100644 index 8eba95e506..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_D_BIN10.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN10 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0370 0.00000 -0.0471 0.00000 -0.0557 0.00000 -0.0591 0.00000 -0.0568 0.00000 -0.0413 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN01.dat b/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN01.dat deleted file mode 100644 index 39ca399219..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN01.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN01 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0000 0.00000 -0.0000 0.00000 -0.0000 0.00000 -0.0000 0.00000 -0.0002 0.00000 -0.0006 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN02.dat b/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN02.dat deleted file mode 100644 index 59c0490791..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN02.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN02 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0000 0.00000 -0.0000 0.00000 -0.0001 0.00000 -0.0015 0.00000 -0.0035 0.00000 -0.0052 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN03.dat b/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN03.dat deleted file mode 100644 index f30d443914..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN03.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN03 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0000 0.00000 -0.0000 0.00000 -0.0023 0.00000 -0.0078 0.00000 -0.0120 0.00000 -0.0125 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN04.dat b/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN04.dat deleted file mode 100644 index f4cf5b454d..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN04.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN04 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0000 0.00000 -0.0007 0.00000 -0.0105 0.00000 -0.0176 0.00000 -0.0207 0.00000 -0.0203 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN05.dat b/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN05.dat deleted file mode 100644 index a3cf9d57e6..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN05.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN05 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0000 0.00000 -0.0071 0.00000 -0.0205 0.00000 -0.0270 0.00000 -0.0298 0.00000 -0.0268 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN06.dat b/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN06.dat deleted file mode 100644 index d205bcb9a0..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN06.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN06 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0007 0.00000 -0.0188 0.00000 -0.0298 0.00000 -0.0364 0.00000 -0.0379 0.00000 -0.0336 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN07.dat b/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN07.dat deleted file mode 100644 index d78ba9fc67..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN07.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN07 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0064 0.00000 -0.0299 0.00000 -0.0384 0.00000 -0.0436 0.00000 -0.0455 0.00000 -0.0374 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN08.dat b/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN08.dat deleted file mode 100644 index 4213c51f6f..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN08.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN08 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0175 0.00000 -0.0366 0.00000 -0.0456 0.00000 -0.0499 0.00000 -0.0518 0.00000 -0.0405 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN09.dat b/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN09.dat deleted file mode 100644 index 79803c6687..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN09.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN09 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0304 0.00000 -0.0432 0.00000 -0.0510 0.00000 -0.0550 0.00000 -0.0544 0.00000 -0.0415 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN10.dat b/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN10.dat deleted file mode 100644 index 072120afb4..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_ACC_DYE906R_P_BIN10.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN10 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0370 0.00000 -0.0471 0.00000 -0.0557 0.00000 -0.0591 0.00000 -0.0568 0.00000 -0.0413 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_BCDMSD.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_BCDMSD.dat deleted file mode 100644 index 031ce6d311..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_BCDMSD.dat +++ /dev/null @@ -1,263 +0,0 @@ -******************************************************************************** -SetName: BCDMSD_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -0.99579 0.00000 -0.99466 0.00000 -0.99840 0.00000 -0.99723 0.00000 -0.99624 0.00000 -1.00119 0.00000 -1.00010 0.00000 -0.99901 0.00000 -0.99799 0.00000 -0.99709 0.00000 -1.00153 0.00000 -1.00067 0.00000 -0.99974 0.00000 -0.99881 0.00000 -0.99800 0.00000 -0.99713 0.00000 -0.99609 0.00000 -1.00017 0.00000 -0.99975 0.00000 -0.99918 0.00000 -0.99855 0.00000 -0.99796 0.00000 -0.99729 0.00000 -0.99632 0.00000 -0.99561 0.00000 -0.99484 0.00000 -0.99836 0.00000 -0.99816 0.00000 -0.99786 0.00000 -0.99755 0.00000 -0.99714 0.00000 -0.99632 0.00000 -0.99582 0.00000 -0.99523 0.00000 -0.99468 0.00000 -0.99412 0.00000 -0.99444 0.00000 -0.99444 0.00000 -0.99440 0.00000 -0.99434 0.00000 -0.99422 0.00000 -0.99365 0.00000 -0.99347 0.00000 -0.99324 0.00000 -0.99298 0.00000 -0.99271 0.00000 -0.99241 0.00000 -0.99213 0.00000 -0.98656 0.00000 -0.98728 0.00000 -0.98792 0.00000 -0.98845 0.00000 -0.98896 0.00000 -0.98893 0.00000 -0.98939 0.00000 -0.98983 0.00000 -0.99020 0.00000 -0.99050 0.00000 -0.99077 0.00000 -0.99099 0.00000 -0.99120 0.00000 -0.99138 0.00000 -0.96753 0.00000 -0.97033 0.00000 -0.97273 0.00000 -0.97524 0.00000 -0.97697 0.00000 -0.97933 0.00000 -0.98176 0.00000 -0.98391 0.00000 -0.98580 0.00000 -0.98760 0.00000 -0.98923 0.00000 -0.99071 0.00000 -0.99205 0.00000 -0.99332 0.00000 -0.97260 0.00000 -0.97774 0.00000 -0.98333 0.00000 -0.98824 0.00000 -0.99379 0.00000 -0.99969 0.00000 -1.00505 0.00000 -1.00991 0.00000 -1.01463 0.00000 -1.01906 0.00000 -1.02315 0.00000 -1.02692 0.00000 -1.03052 0.00000 -1.03402 0.00000 -1.16299 0.00000 -1.17618 0.00000 -1.18814 0.00000 -1.19977 0.00000 -1.21073 0.00000 -1.22090 0.00000 -1.23025 0.00000 -1.23919 0.00000 -1.24788 0.00000 -0.99206 0.00000 -0.99164 0.00000 -0.99377 0.00000 -0.99306 0.00000 -0.99239 0.00000 -0.99616 0.00000 -0.99519 0.00000 -0.99432 0.00000 -0.99342 0.00000 -0.99713 0.00000 -0.99609 0.00000 -0.99521 0.00000 -0.99430 0.00000 -0.99346 0.00000 -0.99268 0.00000 -0.99561 0.00000 -0.99484 0.00000 -0.99409 0.00000 -0.99340 0.00000 -0.99271 0.00000 -0.99205 0.00000 -0.99582 0.00000 -0.99523 0.00000 -0.99468 0.00000 -0.99412 0.00000 -0.99355 0.00000 -0.99298 0.00000 -0.99243 0.00000 -0.99192 0.00000 -0.99324 0.00000 -0.99298 0.00000 -0.99271 0.00000 -0.99241 0.00000 -0.99213 0.00000 -0.99182 0.00000 -0.99153 0.00000 -0.99123 0.00000 -0.99094 0.00000 -0.98983 0.00000 -0.99020 0.00000 -0.99050 0.00000 -0.99077 0.00000 -0.99099 0.00000 -0.99120 0.00000 -0.99138 0.00000 -0.99159 0.00000 -0.99174 0.00000 -0.99190 0.00000 -0.98176 0.00000 -0.98391 0.00000 -0.98580 0.00000 -0.98760 0.00000 -0.98923 0.00000 -0.99071 0.00000 -0.99205 0.00000 -0.99332 0.00000 -0.99454 0.00000 -0.99577 0.00000 -0.99711 0.00000 -0.99969 0.00000 -1.00505 0.00000 -1.00991 0.00000 -1.01463 0.00000 -1.01906 0.00000 -1.02315 0.00000 -1.02692 0.00000 -1.03052 0.00000 -1.03402 0.00000 -1.03762 0.00000 -1.04144 0.00000 -1.18814 0.00000 -1.19977 0.00000 -1.21073 0.00000 -1.22090 0.00000 -1.23025 0.00000 -1.23919 0.00000 -1.24788 0.00000 -1.25684 0.00000 -1.26632 0.00000 -0.99112 0.00000 -0.99056 0.00000 -0.99262 0.00000 -0.99190 0.00000 -0.99121 0.00000 -0.99058 0.00000 -0.99346 0.00000 -0.99268 0.00000 -0.99194 0.00000 -0.99125 0.00000 -0.99060 0.00000 -0.99409 0.00000 -0.99340 0.00000 -0.99271 0.00000 -0.99205 0.00000 -0.99143 0.00000 -0.99085 0.00000 -0.99031 0.00000 -0.99468 0.00000 -0.99412 0.00000 -0.99355 0.00000 -0.99298 0.00000 -0.99243 0.00000 -0.99192 0.00000 -0.99142 0.00000 -0.99093 0.00000 -0.99042 0.00000 -0.99271 0.00000 -0.99241 0.00000 -0.99213 0.00000 -0.99182 0.00000 -0.99153 0.00000 -0.99123 0.00000 -0.99094 0.00000 -0.99064 0.00000 -0.99031 0.00000 -0.99050 0.00000 -0.99077 0.00000 -0.99099 0.00000 -0.99120 0.00000 -0.99138 0.00000 -0.99159 0.00000 -0.99174 0.00000 -0.99190 0.00000 -0.99208 0.00000 -0.99231 0.00000 -0.98580 0.00000 -0.98760 0.00000 -0.98923 0.00000 -0.99071 0.00000 -0.99205 0.00000 -0.99332 0.00000 -0.99454 0.00000 -0.99577 0.00000 -0.99711 0.00000 -0.99877 0.00000 -1.00047 0.00000 -1.01463 0.00000 -1.01906 0.00000 -1.02315 0.00000 -1.02692 0.00000 -1.03052 0.00000 -1.03402 0.00000 -1.03762 0.00000 -1.04144 0.00000 -1.04634 0.00000 -1.05143 0.00000 -1.21073 0.00000 -1.22090 0.00000 -1.23025 0.00000 -1.23919 0.00000 -1.24788 0.00000 -1.25684 0.00000 -1.26632 0.00000 -1.27844 0.00000 -1.29094 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE886R_D.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE886R_D.dat deleted file mode 100644 index 89547b01b5..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE886R_D.dat +++ /dev/null @@ -1,24 +0,0 @@ -******************************************************************************** -SetName: DYE886R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -0.91877 0.00000 -0.95867 0.00000 -0.96999 0.00000 -0.97256 0.00000 -0.97029 0.00000 -0.96768 0.00000 -0.96536 0.00000 -0.96404 0.00000 -0.96185 0.00000 -0.95957 0.00000 -0.95549 0.00000 -0.95105 0.00000 -0.94652 0.00000 -0.95347 0.00000 -0.93102 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE886R_P.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE886R_P.dat deleted file mode 100644 index c7483e4769..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE886R_P.dat +++ /dev/null @@ -1,24 +0,0 @@ -******************************************************************************** -SetName: DYE886R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN01.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN01.dat deleted file mode 100644 index a9f5983ae1..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN01.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.03295 0.00000 -1.00381 0.00000 -1.00724 0.00000 -1.01601 0.00000 -1.00514 0.00000 -0.90877 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN02.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN02.dat deleted file mode 100644 index a9f5983ae1..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN02.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.03295 0.00000 -1.00381 0.00000 -1.00724 0.00000 -1.01601 0.00000 -1.00514 0.00000 -0.90877 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN03.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN03.dat deleted file mode 100644 index a9f5983ae1..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN03.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.03295 0.00000 -1.00381 0.00000 -1.00724 0.00000 -1.01601 0.00000 -1.00514 0.00000 -0.90877 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN04.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN04.dat deleted file mode 100644 index a9f5983ae1..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN04.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.03295 0.00000 -1.00381 0.00000 -1.00724 0.00000 -1.01601 0.00000 -1.00514 0.00000 -0.90877 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN05.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN05.dat deleted file mode 100644 index a9f5983ae1..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN05.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.03295 0.00000 -1.00381 0.00000 -1.00724 0.00000 -1.01601 0.00000 -1.00514 0.00000 -0.90877 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN06.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN06.dat deleted file mode 100644 index a9f5983ae1..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN06.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.03295 0.00000 -1.00381 0.00000 -1.00724 0.00000 -1.01601 0.00000 -1.00514 0.00000 -0.90877 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN07.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN07.dat deleted file mode 100644 index a9f5983ae1..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN07.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.03295 0.00000 -1.00381 0.00000 -1.00724 0.00000 -1.01601 0.00000 -1.00514 0.00000 -0.90877 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN08.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN08.dat deleted file mode 100644 index a9f5983ae1..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN08.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.03295 0.00000 -1.00381 0.00000 -1.00724 0.00000 -1.01601 0.00000 -1.00514 0.00000 -0.90877 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN09.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN09.dat deleted file mode 100644 index a9f5983ae1..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN09.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.03295 0.00000 -1.00381 0.00000 -1.00724 0.00000 -1.01601 0.00000 -1.00514 0.00000 -0.90877 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN10.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN10.dat deleted file mode 100644 index a9f5983ae1..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_D_BIN10.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.03295 0.00000 -1.00381 0.00000 -1.00724 0.00000 -1.01601 0.00000 -1.00514 0.00000 -0.90877 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN01.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN01.dat deleted file mode 100644 index 3e69b2ca33..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN01.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 - diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN02.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN02.dat deleted file mode 100644 index 3e69b2ca33..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN02.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 - diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN03.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN03.dat deleted file mode 100644 index 3e69b2ca33..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN03.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 - diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN04.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN04.dat deleted file mode 100644 index 3e69b2ca33..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN04.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 - diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN05.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN05.dat deleted file mode 100644 index 3e69b2ca33..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN05.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 - diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN06.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN06.dat deleted file mode 100644 index 3e69b2ca33..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN06.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 - diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN07.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN07.dat deleted file mode 100644 index 3e69b2ca33..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN07.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 - diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN08.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN08.dat deleted file mode 100644 index 3e69b2ca33..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN08.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 - diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN09.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN09.dat deleted file mode 100644 index 3e69b2ca33..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN09.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 - diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN10.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN10.dat deleted file mode 100644 index 3e69b2ca33..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_DYE906R_P_BIN10.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 - diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_NMCPD_D.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_NMCPD_D.dat deleted file mode 100644 index 1cbbb6d5e6..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_NMCPD_D.dat +++ /dev/null @@ -1,269 +0,0 @@ -******************************************************************************** -SetName: NMCPD_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.97898 0.00000 -0.97733 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.00268 0.00000 -0.99923 0.00000 -0.99609 0.00000 -0.99412 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01179 0.00000 -1.00743 0.00000 -1.00392 0.00000 -1.00162 0.00000 -0.99962 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01302 0.00000 -1.00872 0.00000 -1.00511 0.00000 -1.00293 0.00000 -1.00099 0.00000 -0.99946 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.00998 0.00000 -1.00586 0.00000 -1.00252 0.00000 -1.00042 0.00000 -0.99863 0.00000 -0.99727 0.00000 -0.99637 0.00000 -0.99589 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.00712 0.00000 -1.00348 0.00000 -1.00027 0.00000 -0.99821 0.00000 -0.99630 0.00000 -0.99475 0.00000 -0.99367 0.00000 -0.99293 0.00000 -0.99250 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.00785 0.00000 -1.00483 0.00000 -1.00179 0.00000 -0.99961 0.00000 -0.99739 0.00000 -0.99541 0.00000 -0.99384 0.00000 -0.99255 0.00000 -0.99157 0.00000 -0.99086 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01062 0.00000 -1.00834 0.00000 -1.00559 0.00000 -1.00339 0.00000 -1.00092 0.00000 -0.99851 0.00000 -0.99653 0.00000 -0.99468 0.00000 -0.99312 0.00000 -0.99188 0.00000 -0.99090 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01222 0.00000 -1.01108 0.00000 -1.00892 0.00000 -1.00691 0.00000 -1.00448 0.00000 -1.00183 0.00000 -0.99954 0.00000 -0.99735 0.00000 -0.99535 0.00000 -0.99361 0.00000 -0.99221 0.00000 -0.99124 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.00968 0.00000 -1.01058 0.00000 -1.00999 0.00000 -1.00882 0.00000 -1.00699 0.00000 -1.00462 0.00000 -1.00235 0.00000 -0.99997 0.00000 -0.99769 0.00000 -0.99555 0.00000 -0.99383 0.00000 -0.99235 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.99933 0.00000 -1.00266 0.00000 -1.00449 0.00000 -1.00499 0.00000 -1.00469 0.00000 -1.00354 0.00000 -1.00205 0.00000 -1.00014 0.00000 -0.99809 0.00000 -0.99596 0.00000 -0.99423 0.00000 -0.99268 0.00000 -0.99125 0.00000 -0.00000 0.00000 -0.98828 0.00000 -0.99342 0.00000 -0.99696 0.00000 -0.99884 0.00000 -1.00010 0.00000 -1.00040 0.00000 -1.00003 0.00000 -0.99905 0.00000 -0.99766 0.00000 -0.99586 0.00000 -0.99443 0.00000 -0.99306 0.00000 -0.99170 0.00000 -0.98582 0.00000 -0.98951 0.00000 -0.99299 0.00000 -0.99509 0.00000 -0.99681 0.00000 -0.99793 0.00000 -0.99833 0.00000 -0.99812 0.00000 -0.99742 0.00000 -0.99608 0.00000 -0.99501 0.00000 -0.99389 0.00000 -0.99273 0.00000 -0.99145 0.00000 -0.99156 0.00000 -0.99282 0.00000 -0.99364 0.00000 -0.99428 0.00000 -0.99475 0.00000 -0.99504 0.00000 -0.99512 0.00000 -0.99497 0.00000 -0.99424 0.00000 -0.99379 0.00000 -0.99321 0.00000 -0.99262 0.00000 -0.99176 0.00000 -0.97271 0.00000 -0.97591 0.00000 -0.97964 0.00000 -0.98284 0.00000 -0.98532 0.00000 -0.98739 0.00000 -0.98901 0.00000 -0.98980 0.00000 -0.99079 0.00000 -0.99151 0.00000 -0.99207 0.00000 -0.99272 0.00000 -0.94272 0.00000 -0.94765 0.00000 -0.95418 0.00000 -0.96042 0.00000 -0.96700 0.00000 -0.97325 0.00000 -0.97835 0.00000 -0.98318 0.00000 -0.98706 0.00000 -0.99055 0.00000 -0.99479 0.00000 -0.94297 0.00000 -0.95511 0.00000 -0.96871 0.00000 -0.98371 0.00000 -0.99936 0.00000 -1.01364 0.00000 -1.02717 0.00000 -1.03907 0.00000 -1.05033 0.00000 -1.06469 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_NMCPD_P.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_NMCPD_P.dat deleted file mode 100644 index 4b6cb2f734..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_NMCPD_P.dat +++ /dev/null @@ -1,269 +0,0 @@ -******************************************************************************** -SetName: NMCPD_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 \ No newline at end of file diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUI_SLACD.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUI_SLACD.dat deleted file mode 100644 index 0555e65e13..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUI_SLACD.dat +++ /dev/null @@ -1,220 +0,0 @@ -******************************************************************************** -SetName: SLACD_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01153 0.00000 -1.01036 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.00959 0.00000 -1.00999 0.00000 -1.01010 0.00000 -1.01003 0.00000 -1.00980 0.00000 -1.00882 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.99435 0.00000 -0.99633 0.00000 -0.99758 0.00000 -0.99893 0.00000 -1.00079 0.00000 -1.00150 0.00000 -1.00222 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.98972 0.00000 -0.99117 0.00000 -0.99301 0.00000 -0.99474 0.00000 -0.99626 0.00000 -0.99757 0.00000 -0.99873 0.00000 -0.99921 0.00000 -0.99972 0.00000 -1.00003 0.00000 -1.00064 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.98764 0.00000 -0.98886 0.00000 -0.98991 0.00000 -0.99266 0.00000 -0.99386 0.00000 -0.99492 0.00000 -0.99610 0.00000 -0.99685 0.00000 -0.99740 0.00000 -0.99780 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.98935 0.00000 -0.99030 0.00000 -0.99090 0.00000 -0.99154 0.00000 -0.99209 0.00000 -0.99283 0.00000 -0.99325 0.00000 -0.99345 0.00000 -0.99373 0.00000 -0.99392 0.00000 -0.99413 0.00000 -0.99421 0.00000 -0.99431 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.96871 0.00000 -0.97079 0.00000 -0.97406 0.00000 -0.97545 0.00000 -0.97642 0.00000 -0.97755 0.00000 -0.97850 0.00000 -0.97949 0.00000 -0.98066 0.00000 -0.98193 0.00000 -0.98270 0.00000 -0.98343 0.00000 -0.98423 0.00000 -0.98494 0.00000 -0.98560 0.00000 -0.98627 0.00000 -0.98728 0.00000 -0.98774 0.00000 -0.00000 0.00000 -0.93389 0.00000 -0.93467 0.00000 -0.93546 0.00000 -0.93652 0.00000 -0.94007 0.00000 -0.94148 0.00000 -0.94325 0.00000 -0.94516 0.00000 -0.94978 0.00000 -0.95271 0.00000 -0.95466 0.00000 -0.95714 0.00000 -0.95921 0.00000 -0.96182 0.00000 -0.96390 0.00000 -0.96609 0.00000 -0.96840 0.00000 -0.96996 0.00000 -0.97147 0.00000 -0.97326 0.00000 -0.91472 0.00000 -0.91617 0.00000 -0.91958 0.00000 -0.92385 0.00000 -0.92721 0.00000 -0.93020 0.00000 -0.93704 0.00000 -0.94044 0.00000 -0.94614 0.00000 -0.95009 0.00000 -0.95409 0.00000 -0.96049 0.00000 -0.96408 0.00000 -0.96746 0.00000 -0.97229 0.00000 -0.97600 0.00000 -0.98146 0.00000 -0.98474 0.00000 -0.95104 0.00000 -0.97108 0.00000 -0.98162 0.00000 -0.99224 0.00000 -1.00246 0.00000 -1.01597 0.00000 -1.03256 0.00000 -1.04820 0.00000 -1.06314 0.00000 -1.07548 0.00000 -1.08534 0.00000 -1.09436 0.00000 -1.10396 0.00000 -1.11295 0.00000 -1.12168 0.00000 -1.13430 0.00000 -1.14384 0.00000 -1.37124 0.00000 -1.41055 0.00000 -1.44785 0.00000 -1.50059 0.00000 -1.53980 0.00000 -1.56776 0.00000 -1.60603 0.00000 -1.63456 0.00000 -1.68894 0.00000 -1.75823 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUT_BCDMSD.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUT_BCDMSD.dat deleted file mode 100644 index a1b17f7aa1..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUT_BCDMSD.dat +++ /dev/null @@ -1,263 +0,0 @@ -******************************************************************************************* -SetName: BCDMSD -Author: Juan Rojo juan.rojo@physics.ox.ac.uk -Date: 2016 -CodesUsed: None -TheoryInput: MMHT14 NLO fitted functional form for deuteron nuclear correction -PDFset: MMHT14 NLO -Warnings: Normalisation corrections for APPLgrid -******************************************************************************************** -1.00544 0.00000 -1.00544 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.00264 0.00000 -1.00264 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUT_NMCPD.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUT_NMCPD.dat deleted file mode 100644 index f05bb20acd..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUT_NMCPD.dat +++ /dev/null @@ -1,269 +0,0 @@ -******************************************************************************************* -SetName: NMCPD -Author: Juan Rojo juan.rojo@physics.ox.ac.uk -Date: 2016 -CodesUsed: None -TheoryInput: MMHT14 NLO fitted functional form for deuteron nuclear correction -PDFset: MMHT14 NLO -Warnings: Normalisation corrections for APPLgrid -******************************************************************************************** -0.991947 0.00000 -0.991947 0.00000 -0.991947 0.00000 -0.991947 0.00000 -0.991947 0.00000 -0.99706 0.00000 -0.99706 0.00000 -0.99706 0.00000 -0.99706 0.00000 -0.99706 0.00000 -0.99706 0.00000 -0.99706 0.00000 -1.00011 0.00000 -1.00011 0.00000 -1.00011 0.00000 -1.00011 0.00000 -1.00011 0.00000 -1.00011 0.00000 -1.00011 0.00000 -1.00011 0.00000 -1.00011 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -1.02506 0.00000 -1.02506 0.00000 -1.02506 0.00000 -1.02506 0.00000 -1.02506 0.00000 -1.02506 0.00000 -1.02506 0.00000 -1.02506 0.00000 -1.02506 0.00000 -1.02506 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEUT_SLACD.dat b/nnpdfcpp/data/NLOCFAC/CF_DEUT_SLACD.dat deleted file mode 100644 index 91d741c718..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEUT_SLACD.dat +++ /dev/null @@ -1,220 +0,0 @@ -******************************************************************************************* -SetName: SLACD -Author: Juan Rojo juan.rojo@physics.ox.ac.uk -Date: 2016 -CodesUsed: None -TheoryInput: MMHT14 NLO fitted functional form for deuteron nuclear correction -PDFset: MMHT14 NLO -Warnings: Normalisation corrections for APPLgrid -******************************************************************************************** -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.32955 0.00000 -1.32955 0.00000 -1.32955 0.00000 -1.32955 0.00000 -1.32955 0.00000 -1.32955 0.00000 -1.32955 0.00000 -1.32955 0.00000 -1.32955 0.00000 -1.32955 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEU_BCDMSD.dat b/nnpdfcpp/data/NLOCFAC/CF_DEU_BCDMSD.dat deleted file mode 100644 index c708a5d125..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEU_BCDMSD.dat +++ /dev/null @@ -1,263 +0,0 @@ -******************************************************************************** -SetName: BCDMSD_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.99816 0.00000 -0.99695 0.00000 -0.99613 0.00000 -0.99417 0.00000 -0.99260 0.00000 -0.99154 0.00000 -0.99008 0.00000 -0.98886 0.00000 -0.98779 0.00000 -0.98693 0.00000 -0.99225 0.00000 -0.99051 0.00000 -0.98876 0.00000 -0.98714 0.00000 -0.98581 0.00000 -0.98448 0.00000 -0.98335 0.00000 -0.99617 0.00000 -0.99514 0.00000 -0.99390 0.00000 -0.99259 0.00000 -0.99141 0.00000 -0.99009 0.00000 -0.98872 0.00000 -0.98735 0.00000 -0.98594 0.00000 -0.99670 0.00000 -0.99572 0.00000 -0.99472 0.00000 -0.99380 0.00000 -0.99273 0.00000 -0.99129 0.00000 -0.99010 0.00000 -0.98876 0.00000 -0.98751 0.00000 -0.98629 0.00000 -0.99603 0.00000 -0.99548 0.00000 -0.99479 0.00000 -0.99412 0.00000 -0.99322 0.00000 -0.99158 0.00000 -0.99049 0.00000 -0.98921 0.00000 -0.98796 0.00000 -0.98680 0.00000 -0.98566 0.00000 -0.98456 0.00000 -0.99272 0.00000 -0.99335 0.00000 -0.99339 0.00000 -0.99314 0.00000 -0.99264 0.00000 -0.99160 0.00000 -0.99120 0.00000 -0.99070 0.00000 -0.99013 0.00000 -0.98955 0.00000 -0.98894 0.00000 -0.98848 0.00000 -0.98804 0.00000 -0.98762 0.00000 -0.97856 0.00000 -0.98162 0.00000 -0.98393 0.00000 -0.98581 0.00000 -0.98625 0.00000 -0.98743 0.00000 -0.98865 0.00000 -0.98964 0.00000 -0.99041 0.00000 -0.99106 0.00000 -0.99163 0.00000 -0.99239 0.00000 -0.99309 0.00000 -0.99375 0.00000 -0.99699 0.00000 -1.00206 0.00000 -1.00654 0.00000 -1.01001 0.00000 -1.01321 0.00000 -1.01649 0.00000 -1.01968 0.00000 -1.02256 0.00000 -1.02525 0.00000 -1.02769 0.00000 -1.03012 0.00000 -1.03257 0.00000 -1.03503 0.00000 -1.03743 0.00000 -1.12475 0.00000 -1.13257 0.00000 -1.14064 0.00000 -1.14887 0.00000 -1.15710 0.00000 -1.16523 0.00000 -1.17549 0.00000 -1.18762 0.00000 -1.20075 0.00000 -0.99261 0.00000 -0.99178 0.00000 -0.98902 0.00000 -0.98820 0.00000 -0.98760 0.00000 -0.98609 0.00000 -0.98537 0.00000 -0.98451 0.00000 -0.98364 0.00000 -0.98448 0.00000 -0.98335 0.00000 -0.98216 0.00000 -0.98098 0.00000 -0.97995 0.00000 -0.97905 0.00000 -0.98735 0.00000 -0.98594 0.00000 -0.98465 0.00000 -0.98348 0.00000 -0.98234 0.00000 -0.98127 0.00000 -0.99010 0.00000 -0.98876 0.00000 -0.98751 0.00000 -0.98629 0.00000 -0.98507 0.00000 -0.98389 0.00000 -0.98276 0.00000 -0.98171 0.00000 -0.98921 0.00000 -0.98796 0.00000 -0.98680 0.00000 -0.98566 0.00000 -0.98456 0.00000 -0.98347 0.00000 -0.98243 0.00000 -0.98141 0.00000 -0.98041 0.00000 -0.99069 0.00000 -0.99013 0.00000 -0.98955 0.00000 -0.98894 0.00000 -0.98848 0.00000 -0.98804 0.00000 -0.98762 0.00000 -0.98725 0.00000 -0.98685 0.00000 -0.98644 0.00000 -0.98865 0.00000 -0.98964 0.00000 -0.99041 0.00000 -0.99106 0.00000 -0.99163 0.00000 -0.99239 0.00000 -0.99309 0.00000 -0.99375 0.00000 -0.99438 0.00000 -0.99504 0.00000 -0.99576 0.00000 -1.01649 0.00000 -1.01968 0.00000 -1.02256 0.00000 -1.02525 0.00000 -1.02769 0.00000 -1.03012 0.00000 -1.03257 0.00000 -1.03503 0.00000 -1.03743 0.00000 -1.03994 0.00000 -1.04263 0.00000 -1.14064 0.00000 -1.14887 0.00000 -1.15710 0.00000 -1.16523 0.00000 -1.17549 0.00000 -1.18762 0.00000 -1.20075 0.00000 -1.21480 0.00000 -1.23065 0.00000 -0.98627 0.00000 -0.98568 0.00000 -0.98288 0.00000 -0.98220 0.00000 -0.98155 0.00000 -0.98095 0.00000 -0.97995 0.00000 -0.97905 0.00000 -0.97822 0.00000 -0.97746 0.00000 -0.97676 0.00000 -0.98465 0.00000 -0.98348 0.00000 -0.98234 0.00000 -0.98127 0.00000 -0.98027 0.00000 -0.97935 0.00000 -0.97847 0.00000 -0.98751 0.00000 -0.98629 0.00000 -0.98507 0.00000 -0.98389 0.00000 -0.98276 0.00000 -0.98171 0.00000 -0.98069 0.00000 -0.97968 0.00000 -0.97862 0.00000 -0.98680 0.00000 -0.98566 0.00000 -0.98456 0.00000 -0.98347 0.00000 -0.98243 0.00000 -0.98141 0.00000 -0.98041 0.00000 -0.97936 0.00000 -0.97823 0.00000 -0.98955 0.00000 -0.98894 0.00000 -0.98848 0.00000 -0.98804 0.00000 -0.98762 0.00000 -0.98725 0.00000 -0.98685 0.00000 -0.98644 0.00000 -0.98601 0.00000 -0.98546 0.00000 -0.99041 0.00000 -0.99106 0.00000 -0.99163 0.00000 -0.99239 0.00000 -0.99309 0.00000 -0.99375 0.00000 -0.99438 0.00000 -0.99504 0.00000 -0.99576 0.00000 -0.99668 0.00000 -0.99764 0.00000 -1.02525 0.00000 -1.02769 0.00000 -1.03012 0.00000 -1.03257 0.00000 -1.03503 0.00000 -1.03743 0.00000 -1.03994 0.00000 -1.04263 0.00000 -1.04615 0.00000 -1.04986 0.00000 -1.15710 0.00000 -1.16523 0.00000 -1.17549 0.00000 -1.18762 0.00000 -1.20075 0.00000 -1.21480 0.00000 -1.23065 0.00000 -1.25222 0.00000 -1.27591 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEU_DYE886R_D.dat b/nnpdfcpp/data/NLOCFAC/CF_DEU_DYE886R_D.dat deleted file mode 100644 index aeda079b64..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEU_DYE886R_D.dat +++ /dev/null @@ -1,24 +0,0 @@ -******************************************************************************** -SetName: DYE886R_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.975621 0.00000 -0.980274 0.00000 -0.994362 0.00000 -0.991678 0.00000 -0.993497 0.00000 -0.976795 0.00000 -0.981990 0.00000 -0.992045 0.00000 -0.991585 0.00000 -0.994908 0.00000 -1.006980 0.00000 -1.003970 0.00000 -1.002800 0.00000 -0.961659 0.00000 -0.830935 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEU_DYE886R_P.dat b/nnpdfcpp/data/NLOCFAC/CF_DEU_DYE886R_P.dat deleted file mode 100644 index 6152cb85be..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEU_DYE886R_P.dat +++ /dev/null @@ -1,24 +0,0 @@ -******************************************************************************** -SetName: DYE886R_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEU_NMCPD_D.dat b/nnpdfcpp/data/NLOCFAC/CF_DEU_NMCPD_D.dat deleted file mode 100644 index 11db1f581e..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEU_NMCPD_D.dat +++ /dev/null @@ -1,269 +0,0 @@ -******************************************************************************** -SetName: NMCPD_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.07453 0.00000 -1.05207 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01215 0.00000 -1.00618 0.00000 -1.00035 0.00000 -0.99647 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01698 0.00000 -1.01094 0.00000 -1.00514 0.00000 -1.00079 0.00000 -0.99660 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01994 0.00000 -1.01401 0.00000 -1.00829 0.00000 -1.00428 0.00000 -1.00016 0.00000 -0.99621 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01029 0.00000 -1.01022 0.00000 -1.00634 0.00000 -1.00364 0.00000 -1.00099 0.00000 -0.99831 0.00000 -0.99586 0.00000 -0.99381 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.03063 0.00000 -1.02017 0.00000 -1.01280 0.00000 -1.00719 0.00000 -1.00173 0.00000 -0.99673 0.00000 -0.99400 0.00000 -0.99206 0.00000 -0.99050 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.02178 0.00000 -1.01338 0.00000 -1.00750 0.00000 -1.00442 0.00000 -1.00187 0.00000 -1.00014 0.00000 -0.99790 0.00000 -0.99534 0.00000 -0.99328 0.00000 -0.99164 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.02975 0.00000 -1.01998 0.00000 -1.01093 0.00000 -1.00552 0.00000 -1.00089 0.00000 -0.99708 0.00000 -0.99422 0.00000 -0.99219 0.00000 -0.99065 0.00000 -0.98958 0.00000 -0.98870 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.03428 0.00000 -1.02489 0.00000 -1.01774 0.00000 -1.01269 0.00000 -1.00716 0.00000 -1.00231 0.00000 -0.99871 0.00000 -0.99573 0.00000 -0.99329 0.00000 -0.99145 0.00000 -0.98993 0.00000 -0.98892 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.02609 0.00000 -1.01962 0.00000 -1.01410 0.00000 -1.01044 0.00000 -1.00646 0.00000 -1.00179 0.00000 -0.99809 0.00000 -0.99483 0.00000 -0.99240 0.00000 -0.99053 0.00000 -0.98895 0.00000 -0.98762 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.02156 0.00000 -1.01917 0.00000 -1.01460 0.00000 -1.01057 0.00000 -1.00580 0.00000 -1.00139 0.00000 -0.99785 0.00000 -0.99448 0.00000 -0.99155 0.00000 -0.98924 0.00000 -0.98740 0.00000 -0.98589 0.00000 -0.98454 0.00000 -0.00000 0.00000 -0.98674 0.00000 -0.99517 0.00000 -0.99917 0.00000 -1.00016 0.00000 -1.00095 0.00000 -1.00072 0.00000 -0.99935 0.00000 -0.99721 0.00000 -0.99469 0.00000 -0.99200 0.00000 -0.98963 0.00000 -0.98753 0.00000 -0.98551 0.00000 -0.97613 0.00000 -0.98656 0.00000 -0.99366 0.00000 -0.99695 0.00000 -0.99893 0.00000 -1.00026 0.00000 -1.00039 0.00000 -0.99888 0.00000 -0.99660 0.00000 -0.99390 0.00000 -0.99166 0.00000 -0.98945 0.00000 -0.98721 0.00000 -0.98475 0.00000 -0.99590 0.00000 -0.99281 0.00000 -0.99164 0.00000 -0.99332 0.00000 -0.99411 0.00000 -0.99515 0.00000 -0.99503 0.00000 -0.99406 0.00000 -0.99227 0.00000 -0.99084 0.00000 -0.98918 0.00000 -0.98741 0.00000 -0.98495 0.00000 -0.99118 0.00000 -0.99138 0.00000 -0.99040 0.00000 -0.99031 0.00000 -0.99078 0.00000 -0.99201 0.00000 -0.99124 0.00000 -0.98949 0.00000 -0.98819 0.00000 -0.98673 0.00000 -0.98520 0.00000 -0.98321 0.00000 -0.95063 0.00000 -0.95487 0.00000 -0.96023 0.00000 -0.96700 0.00000 -0.97463 0.00000 -0.98130 0.00000 -0.98437 0.00000 -0.98680 0.00000 -0.98883 0.00000 -0.99040 0.00000 -0.99197 0.00000 -0.99940 0.00000 -0.99710 0.00000 -0.99596 0.00000 -0.99461 0.00000 -0.99795 0.00000 -1.00262 0.00000 -1.00921 0.00000 -1.01578 0.00000 -1.02098 0.00000 -1.02742 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEU_NMCPD_P.dat b/nnpdfcpp/data/NLOCFAC/CF_DEU_NMCPD_P.dat deleted file mode 100644 index 547b589c34..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEU_NMCPD_P.dat +++ /dev/null @@ -1,269 +0,0 @@ -******************************************************************************** -SetName: NMCPD_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 \ No newline at end of file diff --git a/nnpdfcpp/data/NLOCFAC/CF_DEU_SLACD.dat b/nnpdfcpp/data/NLOCFAC/CF_DEU_SLACD.dat deleted file mode 100644 index ded00f3a61..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_DEU_SLACD.dat +++ /dev/null @@ -1,220 +0,0 @@ -******************************************************************************** -SetName: SLACD_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.03254 0.00000 -1.02777 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.02971 0.00000 -1.02777 0.00000 -1.02419 0.00000 -1.01956 0.00000 -1.01596 0.00000 -1.01012 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.99780 0.00000 -0.99885 0.00000 -0.99947 0.00000 -1.00023 0.00000 -1.00111 0.00000 -1.00099 0.00000 -1.00069 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.98520 0.00000 -0.98757 0.00000 -0.98925 0.00000 -0.99097 0.00000 -0.99273 0.00000 -0.99434 0.00000 -0.99581 0.00000 -0.99650 0.00000 -0.99720 0.00000 -0.99756 0.00000 -0.99815 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.97982 0.00000 -0.98358 0.00000 -0.98671 0.00000 -0.99229 0.00000 -0.99424 0.00000 -0.99579 0.00000 -0.99743 0.00000 -0.99851 0.00000 -0.99884 0.00000 -0.99893 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.00552 0.00000 -1.00744 0.00000 -1.00699 0.00000 -1.00503 0.00000 -1.00181 0.00000 -0.99912 0.00000 -0.99744 0.00000 -0.99671 0.00000 -0.99617 0.00000 -0.99608 0.00000 -0.99612 0.00000 -0.99619 0.00000 -0.99630 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.96769 0.00000 -0.97619 0.00000 -0.98338 0.00000 -0.98457 0.00000 -0.98455 0.00000 -0.98450 0.00000 -0.98464 0.00000 -0.98475 0.00000 -0.98516 0.00000 -0.98594 0.00000 -0.98684 0.00000 -0.98793 0.00000 -0.98917 0.00000 -0.99047 0.00000 -0.99146 0.00000 -0.99230 0.00000 -0.99325 0.00000 -0.99333 0.00000 -0.00000 0.00000 -0.91981 0.00000 -0.92608 0.00000 -0.93138 0.00000 -0.94054 0.00000 -0.94491 0.00000 -0.94560 0.00000 -0.94646 0.00000 -0.94778 0.00000 -0.95210 0.00000 -0.95550 0.00000 -0.95843 0.00000 -0.96209 0.00000 -0.96546 0.00000 -0.96991 0.00000 -0.97370 0.00000 -0.97674 0.00000 -0.97972 0.00000 -0.98127 0.00000 -0.98289 0.00000 -0.98433 0.00000 -0.92971 0.00000 -0.93106 0.00000 -0.93492 0.00000 -0.93782 0.00000 -0.93863 0.00000 -0.93955 0.00000 -0.94427 0.00000 -0.94773 0.00000 -0.95403 0.00000 -0.96525 0.00000 -0.97390 0.00000 -0.98284 0.00000 -0.98707 0.00000 -0.99135 0.00000 -0.99679 0.00000 -1.00077 0.00000 -1.00516 0.00000 -1.00768 0.00000 -0.99713 0.00000 -1.01356 0.00000 -1.02458 0.00000 -1.04116 0.00000 -1.05376 0.00000 -1.06621 0.00000 -1.07728 0.00000 -1.08513 0.00000 -1.09136 0.00000 -1.09469 0.00000 -1.09733 0.00000 -1.09935 0.00000 -1.10206 0.00000 -1.1046 0.00000 -1.10774 0.00000 -1.11248 0.00000 -1.11632 0.00000 -2.46888 0.00000 -2.66970 0.00000 -2.84803 0.00000 -3.07669 0.00000 -3.21178 0.00000 -3.30290 0.00000 -3.42214 0.00000 -3.50589 0.00000 -3.65464 0.00000 -3.83125 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLAS1JET11_NEW_SCALE.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLAS1JET11_NEW_SCALE.dat deleted file mode 100644 index fa92bf82dd..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLAS1JET11_NEW_SCALE.dat +++ /dev/null @@ -1,149 +0,0 @@ -******************************************************************************** -SetName: ATLAS1JET11_NEW_SCALE -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: Numbers provided by A. Huss et al. -TheoryInput: NNPDF3.1 NLO, alphas(MZ)=0.118, R=0.6 -PDFset: NNPDF31_qed_nlo_as_0118 -Warnings: Uses average Mij as central scale. -******************************************************************************** -9.997019e-01 0.00000 -9.996679e-01 0.00000 -9.996802e-01 0.00000 -9.997258e-01 0.00000 -9.998189e-01 0.00000 -1.000012e+00 0.00000 -1.000229e+00 0.00000 -1.000699e+00 0.00000 -1.001216e+00 0.00000 -1.002043e+00 0.00000 -1.003085e+00 0.00000 -1.004410e+00 0.00000 -1.006096e+00 0.00000 -1.008174e+00 0.00000 -1.010739e+00 0.00000 -1.013925e+00 0.00000 -1.017566e+00 0.00000 -1.021977e+00 0.00000 -1.026925e+00 0.00000 -1.032569e+00 0.00000 -1.038524e+00 0.00000 -1.045956e+00 0.00000 -1.053050e+00 0.00000 -1.061686e+00 0.00000 -1.070742e+00 0.00000 -1.079847e+00 0.00000 -1.090705e+00 0.00000 -1.102765e+00 0.00000 -1.118995e+00 0.00000 -1.147138e+00 0.00000 -1.187961e+00 0.00000 -9.997141e-01 0.00000 -9.997156e-01 0.00000 -9.997119e-01 0.00000 -9.997280e-01 0.00000 -9.997796e-01 0.00000 -9.999378e-01 0.00000 -1.000140e+00 0.00000 -1.000483e+00 0.00000 -1.000928e+00 0.00000 -1.001576e+00 0.00000 -1.002452e+00 0.00000 -1.003464e+00 0.00000 -1.004816e+00 0.00000 -1.006373e+00 0.00000 -1.008340e+00 0.00000 -1.010739e+00 0.00000 -1.013367e+00 0.00000 -1.016442e+00 0.00000 -1.019946e+00 0.00000 -1.023883e+00 0.00000 -1.027948e+00 0.00000 -1.032588e+00 0.00000 -1.037497e+00 0.00000 -1.042596e+00 0.00000 -1.048288e+00 0.00000 -1.053829e+00 0.00000 -1.063046e+00 0.00000 -1.078010e+00 0.00000 -1.097374e+00 0.00000 -9.997042e-01 0.00000 -9.997067e-01 0.00000 -9.996588e-01 0.00000 -9.996550e-01 0.00000 -9.996889e-01 0.00000 -9.996569e-01 0.00000 -9.998067e-01 0.00000 -9.999144e-01 0.00000 -1.000111e+00 0.00000 -1.000437e+00 0.00000 -1.000763e+00 0.00000 -1.001190e+00 0.00000 -1.001858e+00 0.00000 -1.002629e+00 0.00000 -1.003515e+00 0.00000 -1.004552e+00 0.00000 -1.005719e+00 0.00000 -1.007035e+00 0.00000 -1.008639e+00 0.00000 -1.010091e+00 0.00000 -1.011967e+00 0.00000 -1.013852e+00 0.00000 -1.015925e+00 0.00000 -1.018042e+00 0.00000 -1.021211e+00 0.00000 -1.027612e+00 0.00000 -9.994165e-01 0.00000 -9.995961e-01 0.00000 -9.995265e-01 0.00000 -9.994355e-01 0.00000 -9.993069e-01 0.00000 -9.990878e-01 0.00000 -9.987504e-01 0.00000 -9.985953e-01 0.00000 -9.984549e-01 0.00000 -9.982370e-01 0.00000 -9.980601e-01 0.00000 -9.978644e-01 0.00000 -9.977155e-01 0.00000 -9.975561e-01 0.00000 -9.975831e-01 0.00000 -9.974471e-01 0.00000 -9.974848e-01 0.00000 -9.974541e-01 0.00000 -9.976219e-01 0.00000 -9.977660e-01 0.00000 -9.977726e-01 0.00000 -9.979850e-01 0.00000 -9.985414e-01 0.00000 -9.995878e-01 0.00000 -9.991734e-01 0.00000 -9.990730e-01 0.00000 -9.988724e-01 0.00000 -9.983003e-01 0.00000 -9.980066e-01 0.00000 -9.974228e-01 0.00000 -9.968642e-01 0.00000 -9.963834e-01 0.00000 -9.958210e-01 0.00000 -9.951620e-01 0.00000 -9.944454e-01 0.00000 -9.938385e-01 0.00000 -9.931463e-01 0.00000 -9.924221e-01 0.00000 -9.916308e-01 0.00000 -9.906833e-01 0.00000 -9.893708e-01 0.00000 -9.886149e-01 0.00000 -9.992611e-01 0.00000 -9.987673e-01 0.00000 -9.984457e-01 0.00000 -9.977326e-01 0.00000 -9.976301e-01 0.00000 -9.966742e-01 0.00000 -9.960706e-01 0.00000 -9.951062e-01 0.00000 -9.945340e-01 0.00000 -9.934212e-01 0.00000 -9.922291e-01 0.00000 -9.901583e-01 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASLOMASSDY11.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASLOMASSDY11.dat deleted file mode 100644 index 7a9a8a0ae8..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASLOMASSDY11.dat +++ /dev/null @@ -1,17 +0,0 @@ -******************************************************************************************* -SetName: ATLASLOMASSDY11 -Author: Alberto Guffanti -Date: 24/11/2015 -CodesUsed: FEWZ 3.1b2 -TheoryInput: NLO QCD, EW corrections flag = 1: ISR, ISRxFSR, EW -PDFset: NNPDF30_nlo_as_0118 -Warnings: No photon initiated processes, no FSR - data are corrected -******************************************************************************************** -1.0138 0.00000 -1.0289 0.00000 -1.0358 0.00000 -1.0394 0.00000 -1.0368 0.00000 -1.0424 0.00000 -1.0395 0.00000 -1.0319 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASLOMASSDY11EXT.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASLOMASSDY11EXT.dat deleted file mode 100644 index d475ce6259..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASLOMASSDY11EXT.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************************* -SetName: ATLASLOMASSDY11EXT -Author: Alberto Guffanti -Date: 26/11/2015 -CodesUsed: FEWZ 3.1b2 -TheoryInput: NLO QCD, EW corrections flag = 1: ISR, ISRxFSR, EW -PDFset: NNPDF30_nlo_as_0118 -Warnings: No photon initiated processes, no FSR - data are corrected -******************************************************************************************** -1.0032 0.00000 -1.0127 0.00000 -1.0238 0.00000 -1.0291 0.00000 -1.0360 0.00000 -1.0376 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASPHT12.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASPHT12.dat deleted file mode 100644 index bbc4d12d7b..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASPHT12.dat +++ /dev/null @@ -1,58 +0,0 @@ -************************************************************************************************************ -SetName: ATLASPHT12 -Author: Ciaran Williams and John Campbell -Date: 2017 -CodesUsed: None - Private message -TheoryInput: Polynomial fit from 1509.01961 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -************************************************************************************************************* -1.00000 0 -1.00000 0 -0.99934 0 -0.99399 0 -0.98984 0 -0.98520 0 -0.98078 0 -0.97486 0 -0.96655 0 -0.95879 0 -0.95135 0 -0.94404 0 -0.93455 0 -0.92516 0 -0.91532 0 -0.90468 0 -0.89332 0 -0.88369 0 -1.004 0 -1.003 0 -1.002 0 -0.999 0 -0.995 0 -0.990 0 -0.986 0 -0.980 0 -0.972 0 -0.964 0 -0.956 0 -0.949 0 -0.940 0 -0.931 0 -0.919 0 -0.910 0 -0.894 0 -1.004 0 -1.003 0 -1.002 0 -0.999 0 -0.995 0 -0.991 0 -0.987 0 -0.982 0 -0.973 0 -0.966 0 -0.960 0 -0.950 0 -0.941 0 -0.931 0 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASPHT15.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASPHT15.dat deleted file mode 100644 index f3c68f609b..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASPHT15.dat +++ /dev/null @@ -1,63 +0,0 @@ -************************************************************************************************************ -SetName: ATLASPHT15 -Author: John Campbell and Ciaran Williams -Date: 2017 -CodesUsed: None - Private message -TheoryInput: Polynomial fit from 1509.01961 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -************************************************************************************************************* -0.990 0 -0.985 0 -0.980 0 -0.974 0 -0.966 0 -0.958 0 -0.951 0 -0.944 0 -0.933 0 -0.923 0 -0.914 0 -0.903 0 -0.891 0 -0.878 0 -0.990 0 -0.985 0 -0.980 0 -0.974 0 -0.966 0 -0.958 0 -0.951 0 -0.944 0 -0.933 0 -0.924 0 -0.914 0 -0.903 0 -0.890 0 -0.877 0 -0.990 0 -0.985 0 -0.980 0 -0.974 0 -0.966 0 -0.958 0 -0.951 0 -0.944 0 -0.932 0 -0.924 0 -0.917 0 -0.902 0 -0.891 0 -0.990 0 -0.985 0 -0.980 0 -0.974 0 -0.966 0 -0.958 0 -0.951 0 -0.945 0 -0.932 0 -0.924 0 -0.913 0 -0.902 0 - diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASWZRAP36PB.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASWZRAP36PB.dat deleted file mode 100644 index 2cbf3accbc..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASWZRAP36PB.dat +++ /dev/null @@ -1,39 +0,0 @@ -******************************************************************************************* -SetName: ATLASWZRAP36PB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: Early 2012 -CodesUsed: FEWZ -TheoryInput: NNPDF2.1 NLO, alphas(MZ)=0.119 -PDFset: NNPDF21_nlo_as_0119 -Warnings: Applied smearing, redo with more updated PDF set -******************************************************************************************** -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.009051091 0.00000 -1.0071642542 0.00000 -1.0068702798 0.00000 -1.0080971424 0.00000 -1.0060788856 0.00000 -1.0088218024 0.00000 -1.0071822924 0.00000 -1.0070149312 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASWZTOT13TEV81PB.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASWZTOT13TEV81PB.dat deleted file mode 100644 index df5b9c6ee7..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASWZTOT13TEV81PB.dat +++ /dev/null @@ -1,12 +0,0 @@ -******************************************************************************************* -SetName: ATLASWZTOT13TEV81PB -Author: Alberto Guffanti -Date: 04.07.2016 -CodesUsed: FEWZ 3.1b2 -TheoryInput: NLO QCD, EW corrections flag = 1: ISR, ISRxFSR, EW -PDFset: CT14nlo -Warnings: No photon initiated processes, no FSR - data are corrected -******************************************************************************************** -1. 0.00000 -1. 0.00000 -0.996324 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASZHIGHMASS49FB.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASZHIGHMASS49FB.dat deleted file mode 100644 index 2616871a05..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLASZHIGHMASS49FB.dat +++ /dev/null @@ -1,22 +0,0 @@ -******************************************************************************************* -SetName: ATLASZHIGHMASS49FB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: 2014 -CodesUsed: FEWZ -TheoryInput: NNPDF2.3 NLO, alphas(MZ)=0.119 -PDFset: NNPDF23_nlo_as_0119 -Warnings: Only pure EW, no photon-initiated effects included -******************************************************************************************** -0.993 0.00000 -0.996 0.00000 -0.999 0.00000 -1.001 0.00000 -1.002 0.00000 -1.001 0.00000 -1.002 0.00000 -1.000 0.00000 -0.997 0.00000 -0.990 0.00000 -0.985 0.00000 -0.966 0.00000 -0.932 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLAS_1JET_8TEV_R04.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLAS_1JET_8TEV_R04.dat deleted file mode 100644 index beaa749281..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLAS_1JET_8TEV_R04.dat +++ /dev/null @@ -1,180 +0,0 @@ -******************************************************************************** -SetName: ATLAS_1JET_8TEV_R06 -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: Numbers provided by A. Huss et al. -TheoryInput: NNPDF3.1 NLO, alphas(MZ)=0.118, R=0.6 -PDFset: NNPDF31_qed_nlo_as_0118 -Warnings: Uses average HThat as central scale. -******************************************************************************** -9.996882e-01 0.00000 -9.996210e-01 0.00000 -9.995264e-01 0.00000 -9.994142e-01 0.00000 -9.993273e-01 0.00000 -9.992265e-01 0.00000 -9.991832e-01 0.00000 -9.991108e-01 0.00000 -9.991342e-01 0.00000 -9.992675e-01 0.00000 -9.993228e-01 0.00000 -9.997955e-01 0.00000 -1.000285e+00 0.00000 -1.001028e+00 0.00000 -1.001971e+00 0.00000 -1.003202e+00 0.00000 -1.004870e+00 0.00000 -1.006901e+00 0.00000 -1.009273e+00 0.00000 -1.012409e+00 0.00000 -1.015929e+00 0.00000 -1.020017e+00 0.00000 -1.024545e+00 0.00000 -1.029959e+00 0.00000 -1.035723e+00 0.00000 -1.042252e+00 0.00000 -1.049508e+00 0.00000 -1.057462e+00 0.00000 -1.065946e+00 0.00000 -1.075994e+00 0.00000 -1.091116e+00 0.00000 -1.115421e+00 0.00000 -1.151715e+00 0.00000 -1.222414e+00 0.00000 -9.997080e-01 0.00000 -9.995874e-01 0.00000 -9.995471e-01 0.00000 -9.994410e-01 0.00000 -9.993526e-01 0.00000 -9.992495e-01 0.00000 -9.991974e-01 0.00000 -9.990278e-01 0.00000 -9.990821e-01 0.00000 -9.990804e-01 0.00000 -9.992562e-01 0.00000 -9.995018e-01 0.00000 -9.998293e-01 0.00000 -1.000434e+00 0.00000 -1.001160e+00 0.00000 -1.002036e+00 0.00000 -1.003269e+00 0.00000 -1.004773e+00 0.00000 -1.006723e+00 0.00000 -1.008820e+00 0.00000 -1.011271e+00 0.00000 -1.014058e+00 0.00000 -1.017427e+00 0.00000 -1.020796e+00 0.00000 -1.024658e+00 0.00000 -1.029162e+00 0.00000 -1.033589e+00 0.00000 -1.038015e+00 0.00000 -1.043187e+00 0.00000 -1.050111e+00 0.00000 -1.058702e+00 0.00000 -1.072750e+00 0.00000 -1.096099e+00 0.00000 -9.997125e-01 0.00000 -9.996514e-01 0.00000 -9.995656e-01 0.00000 -9.994768e-01 0.00000 -9.993343e-01 0.00000 -9.992346e-01 0.00000 -9.990848e-01 0.00000 -9.989493e-01 0.00000 -9.988509e-01 0.00000 -9.986914e-01 0.00000 -9.986768e-01 0.00000 -9.986960e-01 0.00000 -9.986989e-01 0.00000 -9.988473e-01 0.00000 -9.991371e-01 0.00000 -9.994313e-01 0.00000 -9.999443e-01 0.00000 -1.000541e+00 0.00000 -1.001238e+00 0.00000 -1.002056e+00 0.00000 -1.003055e+00 0.00000 -1.004185e+00 0.00000 -1.005431e+00 0.00000 -1.006837e+00 0.00000 -1.008308e+00 0.00000 -1.010141e+00 0.00000 -1.011643e+00 0.00000 -1.013224e+00 0.00000 -1.015873e+00 0.00000 -1.018184e+00 0.00000 -1.021679e+00 0.00000 -1.027478e+00 0.00000 -9.997587e-01 0.00000 -9.996004e-01 0.00000 -9.995055e-01 0.00000 -9.994097e-01 0.00000 -9.992734e-01 0.00000 -9.989357e-01 0.00000 -9.988907e-01 0.00000 -9.983934e-01 0.00000 -9.981051e-01 0.00000 -9.977662e-01 0.00000 -9.974319e-01 0.00000 -9.970470e-01 0.00000 -9.966604e-01 0.00000 -9.964069e-01 0.00000 -9.959022e-01 0.00000 -9.957045e-01 0.00000 -9.953494e-01 0.00000 -9.950591e-01 0.00000 -9.946841e-01 0.00000 -9.945945e-01 0.00000 -9.943039e-01 0.00000 -9.942645e-01 0.00000 -9.939004e-01 0.00000 -9.940333e-01 0.00000 -9.937317e-01 0.00000 -9.935795e-01 0.00000 -9.930750e-01 0.00000 -9.931389e-01 0.00000 -9.928326e-01 0.00000 -9.947259e-01 0.00000 -9.997044e-01 0.00000 -9.995104e-01 0.00000 -9.994031e-01 0.00000 -9.993460e-01 0.00000 -9.990457e-01 0.00000 -9.984247e-01 0.00000 -9.981381e-01 0.00000 -9.978046e-01 0.00000 -9.969733e-01 0.00000 -9.962674e-01 0.00000 -9.957204e-01 0.00000 -9.949752e-01 0.00000 -9.943353e-01 0.00000 -9.933947e-01 0.00000 -9.927547e-01 0.00000 -9.920133e-01 0.00000 -9.908795e-01 0.00000 -9.901534e-01 0.00000 -9.891593e-01 0.00000 -9.880819e-01 0.00000 -9.871347e-01 0.00000 -9.855919e-01 0.00000 -9.847704e-01 0.00000 -9.839098e-01 0.00000 -9.996151e-01 0.00000 -9.994598e-01 0.00000 -9.991800e-01 0.00000 -9.986223e-01 0.00000 -9.982242e-01 0.00000 -9.978390e-01 0.00000 -9.970789e-01 0.00000 -9.966074e-01 0.00000 -9.957572e-01 0.00000 -9.949295e-01 0.00000 -9.941268e-01 0.00000 -9.932433e-01 0.00000 -9.922381e-01 0.00000 -9.909965e-01 0.00000 -9.899542e-01 0.00000 -9.881051e-01 0.00000 -9.870529e-01 0.00000 -9.845335e-01 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLAS_1JET_8TEV_R06.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLAS_1JET_8TEV_R06.dat deleted file mode 100644 index beaa749281..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLAS_1JET_8TEV_R06.dat +++ /dev/null @@ -1,180 +0,0 @@ -******************************************************************************** -SetName: ATLAS_1JET_8TEV_R06 -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: Numbers provided by A. Huss et al. -TheoryInput: NNPDF3.1 NLO, alphas(MZ)=0.118, R=0.6 -PDFset: NNPDF31_qed_nlo_as_0118 -Warnings: Uses average HThat as central scale. -******************************************************************************** -9.996882e-01 0.00000 -9.996210e-01 0.00000 -9.995264e-01 0.00000 -9.994142e-01 0.00000 -9.993273e-01 0.00000 -9.992265e-01 0.00000 -9.991832e-01 0.00000 -9.991108e-01 0.00000 -9.991342e-01 0.00000 -9.992675e-01 0.00000 -9.993228e-01 0.00000 -9.997955e-01 0.00000 -1.000285e+00 0.00000 -1.001028e+00 0.00000 -1.001971e+00 0.00000 -1.003202e+00 0.00000 -1.004870e+00 0.00000 -1.006901e+00 0.00000 -1.009273e+00 0.00000 -1.012409e+00 0.00000 -1.015929e+00 0.00000 -1.020017e+00 0.00000 -1.024545e+00 0.00000 -1.029959e+00 0.00000 -1.035723e+00 0.00000 -1.042252e+00 0.00000 -1.049508e+00 0.00000 -1.057462e+00 0.00000 -1.065946e+00 0.00000 -1.075994e+00 0.00000 -1.091116e+00 0.00000 -1.115421e+00 0.00000 -1.151715e+00 0.00000 -1.222414e+00 0.00000 -9.997080e-01 0.00000 -9.995874e-01 0.00000 -9.995471e-01 0.00000 -9.994410e-01 0.00000 -9.993526e-01 0.00000 -9.992495e-01 0.00000 -9.991974e-01 0.00000 -9.990278e-01 0.00000 -9.990821e-01 0.00000 -9.990804e-01 0.00000 -9.992562e-01 0.00000 -9.995018e-01 0.00000 -9.998293e-01 0.00000 -1.000434e+00 0.00000 -1.001160e+00 0.00000 -1.002036e+00 0.00000 -1.003269e+00 0.00000 -1.004773e+00 0.00000 -1.006723e+00 0.00000 -1.008820e+00 0.00000 -1.011271e+00 0.00000 -1.014058e+00 0.00000 -1.017427e+00 0.00000 -1.020796e+00 0.00000 -1.024658e+00 0.00000 -1.029162e+00 0.00000 -1.033589e+00 0.00000 -1.038015e+00 0.00000 -1.043187e+00 0.00000 -1.050111e+00 0.00000 -1.058702e+00 0.00000 -1.072750e+00 0.00000 -1.096099e+00 0.00000 -9.997125e-01 0.00000 -9.996514e-01 0.00000 -9.995656e-01 0.00000 -9.994768e-01 0.00000 -9.993343e-01 0.00000 -9.992346e-01 0.00000 -9.990848e-01 0.00000 -9.989493e-01 0.00000 -9.988509e-01 0.00000 -9.986914e-01 0.00000 -9.986768e-01 0.00000 -9.986960e-01 0.00000 -9.986989e-01 0.00000 -9.988473e-01 0.00000 -9.991371e-01 0.00000 -9.994313e-01 0.00000 -9.999443e-01 0.00000 -1.000541e+00 0.00000 -1.001238e+00 0.00000 -1.002056e+00 0.00000 -1.003055e+00 0.00000 -1.004185e+00 0.00000 -1.005431e+00 0.00000 -1.006837e+00 0.00000 -1.008308e+00 0.00000 -1.010141e+00 0.00000 -1.011643e+00 0.00000 -1.013224e+00 0.00000 -1.015873e+00 0.00000 -1.018184e+00 0.00000 -1.021679e+00 0.00000 -1.027478e+00 0.00000 -9.997587e-01 0.00000 -9.996004e-01 0.00000 -9.995055e-01 0.00000 -9.994097e-01 0.00000 -9.992734e-01 0.00000 -9.989357e-01 0.00000 -9.988907e-01 0.00000 -9.983934e-01 0.00000 -9.981051e-01 0.00000 -9.977662e-01 0.00000 -9.974319e-01 0.00000 -9.970470e-01 0.00000 -9.966604e-01 0.00000 -9.964069e-01 0.00000 -9.959022e-01 0.00000 -9.957045e-01 0.00000 -9.953494e-01 0.00000 -9.950591e-01 0.00000 -9.946841e-01 0.00000 -9.945945e-01 0.00000 -9.943039e-01 0.00000 -9.942645e-01 0.00000 -9.939004e-01 0.00000 -9.940333e-01 0.00000 -9.937317e-01 0.00000 -9.935795e-01 0.00000 -9.930750e-01 0.00000 -9.931389e-01 0.00000 -9.928326e-01 0.00000 -9.947259e-01 0.00000 -9.997044e-01 0.00000 -9.995104e-01 0.00000 -9.994031e-01 0.00000 -9.993460e-01 0.00000 -9.990457e-01 0.00000 -9.984247e-01 0.00000 -9.981381e-01 0.00000 -9.978046e-01 0.00000 -9.969733e-01 0.00000 -9.962674e-01 0.00000 -9.957204e-01 0.00000 -9.949752e-01 0.00000 -9.943353e-01 0.00000 -9.933947e-01 0.00000 -9.927547e-01 0.00000 -9.920133e-01 0.00000 -9.908795e-01 0.00000 -9.901534e-01 0.00000 -9.891593e-01 0.00000 -9.880819e-01 0.00000 -9.871347e-01 0.00000 -9.855919e-01 0.00000 -9.847704e-01 0.00000 -9.839098e-01 0.00000 -9.996151e-01 0.00000 -9.994598e-01 0.00000 -9.991800e-01 0.00000 -9.986223e-01 0.00000 -9.982242e-01 0.00000 -9.978390e-01 0.00000 -9.970789e-01 0.00000 -9.966074e-01 0.00000 -9.957572e-01 0.00000 -9.949295e-01 0.00000 -9.941268e-01 0.00000 -9.932433e-01 0.00000 -9.922381e-01 0.00000 -9.909965e-01 0.00000 -9.899542e-01 0.00000 -9.881051e-01 0.00000 -9.870529e-01 0.00000 -9.845335e-01 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLAS_2JET_7TEV_R04.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLAS_2JET_7TEV_R04.dat deleted file mode 100644 index 05d708220d..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLAS_2JET_7TEV_R04.dat +++ /dev/null @@ -1,99 +0,0 @@ -******************************************************************************** -SetName: ATLAS_2JET_7TEV_R06 -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: Numbers provided by A. Huss et al. -TheoryInput: NNPDF3.1 NLO, alphas(MZ)=0.118, R=0.4 -PDFset: NNPDF31_qed_nlo_as_0118 -Warnings: Uses average HThat as central scale. -******************************************************************************** -1.000619e+00 0.000000 -1.000764e+00 0.000000 -1.000915e+00 0.000000 -1.001263e+00 0.000000 -1.001861e+00 0.000000 -1.002835e+00 0.000000 -1.004266e+00 0.000000 -1.006300e+00 0.000000 -1.009071e+00 0.000000 -1.012545e+00 0.000000 -1.017246e+00 0.000000 -1.023141e+00 0.000000 -1.030349e+00 0.000000 -1.038763e+00 0.000000 -1.047986e+00 0.000000 -1.059158e+00 0.000000 -1.070989e+00 0.000000 -1.083602e+00 0.000000 -1.097749e+00 0.000000 -1.112286e+00 0.000000 -1.134011e+00 0.000000 -9.992300e-01 0.000000 -9.990582e-01 0.000000 -9.988828e-01 0.000000 -9.988061e-01 0.000000 -9.988139e-01 0.000000 -9.989582e-01 0.000000 -9.992958e-01 0.000000 -9.998633e-01 0.000000 -1.000745e+00 0.000000 -1.001953e+00 0.000000 -1.003534e+00 0.000000 -1.005534e+00 0.000000 -1.007930e+00 0.000000 -1.010602e+00 0.000000 -1.013616e+00 0.000000 -1.016496e+00 0.000000 -1.019547e+00 0.000000 -1.023043e+00 0.000000 -1.025785e+00 0.000000 -1.027843e+00 0.000000 -1.030979e+00 0.000000 -9.987786e-01 0.000000 -9.986883e-01 0.000000 -9.986606e-01 0.000000 -9.986450e-01 0.000000 -9.987129e-01 0.000000 -9.988521e-01 0.000000 -9.990701e-01 0.000000 -9.993587e-01 0.000000 -9.997290e-01 0.000000 -1.000133e+00 0.000000 -1.000549e+00 0.000000 -1.000912e+00 0.000000 -1.001109e+00 0.000000 -1.001169e+00 0.000000 -1.001025e+00 0.000000 -1.000688e+00 0.000000 -9.991107e-01 0.000000 -9.978250e-01 0.000000 -9.953674e-01 0.000000 -9.995234e-01 0.000000 -9.997070e-01 0.000000 -9.999587e-01 0.000000 -1.000245e+00 0.000000 -1.000572e+00 0.000000 -1.000938e+00 0.000000 -1.001256e+00 0.000000 -1.001547e+00 0.000000 -1.001756e+00 0.000000 -1.001812e+00 0.000000 -1.001669e+00 0.000000 -1.001185e+00 0.000000 -1.000371e+00 0.000000 -9.992824e-01 0.000000 -9.975426e-01 0.000000 -9.954928e-01 0.000000 -9.898100e-01 0.000000 -1.001961e+00 0.000000 -1.002611e+00 0.000000 -1.003259e+00 0.000000 -1.004039e+00 0.000000 -1.004822e+00 0.000000 -1.004643e+00 0.000000 -1.002793e+00 0.000000 -9.972979e-01 0.000000 -1.006008e+00 0.000000 -1.007158e+00 0.000000 -1.007061e+00 0.000000 -1.000554e+00 0.000000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLAS_2JET_7TEV_R06.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLAS_2JET_7TEV_R06.dat deleted file mode 100644 index 88c764e936..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_ATLAS_2JET_7TEV_R06.dat +++ /dev/null @@ -1,99 +0,0 @@ -******************************************************************************** -SetName: ATLAS_2JET_7TEV_R06 -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: Numbers provided by A. Huss et al. -TheoryInput: NNPDF3.1 NLO, alphas(MZ)=0.118, R=0.6 -PDFset: NNPDF31_qed_nlo_as_0118 -Warnings: Uses average HThat as central scale. -******************************************************************************** -1.000619e+00 0.000000 -1.000764e+00 0.000000 -1.000915e+00 0.000000 -1.001263e+00 0.000000 -1.001861e+00 0.000000 -1.002835e+00 0.000000 -1.004266e+00 0.000000 -1.006300e+00 0.000000 -1.009071e+00 0.000000 -1.012545e+00 0.000000 -1.017246e+00 0.000000 -1.023141e+00 0.000000 -1.030349e+00 0.000000 -1.038763e+00 0.000000 -1.047986e+00 0.000000 -1.059158e+00 0.000000 -1.070989e+00 0.000000 -1.083602e+00 0.000000 -1.097749e+00 0.000000 -1.112286e+00 0.000000 -1.134011e+00 0.000000 -9.992300e-01 0.000000 -9.990582e-01 0.000000 -9.988828e-01 0.000000 -9.988061e-01 0.000000 -9.988139e-01 0.000000 -9.989582e-01 0.000000 -9.992958e-01 0.000000 -9.998633e-01 0.000000 -1.000745e+00 0.000000 -1.001953e+00 0.000000 -1.003534e+00 0.000000 -1.005534e+00 0.000000 -1.007930e+00 0.000000 -1.010602e+00 0.000000 -1.013616e+00 0.000000 -1.016496e+00 0.000000 -1.019547e+00 0.000000 -1.023043e+00 0.000000 -1.025785e+00 0.000000 -1.027843e+00 0.000000 -1.030979e+00 0.000000 -9.987786e-01 0.000000 -9.986883e-01 0.000000 -9.986606e-01 0.000000 -9.986450e-01 0.000000 -9.987129e-01 0.000000 -9.988521e-01 0.000000 -9.990701e-01 0.000000 -9.993587e-01 0.000000 -9.997290e-01 0.000000 -1.000133e+00 0.000000 -1.000549e+00 0.000000 -1.000912e+00 0.000000 -1.001109e+00 0.000000 -1.001169e+00 0.000000 -1.001025e+00 0.000000 -1.000688e+00 0.000000 -9.991107e-01 0.000000 -9.978250e-01 0.000000 -9.953674e-01 0.000000 -9.995234e-01 0.000000 -9.997070e-01 0.000000 -9.999587e-01 0.000000 -1.000245e+00 0.000000 -1.000572e+00 0.000000 -1.000938e+00 0.000000 -1.001256e+00 0.000000 -1.001547e+00 0.000000 -1.001756e+00 0.000000 -1.001812e+00 0.000000 -1.001669e+00 0.000000 -1.001185e+00 0.000000 -1.000371e+00 0.000000 -9.992824e-01 0.000000 -9.975426e-01 0.000000 -9.954928e-01 0.000000 -9.898100e-01 0.000000 -1.001961e+00 0.000000 -1.002611e+00 0.000000 -1.003259e+00 0.000000 -1.004039e+00 0.000000 -1.004822e+00 0.000000 -1.004643e+00 0.000000 -1.002793e+00 0.000000 -9.972979e-01 0.000000 -1.006008e+00 0.000000 -1.007158e+00 0.000000 -1.007061e+00 0.000000 -1.000554e+00 0.000000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_CMSDY2D11.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_CMSDY2D11.dat deleted file mode 100644 index 9e7f13071d..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_CMSDY2D11.dat +++ /dev/null @@ -1,141 +0,0 @@ -******************************************************************************************* -SetName: CMSDY2D11 -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: 2014 -CodesUsed: FEWZ -TheoryInput: NNPDF2.3 NLO, alphas(MZ)=0.119 -PDFset: NNPDF23_nlo_as_0119 -Warnings: Only pure EWK, no photon-initiated effects -******************************************************************************************** -1.0044495382 0.00000 -1.0058859346 0.00000 -1.0026354913 0.00000 -1.0035861696 0.00000 -1.0037412421 0.00000 -1.0016990621 0.00000 -1.0043856644 0.00000 -1.0018574573 0.00000 -1.0060170136 0.00000 -1.0045258321 0.00000 -1.0025859659 0.00000 -1.0035310734 0.00000 -1.0044792037 0.00000 -1.0011485177 0.00000 -1.0050192769 0.00000 -1.0008821583 0.00000 -1.0018872197 0.00000 -1.0044375243 0.00000 -1.0008981058 0.00000 -1.007739525 0.00000 -1.0076176563 0.00000 -1.0064595932 0.00000 -0.997382199 0.00000 -1.0445644835 0.00000 -1.0312302839 0.00000 -1.0301313823 0.00000 -1.0272720107 0.00000 -1.0258546169 0.00000 -1.029782858 0.00000 -1.029101578 0.00000 -1.0274844782 0.00000 -1.0280269948 0.00000 -1.02829097 0.00000 -1.0296156775 0.00000 -1.0256677629 0.00000 -1.0270991749 0.00000 -1.0362104398 0.00000 -1.0240023135 0.00000 -1.0299583673 0.00000 -1.029109589 0.00000 -1.0377569367 0.00000 -1.0279164653 0.00000 -1.0306299603 0.00000 -1.0372501514 0.00000 -1.0335857115 0.00000 -1.0365573992 0.00000 -1.0428797111 0.00000 -1.0619111709 0.00000 -1.0391056137 0.00000 -1.0431969553 0.00000 -1.0372168285 0.00000 -1.0434492616 0.00000 -1.0379396024 0.00000 -1.0341114817 0.00000 -1.0440172994 0.00000 -1.0395725014 0.00000 -1.0436935625 0.00000 -1.0390984811 0.00000 -1.0370185592 0.00000 -1.040373947 0.00000 -1.042792306 0.00000 -1.0448688449 0.00000 -1.0403532442 0.00000 -1.0425304266 0.00000 -1.0362297496 0.00000 -1.040066778 0.00000 -1.0416504476 0.00000 -1.0399719495 0.00000 -1.0458358298 0.00000 -1.0347107438 0.00000 -1.0472878999 0.00000 -1.0060362173 0.00000 -1.0106115126 0.00000 -1.0209305119 0.00000 -1.0163390832 0.00000 -1.0127834582 0.00000 -1.0156551464 0.00000 -1.0177408226 0.00000 -1.0160556267 0.00000 -1.0207431451 0.00000 -1.0092763118 0.00000 -1.0175231545 0.00000 -1.0227353261 0.00000 -1.0089373292 0.00000 -1.0140472295 0.00000 -1.0219572829 0.00000 -1.0153735832 0.00000 -1.0208199635 0.00000 -1.0233292707 0.00000 -1.0118279879 0.00000 -1.0183591117 0.00000 -1.0136763472 0.00000 -1.024894361 0.00000 -1.0033684051 0.00000 -1.0189700151 0.00000 -1.0008658009 0.00000 -0.993 0.00000 -0.995 0.00000 -0.992 0.00000 -0.999 0.00000 -0.995 0.00000 -0.997 0.00000 -0.997 0.00000 -0.997 0.00000 -0.998 0.00000 -0.993 0.00000 -0.996 0.00000 -0.995 0.00000 -0.997 0.00000 -0.998 0.00000 -0.999 0.00000 -0.998 0.00000 -0.994 0.00000 -0.997 0.00000 -0.991 0.00000 -0.997 0.00000 -0.995 0.00000 -0.998 0.00000 -0.992 0.00000 -0.970 0.00000 -1.001 0.00000 -0.999 0.00000 -1.000 0.00000 -1.000 0.00000 -0.998 0.00000 -0.997 0.00000 -1.000 0.00000 -1.002 0.00000 -1.001 0.00000 -0.998 0.00000 -1.011 0.00000 -0.989 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_CMSDY2D12.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_CMSDY2D12.dat deleted file mode 100644 index 1283819e39..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_CMSDY2D12.dat +++ /dev/null @@ -1,141 +0,0 @@ -******************************************************************************** -SetName: CMSDY2D12-BIN1 -Author: Alberto Guffanti -Date: 2016-02-02 -CodesUsed: FEWZ 3.1b2 -TheoryInput: NLO QCD + EW1 (Pure EW, ISR, ISRxFSR) -PDFset: NNPDF30_nlo_as_0118 -Warnings: Data are corrected for FSR -******************************************************************************** -1.00232803986 0.00000 -1.00228407664 0.00000 -1.00171871244 0.00000 -1.00244839799 0.00000 -1.00158304624 0.00000 -1.00200237804 0.00000 -1.0025920182 0.00000 -1.00028583486 0.00000 -1.00463216967 0.00000 -1.00064213518 0.00000 -1.00233921209 0.00000 -1.00319263131 0.00000 -1.00189259829 0.00000 -1.00317338101 0.00000 -1.00207642524 0.00000 -1.00239609588 0.00000 -1.00269725501 0.00000 -1.00173790704 0.00000 -1.00227964844 0.00000 -1.00168634363 0.00000 -1.00525069511 0.00000 -1.00156589492 0.00000 -1.00413057288 0.00000 -1.00230546115 0.00000 -1.00943374072 0.00000 -1.01513628044 0.00000 -1.01403401891 0.00000 -1.01133470261 0.00000 -1.01327597646 0.00000 -1.00970267914 0.00000 -1.01496980082 0.00000 -1.01448070037 0.00000 -1.01484324878 0.00000 -1.01519466644 0.00000 -1.00930582516 0.00000 -1.01299289882 0.00000 -1.01281449447 0.00000 -1.01215772757 0.00000 -1.0099290806 0.00000 -1.01549618465 0.00000 -1.01092469426 0.00000 -1.015016868 0.00000 -1.01605268856 0.00000 -1.01467735361 0.00000 -1.01431843189 0.00000 -1.01692143138 0.00000 -1.00376824296 0.00000 -1.00759191437 0.00000 -1.03331832687 0.00000 -1.03951181599 0.00000 -1.03813930087 0.00000 -1.03587964935 0.00000 -1.03948370689 0.00000 -1.03750935322 0.00000 -1.04139619751 0.00000 -1.03697162525 0.00000 -1.03582541349 0.00000 -1.0363889202 0.00000 -1.038691854 0.00000 -1.04049921341 0.00000 -1.03781737647 0.00000 -1.037843947 0.00000 -1.03845303972 0.00000 -1.04201679923 0.00000 -1.04180218109 0.00000 -1.03987160463 0.00000 -1.04765920018 0.00000 -1.04604268064 0.00000 -1.04559043058 0.00000 -1.04646999606 0.00000 -1.05623045095 0.00000 -1.00062889861 0.00000 -1.00176626685 0.00000 -0.996996340372 0.00000 -0.998661664683 0.00000 -0.994343481937 0.00000 -1.00075368142 0.00000 -0.995105859387 0.00000 -0.995261544599 0.00000 -1.00342002192 0.00000 -0.994757079587 0.00000 -1.00266980746 0.00000 -0.993430879613 0.00000 -0.99349954698 0.00000 -0.998664137988 0.00000 -0.998342236017 0.00000 -0.999577352986 0.00000 -0.991511215107 0.00000 -0.994405227045 0.00000 -0.999100799669 0.00000 -0.987996531877 0.00000 -0.994135442931 0.00000 -0.996504458175 0.00000 -0.993189335771 0.00000 -0.99305658735 0.00000 -1.00620534515 0.00000 -0.995645636977 0.00000 -0.992812184034 0.00000 -0.99777947237 0.00000 -0.993434147123 0.00000 -0.99791952446 0.00000 -0.997719666461 0.00000 -0.997356689187 0.00000 -0.994971601603 0.00000 -0.992611926837 0.00000 -1.00029432107 0.00000 -0.996568516414 0.00000 -0.998202838396 0.00000 -0.997025103053 0.00000 -0.999947834328 0.00000 -0.998921489106 0.00000 -0.999075640963 0.00000 -0.998649514553 0.00000 -0.999402089645 0.00000 -0.994721237987 0.00000 -1.00515846977 0.00000 -0.998063150805 0.00000 -0.990978964725 0.00000 -1.01512269244 0.00000 -1.03034001833 0.00000 -0.99360822395 0.00000 -0.999724176574 0.00000 -0.997891802675 0.00000 -0.999475971813 0.00000 -1.00073007469 0.00000 -1.00424395378 0.00000 -1.00399495956 0.00000 -0.999467058847 0.00000 -1.00322780238 0.00000 -1.01784257633 0.00000 -0.997863632625 0.00000 -0.986571796523 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_CMSJETS11_NEW_SCALE.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_CMSJETS11_NEW_SCALE.dat deleted file mode 100644 index 2cf1be5a6c..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_CMSJETS11_NEW_SCALE.dat +++ /dev/null @@ -1,142 +0,0 @@ -******************************************************************************** -SetName: CMSJETS11_NEW_SCALE -Author: Emanuele R. Nocera (enocera@nikhef.nl) -Date: November 2019 -CodesUsed: Numbers provided by A. Huss et al. -TheoryInput: NNPDF3.1 NLO, alphas(MZ)=0.118, R=0.7 -PDFset: NNPDF31_qed_nlo_as_0118 -Warnings: Uses average HThat as central scale. -******************************************************************************** -9.997008e-01 0.00000 -9.997119e-01 0.00000 -9.997484e-01 0.00000 -9.998813e-01 0.00000 -1.000049e+00 0.00000 -1.000400e+00 0.00000 -1.000876e+00 0.00000 -1.001579e+00 0.00000 -1.002540e+00 0.00000 -1.003825e+00 0.00000 -1.005542e+00 0.00000 -1.007571e+00 0.00000 -1.010217e+00 0.00000 -1.013386e+00 0.00000 -1.017131e+00 0.00000 -1.021675e+00 0.00000 -1.026878e+00 0.00000 -1.032741e+00 0.00000 -1.039574e+00 0.00000 -1.047120e+00 0.00000 -1.055276e+00 0.00000 -1.064206e+00 0.00000 -1.074093e+00 0.00000 -1.085101e+00 0.00000 -1.095369e+00 0.00000 -1.107566e+00 0.00000 -1.119244e+00 0.00000 -1.132032e+00 0.00000 -1.143937e+00 0.00000 -1.159747e+00 0.00000 -1.173461e+00 0.00000 -1.196265e+00 0.00000 -1.237531e+00 0.00000 -9.997219e-01 0.00000 -9.997086e-01 0.00000 -9.997664e-01 0.00000 -9.998862e-01 0.00000 -1.000003e+00 0.00000 -1.000302e+00 0.00000 -1.000670e+00 0.00000 -1.001211e+00 0.00000 -1.002024e+00 0.00000 -1.003068e+00 0.00000 -1.004418e+00 0.00000 -1.005972e+00 0.00000 -1.007956e+00 0.00000 -1.010369e+00 0.00000 -1.013157e+00 0.00000 -1.016387e+00 0.00000 -1.020042e+00 0.00000 -1.024244e+00 0.00000 -1.028517e+00 0.00000 -1.033636e+00 0.00000 -1.038869e+00 0.00000 -1.044663e+00 0.00000 -1.050971e+00 0.00000 -1.057094e+00 0.00000 -1.063251e+00 0.00000 -1.070547e+00 0.00000 -1.079432e+00 0.00000 -1.085215e+00 0.00000 -1.093651e+00 0.00000 -1.109592e+00 0.00000 -9.997261e-01 0.00000 -9.996772e-01 0.00000 -9.997160e-01 0.00000 -9.997005e-01 0.00000 -9.997933e-01 0.00000 -9.998300e-01 0.00000 -1.000144e+00 0.00000 -1.000229e+00 0.00000 -1.000683e+00 0.00000 -1.001122e+00 0.00000 -1.001763e+00 0.00000 -1.002566e+00 0.00000 -1.003445e+00 0.00000 -1.004541e+00 0.00000 -1.005820e+00 0.00000 -1.007185e+00 0.00000 -1.008768e+00 0.00000 -1.010479e+00 0.00000 -1.012445e+00 0.00000 -1.014708e+00 0.00000 -1.016787e+00 0.00000 -1.019161e+00 0.00000 -1.021691e+00 0.00000 -1.024493e+00 0.00000 -1.027219e+00 0.00000 -1.030542e+00 0.00000 -1.035154e+00 0.00000 -9.997056e-01 0.00000 -9.996020e-01 0.00000 -9.994928e-01 0.00000 -9.993153e-01 0.00000 -9.991192e-01 0.00000 -9.989054e-01 0.00000 -9.987567e-01 0.00000 -9.984727e-01 0.00000 -9.982143e-01 0.00000 -9.980525e-01 0.00000 -9.979938e-01 0.00000 -9.977540e-01 0.00000 -9.977669e-01 0.00000 -9.976315e-01 0.00000 -9.976921e-01 0.00000 -9.978112e-01 0.00000 -9.978740e-01 0.00000 -9.980697e-01 0.00000 -9.981878e-01 0.00000 -9.983028e-01 0.00000 -9.987334e-01 0.00000 -9.986309e-01 0.00000 -9.984124e-01 0.00000 -1.001031e+00 0.00000 -9.994206e-01 0.00000 -9.993002e-01 0.00000 -9.988060e-01 0.00000 -9.984636e-01 0.00000 -9.978397e-01 0.00000 -9.973566e-01 0.00000 -9.967643e-01 0.00000 -9.961085e-01 0.00000 -9.955539e-01 0.00000 -9.949816e-01 0.00000 -9.941593e-01 0.00000 -9.935483e-01 0.00000 -9.927509e-01 0.00000 -9.920196e-01 0.00000 -9.910673e-01 0.00000 -9.899422e-01 0.00000 -9.889131e-01 0.00000 -9.882471e-01 0.00000 -9.895932e-01 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_CMS_1JET_8TEV.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_CMS_1JET_8TEV.dat deleted file mode 100644 index c49f153177..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_CMS_1JET_8TEV.dat +++ /dev/null @@ -1,248 +0,0 @@ -******************************************************************************** -SetName: CMS_1JET_8TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: Numbers provided by A. Huss et al. -TheoryInput: NNPDF3.1 NLO, alphas(MZ)=0.118, R=0.7 -PDFset: NNPDF31_qed_nlo_as_0118 -Warnings: Uses average HThat as central scale. -******************************************************************************** -1.000150e+00 0.00000 -1.000229e+00 0.00000 -1.000392e+00 0.00000 -1.000796e+00 0.00000 -1.001690e+00 0.00000 -1.000629e+00 0.00000 -9.998208e-01 0.00000 -9.997737e-01 0.00000 -9.997300e-01 0.00000 -9.996798e-01 0.00000 -9.996201e-01 0.00000 -9.995477e-01 0.00000 -9.994520e-01 0.00000 -9.993444e-01 0.00000 -9.992443e-01 0.00000 -9.991910e-01 0.00000 -9.991503e-01 0.00000 -9.991829e-01 0.00000 -9.993368e-01 0.00000 -9.996017e-01 0.00000 -1.000065e+00 0.00000 -1.000741e+00 0.00000 -1.001627e+00 0.00000 -1.002928e+00 0.00000 -1.004490e+00 0.00000 -1.006672e+00 0.00000 -1.009092e+00 0.00000 -1.011967e+00 0.00000 -1.015876e+00 0.00000 -1.020456e+00 0.00000 -1.025060e+00 0.00000 -1.031023e+00 0.00000 -1.037810e+00 0.00000 -1.043967e+00 0.00000 -1.051910e+00 0.00000 -1.060243e+00 0.00000 -1.072041e+00 0.00000 -1.079240e+00 0.00000 -1.091250e+00 0.00000 -1.102722e+00 0.00000 -1.112440e+00 0.00000 -1.126188e+00 0.00000 -1.139242e+00 0.00000 -1.155501e+00 0.00000 -1.189973e+00 0.00000 -1.247603e+00 0.00000 -1.000164e+00 0.00000 -1.000226e+00 0.00000 -1.000423e+00 0.00000 -1.000805e+00 0.00000 -1.001763e+00 0.00000 -1.000637e+00 0.00000 -9.998204e-01 0.00000 -9.997745e-01 0.00000 -9.997366e-01 0.00000 -9.996908e-01 0.00000 -9.996408e-01 0.00000 -9.995562e-01 0.00000 -9.994600e-01 0.00000 -9.993669e-01 0.00000 -9.992566e-01 0.00000 -9.991622e-01 0.00000 -9.991406e-01 0.00000 -9.991099e-01 0.00000 -9.991928e-01 0.00000 -9.993612e-01 0.00000 -9.997440e-01 0.00000 -1.000203e+00 0.00000 -1.001000e+00 0.00000 -1.001852e+00 0.00000 -1.003184e+00 0.00000 -1.004538e+00 0.00000 -1.006509e+00 0.00000 -1.008759e+00 0.00000 -1.011404e+00 0.00000 -1.014526e+00 0.00000 -1.017747e+00 0.00000 -1.021504e+00 0.00000 -1.025998e+00 0.00000 -1.030999e+00 0.00000 -1.035467e+00 0.00000 -1.040858e+00 0.00000 -1.046521e+00 0.00000 -1.053109e+00 0.00000 -1.058216e+00 0.00000 -1.066466e+00 0.00000 -1.072616e+00 0.00000 -1.081932e+00 0.00000 -1.084169e+00 0.00000 -1.099933e+00 0.00000 -1.119136e+00 0.00000 -1.168411e+00 0.00000 -1.000167e+00 0.00000 -1.000249e+00 0.00000 -1.000443e+00 0.00000 -1.000887e+00 0.00000 -1.001861e+00 0.00000 -1.000697e+00 0.00000 -9.998306e-01 0.00000 -9.997812e-01 0.00000 -9.997470e-01 0.00000 -9.997157e-01 0.00000 -9.996548e-01 0.00000 -9.995858e-01 0.00000 -9.994676e-01 0.00000 -9.993562e-01 0.00000 -9.992266e-01 0.00000 -9.990914e-01 0.00000 -9.989901e-01 0.00000 -9.988535e-01 0.00000 -9.987649e-01 0.00000 -9.987497e-01 0.00000 -9.987594e-01 0.00000 -9.989393e-01 0.00000 -9.991488e-01 0.00000 -9.994535e-01 0.00000 -1.000011e+00 0.00000 -1.000622e+00 0.00000 -1.001197e+00 0.00000 -1.002272e+00 0.00000 -1.003103e+00 0.00000 -1.004898e+00 0.00000 -1.005426e+00 0.00000 -1.007466e+00 0.00000 -1.009048e+00 0.00000 -1.010572e+00 0.00000 -1.012934e+00 0.00000 -1.014575e+00 0.00000 -1.016857e+00 0.00000 -1.019263e+00 0.00000 -1.022177e+00 0.00000 -1.024535e+00 0.00000 -1.029671e+00 0.00000 -1.028456e+00 0.00000 -1.035281e+00 0.00000 -1.038188e+00 0.00000 -1.089352e+00 0.00000 -1.000175e+00 0.00000 -1.000295e+00 0.00000 -1.000519e+00 0.00000 -1.000958e+00 0.00000 -1.002098e+00 0.00000 -1.000793e+00 0.00000 -9.998360e-01 0.00000 -9.997803e-01 0.00000 -9.997504e-01 0.00000 -9.997036e-01 0.00000 -9.996683e-01 0.00000 -9.995636e-01 0.00000 -9.994328e-01 0.00000 -9.992583e-01 0.00000 -9.990141e-01 0.00000 -9.987904e-01 0.00000 -9.984660e-01 0.00000 -9.981732e-01 0.00000 -9.977705e-01 0.00000 -9.974255e-01 0.00000 -9.970045e-01 0.00000 -9.966493e-01 0.00000 -9.963770e-01 0.00000 -9.959055e-01 0.00000 -9.954721e-01 0.00000 -9.954077e-01 0.00000 -9.949191e-01 0.00000 -9.948921e-01 0.00000 -9.944684e-01 0.00000 -9.947340e-01 0.00000 -9.946007e-01 0.00000 -9.940787e-01 0.00000 -9.945995e-01 0.00000 -9.936749e-01 0.00000 -9.935904e-01 0.00000 -9.938771e-01 0.00000 -9.916436e-01 0.00000 -9.946460e-01 0.00000 -9.926725e-01 0.00000 -1.007882e+00 0.00000 -1.031483e+00 0.00000 -1.000187e+00 0.00000 -1.000285e+00 0.00000 -1.000559e+00 0.00000 -1.001114e+00 0.00000 -1.002333e+00 0.00000 -1.000916e+00 0.00000 -9.998331e-01 0.00000 -9.997942e-01 0.00000 -9.997532e-01 0.00000 -9.997026e-01 0.00000 -9.995838e-01 0.00000 -9.994607e-01 0.00000 -9.992366e-01 0.00000 -9.989534e-01 0.00000 -9.986191e-01 0.00000 -9.980604e-01 0.00000 -9.975407e-01 0.00000 -9.969209e-01 0.00000 -9.962806e-01 0.00000 -9.955764e-01 0.00000 -9.947119e-01 0.00000 -9.939993e-01 0.00000 -9.932135e-01 0.00000 -9.923146e-01 0.00000 -9.914021e-01 0.00000 -9.904366e-01 0.00000 -9.895100e-01 0.00000 -9.887104e-01 0.00000 -9.872274e-01 0.00000 -9.860751e-01 0.00000 -9.850028e-01 0.00000 -9.837455e-01 0.00000 -9.860977e-01 0.00000 -9.893781e-01 0.00000 -1.000141e+00 0.00000 -1.000345e+00 0.00000 -1.000561e+00 0.00000 -1.001234e+00 0.00000 -1.002787e+00 0.00000 -1.000986e+00 0.00000 -9.998463e-01 0.00000 -9.997254e-01 0.00000 -9.996912e-01 0.00000 -9.994729e-01 0.00000 -9.993617e-01 0.00000 -9.991650e-01 0.00000 -9.986725e-01 0.00000 -9.982826e-01 0.00000 -9.976921e-01 0.00000 -9.970633e-01 0.00000 -9.964152e-01 0.00000 -9.956841e-01 0.00000 -9.947381e-01 0.00000 -9.937953e-01 0.00000 -9.929128e-01 0.00000 -9.917377e-01 0.00000 -9.905470e-01 0.00000 -9.890586e-01 0.00000 -9.874103e-01 0.00000 -9.866620e-01 0.00000 -9.852347e-01 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_CMS_2JET_3D_8TEV.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_CMS_2JET_3D_8TEV.dat deleted file mode 100644 index 0a40de714b..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_CMS_2JET_3D_8TEV.dat +++ /dev/null @@ -1,131 +0,0 @@ -******************************************************************************** -SetName: CMS_2JET_3D_8TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: Numbers provided by A. Huss et al. -TheoryInput: NNPDF3.1 NLO, alphas(MZ)=0.118, R=0.7 -PDFset: NNPDF31_qed_nlo_as_0118 -Warnings: Uses average HThat as central scale. -******************************************************************************** -9.998325e-01 0.00000 -9.998008e-01 0.00000 -9.998044e-01 0.00000 -9.998297e-01 0.00000 -9.999259e-01 0.00000 -1.000104e+00 0.00000 -1.000436e+00 0.00000 -1.000908e+00 0.00000 -1.001569e+00 0.00000 -1.002444e+00 0.00000 -1.003584e+00 0.00000 -1.005035e+00 0.00000 -1.006834e+00 0.00000 -1.009016e+00 0.00000 -1.011497e+00 0.00000 -1.014662e+00 0.00000 -1.018191e+00 0.00000 -1.022320e+00 0.00000 -1.026918e+00 0.00000 -1.032310e+00 0.00000 -1.038232e+00 0.00000 -1.044820e+00 0.00000 -1.052139e+00 0.00000 -1.059867e+00 0.00000 -1.068678e+00 0.00000 -1.077990e+00 0.00000 -1.087817e+00 0.00000 -1.098590e+00 0.00000 -1.109812e+00 0.00000 -1.122641e+00 0.00000 -1.140055e+00 0.00000 -9.988287e-01 0.00000 -9.987565e-01 0.00000 -9.986586e-01 0.00000 -9.985668e-01 0.00000 -9.984851e-01 0.00000 -9.984159e-01 0.00000 -9.983463e-01 0.00000 -9.983406e-01 0.00000 -9.983131e-01 0.00000 -9.983535e-01 0.00000 -9.984375e-01 0.00000 -9.984928e-01 0.00000 -9.987005e-01 0.00000 -9.989181e-01 0.00000 -9.989992e-01 0.00000 -9.994011e-01 0.00000 -9.995887e-01 0.00000 -9.997903e-01 0.00000 -9.997568e-01 0.00000 -9.999707e-01 0.00000 -9.999970e-01 0.00000 -1.000607e+00 0.00000 -1.000522e+00 0.00000 -9.982999e-01 0.00000 -9.989262e-01 0.00000 -9.987163e-01 0.00000 -1.001075e+00 0.00000 -1.001661e+00 0.00000 -1.002215e+00 0.00000 -1.002621e+00 0.00000 -1.002960e+00 0.00000 -1.003085e+00 0.00000 -1.002967e+00 0.00000 -1.002650e+00 0.00000 -1.002121e+00 0.00000 -1.000998e+00 0.00000 -9.996786e-01 0.00000 -9.978634e-01 0.00000 -9.951084e-01 0.00000 -9.924049e-01 0.00000 -9.997954e-01 0.00000 -9.995991e-01 0.00000 -9.993519e-01 0.00000 -9.991214e-01 0.00000 -9.988732e-01 0.00000 -9.986311e-01 0.00000 -9.984452e-01 0.00000 -9.982779e-01 0.00000 -9.982007e-01 0.00000 -9.983439e-01 0.00000 -9.984035e-01 0.00000 -9.986552e-01 0.00000 -9.993256e-01 0.00000 -1.000012e+00 0.00000 -1.001142e+00 0.00000 -1.002392e+00 0.00000 -1.004352e+00 0.00000 -1.006125e+00 0.00000 -1.008612e+00 0.00000 -1.012548e+00 0.00000 -1.015150e+00 0.00000 -1.019633e+00 0.00000 -1.025425e+00 0.00000 -9.982150e-01 0.00000 -9.978841e-01 0.00000 -9.974544e-01 0.00000 -9.970308e-01 0.00000 -9.965137e-01 0.00000 -9.959726e-01 0.00000 -9.953600e-01 0.00000 -9.948518e-01 0.00000 -9.942253e-01 0.00000 -9.935852e-01 0.00000 -9.931026e-01 0.00000 -9.924226e-01 0.00000 -9.919636e-01 0.00000 -9.909994e-01 0.00000 -9.909762e-01 0.00000 -9.903711e-01 0.00000 -9.903189e-01 0.00000 -1.000058e+00 0.00000 -9.995756e-01 0.00000 -9.992567e-01 0.00000 -9.986567e-01 0.00000 -9.982382e-01 0.00000 -9.972756e-01 0.00000 -9.968965e-01 0.00000 -9.957454e-01 0.00000 -9.955210e-01 0.00000 -9.946427e-01 0.00000 -9.945303e-01 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_CMS_2JET_7TEV.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_CMS_2JET_7TEV.dat deleted file mode 100644 index e90bbab431..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_CMS_2JET_7TEV.dat +++ /dev/null @@ -1,63 +0,0 @@ -******************************************************************************** -SetName: CMS_2JET_7TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: Numbers provided by A. Huss et al. -TheoryInput: NNPDF3.1 NLO, alphas(MZ)=0.118, R=0.7 -PDFset: NNPDF31_qed_nlo_as_0118 -Warnings: Uses average HThat as central scale. -******************************************************************************** -1.000661e+00 0.00000 -1.001166e+00 0.00000 -1.002506e+00 0.00000 -1.005582e+00 0.00000 -1.011676e+00 0.00000 -1.021976e+00 0.00000 -1.037273e+00 0.00000 -1.057720e+00 0.00000 -1.081967e+00 0.00000 -1.108607e+00 0.00000 -1.136315e+00 0.00000 -1.162604e+00 0.00000 -1.190301e+00 0.00000 -1.000160e+00 0.00000 -1.000512e+00 0.00000 -1.001606e+00 0.00000 -1.004082e+00 0.00000 -1.008495e+00 0.00000 -1.015200e+00 0.00000 -1.023997e+00 0.00000 -1.033958e+00 0.00000 -1.044002e+00 0.00000 -1.052330e+00 0.00000 -1.058103e+00 0.00000 -1.063838e+00 0.00000 -9.994349e-01 0.00000 -9.995999e-01 0.00000 -1.000226e+00 0.00000 -1.001433e+00 0.00000 -1.003129e+00 0.00000 -1.005088e+00 0.00000 -1.006761e+00 0.00000 -1.007440e+00 0.00000 -1.006615e+00 0.00000 -1.003337e+00 0.00000 -9.954802e-01 0.00000 -9.991320e-01 0.00000 -9.993304e-01 0.00000 -9.998034e-01 0.00000 -1.000488e+00 0.00000 -1.001178e+00 0.00000 -1.001531e+00 0.00000 -1.001151e+00 0.00000 -9.996582e-01 0.00000 -9.965957e-01 0.00000 -9.903512e-01 0.00000 -1.000436e+00 0.00000 -1.001453e+00 0.00000 -1.002549e+00 0.00000 -1.003404e+00 0.00000 -1.003676e+00 0.00000 -1.002985e+00 0.00000 -1.000451e+00 0.00000 -9.946092e-01 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_LHCBWZMU7TEV.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_LHCBWZMU7TEV.dat deleted file mode 100644 index 19852d4b37..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_LHCBWZMU7TEV.dat +++ /dev/null @@ -1,42 +0,0 @@ -******************************************************************************** -SetName: LHCBWZMU7TEV-Z -Author: Alberto Guffanti -Date: 2016-06-07 -CodesUsed: FEWZ 3.1b2 -TheoryInput: -PDFset: NNPDF30_nlo_as_0118 -Warnings: -******************************************************************************** -0.9970102305810419 0.00000 -0.9771313865261753 0.00000 -0.9936674381337398 0.00000 -1.0022155818878282 0.00000 -0.9963064472492442 0.00000 -0.9973970655858867 0.00000 -0.9950279775719384 0.00000 -0.9955126210844967 0.00000 -1.0025600573772968 0.00000 -1.0018194487910905 0.00000 -1.000578122577286 0.00000 -0.9979296055636984 0.00000 -0.9941347547923047 0.00000 -1.0081108810073764 0.00000 -1.0035999486392504 0.00000 -1.0046571530318102 0.00000 -0.9930173893125102 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_LHCBWZMU8TEV.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_LHCBWZMU8TEV.dat deleted file mode 100644 index 95e2455f0c..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_LHCBWZMU8TEV.dat +++ /dev/null @@ -1,43 +0,0 @@ -******************************************************************************** -SetName: LHCBWZMU8TEV-Z -Author: Alberto Guffanti -Date: 2016-06-07 -CodesUsed: FEWZ 3.1b2 -TheoryInput: -PDFset: NNPDF30_nlo_as_0118 -Warnings: -******************************************************************************** -1.0137547730410903 0.00000 -1.0010820125599054 0.00000 -0.9958693692790854 0.00000 -1.009891037057123 0.00000 -0.993047730185237 0.00000 -0.9921474414750169 0.00000 -1.003200266887564 0.00000 -1.000598700276283 0.00000 -0.9954113518828676 0.00000 -1.0004683757618096 0.00000 -0.9983509630603634 0.00000 -1.007640162997718 0.00000 -0.9971975685669943 0.00000 -1.0018224300747764 0.00000 -0.981167080804408 0.00000 -1.009674842200968 0.00000 -1.010476742868943 0.00000 -1.009837212271281 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_LHCBZ940PB.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_LHCBZ940PB.dat deleted file mode 100644 index 96712611ec..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_LHCBZ940PB.dat +++ /dev/null @@ -1,18 +0,0 @@ -******************************************************************************************* -SetName: LHCBZ940PB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: 2014 -CodesUsed: FEWZ -TheoryInput: NNPDF2.3 NLO, alphas(MZ)=0.119 -PDFset: NNPDF23_nlo_as_0119 -Warnings: Only pure EWK, no photon-initiated effects -******************************************************************************************** -0.9883665496 0.00000 -0.9957657855 0.00000 -1.0307326783 0.00000 -0.9926813471 0.00000 -0.9937090244 0.00000 -0.9968969098 0.00000 -0.9939320617 0.00000 -1.0005519171 0.00000 -0.9990327513 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_EWK_LHCBZEE2FB.dat b/nnpdfcpp/data/NLOCFAC/CF_EWK_LHCBZEE2FB.dat deleted file mode 100644 index 2161b1f017..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_EWK_LHCBZEE2FB.dat +++ /dev/null @@ -1,26 +0,0 @@ -******************************************************************************************* -SetName: LHCBZEE2FB -Author: Alberto Guffanti -Date: 25/11/2015 -CodesUsed: FEWZ 3.1b2 -TheoryInput: input cards in external/FEWZ_3.1.b2/InputCards -PDFset: NNPDF30_nlo_as_0118 -Warnings: No photon initiated processes, NLO QCD, ISR, ISRxFSR, EW (EW flag 1) -******************************************************************************************** -1.0198 0.00000 -1.0112 0.00000 -0.9982 0.00000 -1.0046 0.00000 -0.9925 0.00000 -0.9939 0.00000 -1.0051 0.00000 -1.0012 0.00000 -0.9917 0.00000 -1.0017 0.00000 -0.9940 0.00000 -1.0086 0.00000 -0.9956 0.00000 -1.0063 0.00000 -0.9837 0.00000 -1.0134 0.00000 -1.0007 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_JAC_DYE866P.dat b/nnpdfcpp/data/NLOCFAC/CF_JAC_DYE866P.dat deleted file mode 100644 index ac1d59e7bc..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_JAC_DYE866P.dat +++ /dev/null @@ -1,184 +0,0 @@ -0.243559 0 -0.261969 0 -0.283622 0 -0.314951 0 -0.33425 0 -0.355663 0 -0.3894 0 -0.415378 0 -0.436376 0 -0.561763 0 -0.244421 0 -0.264944 0 -0.291944 0 -0.317733 0 -0.343007 0 -0.365212 0 -0.394789 0 -0.417151 0 -0.441813 0 -0.581443 0 -0.262269 0 -0.28363 0 -0.307679 0 -0.332339 0 -0.356506 0 -0.382075 0 -0.40528 0 -0.429022 0 -0.453209 0 -0.592563 0 -0.288917 0 -0.310113 0 -0.331167 0 -0.35283 0 -0.377598 0 -0.400939 0 -0.423317 0 -0.445516 0 -0.469304 0 -0.603152 0 -0.654789 0 -0.710587 0 -0.321279 0 -0.339417 0 -0.35912 0 -0.382164 0 -0.403567 0 -0.424111 0 -0.446095 0 -0.467048 0 -0.489332 0 -0.622776 0 -0.674553 0 -0.717942 0 -0.357009 0 -0.375872 0 -0.393455 0 -0.412891 0 -0.432105 0 -0.451828 0 -0.471493 0 -0.493644 0 -0.514679 0 -0.64216 0 -0.693435 0 -0.740266 0 -0.396978 0 -0.413194 0 -0.430345 0 -0.446867 0 -0.463867 0 -0.483319 0 -0.503087 0 -0.522218 0 -0.542629 0 -0.668397 0 -0.712008 0 -0.760423 0 -0.439009 0 -0.454401 0 -0.468557 0 -0.484775 0 -0.501163 0 -0.518264 0 -0.537077 0 -0.555478 0 -0.573712 0 -0.693616 0 -0.734335 0 -0.788266 0 -0.482316 0 -0.49453 0 -0.508907 0 -0.524109 0 -0.538809 0 -0.555083 0 -0.572056 0 -0.589309 0 -0.607491 0 -0.719031 0 -0.760162 0 -0.815732 0 -0.52591 0 -0.539193 0 -0.552119 0 -0.564572 0 -0.578682 0 -0.593842 0 -0.609391 0 -0.62549 0 -0.643386 0 -0.749306 0 -0.791067 0 -0.841548 0 -0.572629 0 -0.583273 0 -0.593919 0 -0.606898 0 -0.621421 0 -0.63335 0 -0.648541 0 -0.664107 0 -0.680623 0 -0.782825 0 -0.817624 0 -0.869456 0 -0.932457 0 -0.615543 0 -0.629279 0 -0.638161 0 -0.650162 0 -0.662213 0 -0.674653 0 -0.688923 0 -0.703344 0 -0.719443 0 -0.813498 0 -0.853169 0 -0.89078 0 -0.663664 0 -0.673421 0 -0.682711 0 -0.69463 0 -0.70568 0 -0.719013 0 -0.731577 0 -0.745965 0 -0.760983 0 -0.852237 0 -0.88237 0 -0.911614 0 -0.71135 0 -0.717308 0 -0.726513 0 -0.739591 0 -0.749082 0 -0.758639 0 -0.774345 0 -0.785386 0 -0.797736 0 -0.890815 0 -0.933223 0 -0.980885 0 -0.756918 0 -0.764913 0 -0.771934 0 -0.785162 0 -0.793057 0 -0.803744 0 -0.820347 0 -0.827582 0 -0.838131 0 -0.931698 0 -0.990702 0 -0.803883 0 -0.80849 0 -0.817768 0 -0.829763 0 -0.837386 0 -0.846322 0 -0.863134 0 -0.873539 0 -0.89039 0 -0.964327 0 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NRM_ATLASPHT12.dat b/nnpdfcpp/data/NLOCFAC/CF_NRM_ATLASPHT12.dat deleted file mode 100644 index 6129913441..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NRM_ATLASPHT12.dat +++ /dev/null @@ -1,61 +0,0 @@ -******************************************************************************** -SetName: ATLASPHT12 -Author: Emanuele R. Nocera (enocera@nikhef.nl) -Date: February 2019 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Unity of measure conversion -******************************************************************************** -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 - - - diff --git a/nnpdfcpp/data/NLOCFAC/CF_NRM_ATLASWZTOT13TEV81PB.dat b/nnpdfcpp/data/NLOCFAC/CF_NRM_ATLASWZTOT13TEV81PB.dat deleted file mode 100644 index 4c9ea6ebd8..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NRM_ATLASWZTOT13TEV81PB.dat +++ /dev/null @@ -1,12 +0,0 @@ -******************************************************************************************* -SetName: ATLASWZTOT13TEV81PB -Author: Alberto Guffanti -Date: June 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for total cross-section APPLgrids -******************************************************************************************** -9.8 0.00000 -9.8 0.00000 -9.8 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NRM_ATLASZPT7TEV.dat b/nnpdfcpp/data/NLOCFAC/CF_NRM_ATLASZPT7TEV.dat deleted file mode 100644 index 154696954b..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NRM_ATLASZPT7TEV.dat +++ /dev/null @@ -1,87 +0,0 @@ -******************************************************************************************* -SetName: ATLASZPT7TEV_TOT -Author: Maria Ubiali -Date: June 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for total cross-section APPLgrids -******************************************************************************************** -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NRM_ATLASZPT7TEV_PTZ.dat b/nnpdfcpp/data/NLOCFAC/CF_NRM_ATLASZPT7TEV_PTZ.dat deleted file mode 100644 index 154696954b..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NRM_ATLASZPT7TEV_PTZ.dat +++ /dev/null @@ -1,87 +0,0 @@ -******************************************************************************************* -SetName: ATLASZPT7TEV_TOT -Author: Maria Ubiali -Date: June 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for total cross-section APPLgrids -******************************************************************************************** -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NRM_ATLASZPT7TEV_TOT.dat b/nnpdfcpp/data/NLOCFAC/CF_NRM_ATLASZPT7TEV_TOT.dat deleted file mode 100644 index e4b0a5bbf6..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NRM_ATLASZPT7TEV_TOT.dat +++ /dev/null @@ -1,88 +0,0 @@ -******************************************************************************************* -SetName: ATLASZPT7TEV_TOT -Author: Maria Ubiali -Date: June 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for total cross-section APPLgrids -******************************************************************************************** -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 - 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NRM_ATLASZPT8TEVMDIST.dat b/nnpdfcpp/data/NLOCFAC/CF_NRM_ATLASZPT8TEVMDIST.dat deleted file mode 100644 index b976bda713..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NRM_ATLASZPT8TEVMDIST.dat +++ /dev/null @@ -1,74 +0,0 @@ -******************************************************************************************* -SetName: ATLASZPT8TEVMDIST -Author: Maria Ubiali -Date: June 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for APPLgrids: (pT bin width)/ (total pT bin width = 855 bin1,2,3 or 900) / (total Y bin width = 4.8) -Where does the Mll width go? -******************************************************************************************** 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NRM_CMSZDIFF12.dat b/nnpdfcpp/data/NLOCFAC/CF_NRM_CMSZDIFF12.dat deleted file mode 100644 index 5f80c1b125..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NRM_CMSZDIFF12.dat +++ /dev/null @@ -1,59 +0,0 @@ -******************************************************************************************* -SetName: CMSZDIFF12 -Author: Maria Ubiali -Date: June 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for total cross-section APPLgrids -******************************************************************************************** -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NRM_LHCBWZMU7TEV.dat b/nnpdfcpp/data/NLOCFAC/CF_NRM_LHCBWZMU7TEV.dat deleted file mode 100644 index b173c7e9bc..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NRM_LHCBWZMU7TEV.dat +++ /dev/null @@ -1,42 +0,0 @@ -******************************************************************************************* -SetName: LHCBWZMU7TEV -Author: Nathan Hartland nathan.hartland@physics.ox.ac.uk -Date: 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for APPLgrid -******************************************************************************************** -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.500 0.00000 -0.500 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.500 0.00000 -0.500 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NRM_LHCBWZMU7TEV_PI.dat b/nnpdfcpp/data/NLOCFAC/CF_NRM_LHCBWZMU7TEV_PI.dat deleted file mode 100644 index b173c7e9bc..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NRM_LHCBWZMU7TEV_PI.dat +++ /dev/null @@ -1,42 +0,0 @@ -******************************************************************************************* -SetName: LHCBWZMU7TEV -Author: Nathan Hartland nathan.hartland@physics.ox.ac.uk -Date: 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for APPLgrid -******************************************************************************************** -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.500 0.00000 -0.500 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.500 0.00000 -0.500 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NRM_LHCBWZMU8TEV.dat b/nnpdfcpp/data/NLOCFAC/CF_NRM_LHCBWZMU8TEV.dat deleted file mode 100644 index b05577c1e8..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NRM_LHCBWZMU8TEV.dat +++ /dev/null @@ -1,43 +0,0 @@ -******************************************************************************************* -SetName: LHCBWZMU8TEV -Author: Nathan Hartland nathan.hartland@physics.ox.ac.uk -Date: 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for APPLgrid -******************************************************************************************** -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.500 0.00000 -0.500 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.500 0.00000 -0.500 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NRM_LHCBWZMU8TEV_PI.dat b/nnpdfcpp/data/NLOCFAC/CF_NRM_LHCBWZMU8TEV_PI.dat deleted file mode 100644 index b05577c1e8..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NRM_LHCBWZMU8TEV_PI.dat +++ /dev/null @@ -1,43 +0,0 @@ -******************************************************************************************* -SetName: LHCBWZMU8TEV -Author: Nathan Hartland nathan.hartland@physics.ox.ac.uk -Date: 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for APPLgrid -******************************************************************************************** -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.500 0.00000 -0.500 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.500 0.00000 -0.500 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NUCI_CHORUSNBPb.dat b/nnpdfcpp/data/NLOCFAC/CF_NUCI_CHORUSNBPb.dat deleted file mode 100644 index 7e7be4eebe..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NUCI_CHORUSNBPb.dat +++ /dev/null @@ -1,617 +0,0 @@ -******************************************************************************** -SetName: CHORUSNBPb_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.944878 0.00000 -0.925866 0.00000 -0.902828 0.00000 -0.000000 0.00000 -0.944491 0.00000 -0.937222 0.00000 -0.926841 0.00000 -0.912972 0.00000 -0.932401 0.00000 -0.939636 0.00000 -0.944758 0.00000 -0.950005 0.00000 -0.956799 0.00000 -0.935616 0.00000 -0.951374 0.00000 -0.970436 0.00000 -0.997284 0.00000 -1.038680 0.00000 -0.956538 0.00000 -0.982714 0.00000 -1.021170 0.00000 -1.082860 0.00000 -1.001280 0.00000 -1.042570 0.00000 -1.103830 0.00000 -1.203720 0.00000 -1.103350 0.00000 -1.169070 0.00000 -1.261280 0.00000 -1.281470 0.00000 -1.381890 0.00000 -1.514820 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.910125 0.00000 -0.889347 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.959284 0.00000 -0.946144 0.00000 -0.930367 0.00000 -0.911218 0.00000 -0.000000 0.00000 -0.955330 0.00000 -0.951537 0.00000 -0.945990 0.00000 -0.938372 0.00000 -0.928481 0.00000 -0.935877 0.00000 -0.946375 0.00000 -0.953138 0.00000 -0.959500 0.00000 -0.967503 0.00000 -0.978705 0.00000 -0.933447 0.00000 -0.949989 0.00000 -0.966496 0.00000 -0.987351 0.00000 -1.017500 0.00000 -1.064100 0.00000 -0.944520 0.00000 -0.965850 0.00000 -0.993829 0.00000 -1.034560 0.00000 -1.099320 0.00000 -1.210760 0.00000 -0.977019 0.00000 -1.008710 0.00000 -1.050520 0.00000 -1.112250 0.00000 -1.211990 0.00000 -1.064930 0.00000 -1.117760 0.00000 -1.181500 0.00000 -1.271680 0.00000 -1.412480 0.00000 -1.224170 0.00000 -1.309030 0.00000 -1.404390 0.00000 -1.532160 0.00000 -1.722210 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.802962 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.929205 0.00000 -0.913429 0.00000 -0.894309 0.00000 -0.872721 0.00000 -0.000000 0.00000 -0.969796 0.00000 -0.959835 0.00000 -0.948559 0.00000 -0.934731 0.00000 -0.917930 0.00000 -0.898856 0.00000 -0.960341 0.00000 -0.958984 0.00000 -0.956049 0.00000 -0.951780 0.00000 -0.946046 0.00000 -0.938674 0.00000 -0.930066 0.00000 -0.945000 0.00000 -0.954021 0.00000 -0.960644 0.00000 -0.968116 0.00000 -0.977959 0.00000 -0.991939 0.00000 -1.011370 0.00000 -0.942460 0.00000 -0.958487 0.00000 -0.975154 0.00000 -0.997006 0.00000 -1.029070 0.00000 -1.078730 0.00000 -1.155090 0.00000 -0.950004 0.00000 -0.972226 0.00000 -1.001010 0.00000 -1.042850 0.00000 -1.109280 0.00000 -1.222760 0.00000 -0.982226 0.00000 -1.014220 0.00000 -1.056390 0.00000 -1.118450 0.00000 -1.218240 0.00000 -1.394310 0.00000 -1.076080 0.00000 -1.127060 0.00000 -1.189790 0.00000 -1.278970 0.00000 -1.419760 0.00000 -1.651330 0.00000 -1.245690 0.00000 -1.325860 0.00000 -1.418260 0.00000 -1.544840 0.00000 -1.727890 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.846325 0.00000 -0.830022 0.00000 -0.811031 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.943119 0.00000 -0.931248 0.00000 -0.916299 0.00000 -0.898361 0.00000 -0.878450 0.00000 -0.000000 0.00000 -0.969616 0.00000 -0.961078 0.00000 -0.950994 0.00000 -0.938477 0.00000 -0.923283 0.00000 -0.906190 0.00000 -0.962742 0.00000 -0.961604 0.00000 -0.959366 0.00000 -0.956122 0.00000 -0.951737 0.00000 -0.946159 0.00000 -0.939766 0.00000 -0.950752 0.00000 -0.958785 0.00000 -0.965643 0.00000 -0.973860 0.00000 -0.985075 0.00000 -1.001050 0.00000 -1.023000 0.00000 -0.948607 0.00000 -0.963911 0.00000 -0.980728 0.00000 -1.003300 0.00000 -1.036720 0.00000 -1.088360 0.00000 -1.167270 0.00000 -0.954266 0.00000 -0.976818 0.00000 -1.005980 0.00000 -1.048530 0.00000 -1.115960 0.00000 -1.232350 0.00000 -1.436460 0.00000 -0.986347 0.00000 -1.018550 0.00000 -1.060940 0.00000 -1.123220 0.00000 -1.224370 0.00000 -1.397880 0.00000 -1.083990 0.00000 -1.133840 0.00000 -1.195960 0.00000 -1.285970 0.00000 -1.423760 0.00000 -1.652120 0.00000 -1.260480 0.00000 -1.337540 0.00000 -1.429580 0.00000 -1.552230 0.00000 -1.732420 0.00000 -2.006060 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.866005 0.00000 -0.853514 0.00000 -0.837791 0.00000 -0.820087 0.00000 -0.000000 0.00000 -0.953673 0.00000 -0.945165 0.00000 -0.933975 0.00000 -0.919937 0.00000 -0.903332 0.00000 -0.885206 0.00000 -0.977355 0.00000 -0.970325 0.00000 -0.963138 0.00000 -0.954244 0.00000 -0.943091 0.00000 -0.929574 0.00000 -0.914496 0.00000 -0.965157 0.00000 -0.964570 0.00000 -0.963153 0.00000 -0.961011 0.00000 -0.958106 0.00000 -0.954447 0.00000 -0.950381 0.00000 -0.956144 0.00000 -0.963446 0.00000 -0.970697 0.00000 -0.979877 0.00000 -0.992619 0.00000 -1.010690 0.00000 -1.035260 0.00000 -0.954583 0.00000 -0.969226 0.00000 -0.986194 0.00000 -1.009630 0.00000 -1.044480 0.00000 -1.099780 0.00000 -1.181900 0.00000 -0.959014 0.00000 -0.981634 0.00000 -1.011150 0.00000 -1.054260 0.00000 -1.123530 0.00000 -1.239930 0.00000 -1.444070 0.00000 -0.991238 0.00000 -1.023570 0.00000 -1.066130 0.00000 -1.129530 0.00000 -1.229610 0.00000 -1.402280 0.00000 -1.713890 0.00000 -1.092560 0.00000 -1.141370 0.00000 -1.204070 0.00000 -1.292030 0.00000 -1.428790 0.00000 -1.654210 0.00000 -1.275930 0.00000 -1.351470 0.00000 -1.439620 0.00000 -1.560500 0.00000 -1.737960 0.00000 -2.006170 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.881486 0.00000 -0.872751 0.00000 -0.860407 0.00000 -0.845442 0.00000 -0.829052 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.955584 0.00000 -0.947558 0.00000 -0.936952 0.00000 -0.923834 0.00000 -0.908532 0.00000 -0.892098 0.00000 -0.000000 0.00000 -0.977151 0.00000 -0.971824 0.00000 -0.965670 0.00000 -0.957807 0.00000 -0.947861 0.00000 -0.935880 0.00000 -0.922660 0.00000 -0.965879 0.00000 -0.967493 0.00000 -0.967477 0.00000 -0.966859 0.00000 -0.965763 0.00000 -0.964220 0.00000 -0.962323 0.00000 -0.960360 0.00000 -0.948179 0.00000 -0.960395 0.00000 -0.967491 0.00000 -0.975207 0.00000 -0.985314 0.00000 -0.999448 0.00000 -1.020550 0.00000 -1.047870 0.00000 -0.941448 0.00000 -0.959513 0.00000 -0.973603 0.00000 -0.990868 0.00000 -1.015040 0.00000 -1.051950 0.00000 -1.107940 0.00000 -1.192290 0.00000 -0.941791 0.00000 -0.963396 0.00000 -0.985922 0.00000 -1.015610 0.00000 -1.059800 0.00000 -1.129280 0.00000 -1.246530 0.00000 -1.450380 0.00000 -0.966169 0.00000 -0.996173 0.00000 -1.028520 0.00000 -1.071850 0.00000 -1.134570 0.00000 -1.234800 0.00000 -1.406860 0.00000 -1.714470 0.00000 -1.051430 0.00000 -1.100680 0.00000 -1.149640 0.00000 -1.210540 0.00000 -1.298170 0.00000 -1.434240 0.00000 -1.657490 0.00000 -2.026190 0.00000 -1.209510 0.00000 -1.289930 0.00000 -1.362420 0.00000 -1.449120 0.00000 -1.568590 0.00000 -1.743930 0.00000 -2.007840 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.737731 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.891243 0.00000 -0.886591 0.00000 -0.877641 0.00000 -0.865589 0.00000 -0.851317 0.00000 -0.000000 0.00000 -0.962472 0.00000 -0.957232 0.00000 -0.949553 0.00000 -0.939477 0.00000 -0.927100 0.00000 -0.912737 0.00000 -0.000000 0.00000 -0.977683 0.00000 -0.973305 0.00000 -0.967822 0.00000 -0.960653 0.00000 -0.951592 0.00000 -0.940680 0.00000 -0.967591 0.00000 -0.969251 0.00000 -0.969698 0.00000 -0.969655 0.00000 -0.969302 0.00000 -0.968742 0.00000 -0.968608 0.00000 -0.952734 0.00000 -0.963183 0.00000 -0.970218 0.00000 -0.978345 0.00000 -0.989133 0.00000 -1.004930 0.00000 -1.026570 0.00000 -0.946303 0.00000 -0.962634 0.00000 -0.976471 0.00000 -0.993964 0.00000 -1.019150 0.00000 -1.056400 0.00000 -1.113680 0.00000 -0.945212 0.00000 -0.966447 0.00000 -0.988854 0.00000 -1.019000 0.00000 -1.063150 0.00000 -1.133110 0.00000 -1.250950 0.00000 -0.970024 0.00000 -0.999943 0.00000 -1.032840 0.00000 -1.075480 0.00000 -1.138360 0.00000 -1.238730 0.00000 -1.410480 0.00000 -1.059100 0.00000 -1.106640 0.00000 -1.154780 0.00000 -1.215460 0.00000 -1.302940 0.00000 -1.438660 0.00000 -1.660620 0.00000 -1.223860 0.00000 -1.301090 0.00000 -1.370360 0.00000 -1.456140 0.00000 -1.574800 0.00000 -1.748820 0.00000 -2.009960 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.757137 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.895607 0.00000 -0.890478 0.00000 -0.881538 0.00000 -0.869813 0.00000 -0.000000 0.00000 -0.963693 0.00000 -0.958678 0.00000 -0.951293 0.00000 -0.941658 0.00000 -0.929840 0.00000 -0.983380 0.00000 -0.978421 0.00000 -0.974654 0.00000 -0.969642 0.00000 -0.963018 0.00000 -0.954604 0.00000 -0.968817 0.00000 -0.970682 0.00000 -0.971475 0.00000 -0.971862 0.00000 -0.972073 0.00000 -0.972592 0.00000 -0.955753 0.00000 -0.965170 0.00000 -0.972255 0.00000 -0.980696 0.00000 -0.992409 0.00000 -1.008480 0.00000 -0.949678 0.00000 -0.964804 0.00000 -0.978521 0.00000 -0.996481 0.00000 -1.021780 0.00000 -1.059710 0.00000 -0.947900 0.00000 -0.968705 0.00000 -0.991242 0.00000 -1.021220 0.00000 -1.065600 0.00000 -1.135960 0.00000 -0.973189 0.00000 -1.002940 0.00000 -1.035650 0.00000 -1.078340 0.00000 -1.141350 0.00000 -1.241880 0.00000 -1.064970 0.00000 -1.112280 0.00000 -1.158860 0.00000 -1.219410 0.00000 -1.306840 0.00000 -1.442380 0.00000 -1.234540 0.00000 -1.308320 0.00000 -1.376510 0.00000 -1.461700 0.00000 -1.579810 0.00000 -1.752970 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.901951 0.00000 -0.901821 0.00000 -0.896305 0.00000 -0.000000 0.00000 -0.965761 0.00000 -0.961118 0.00000 -0.954246 0.00000 -0.982705 0.00000 -0.979944 0.00000 -0.976928 0.00000 -0.972562 0.00000 -0.970614 0.00000 -0.972891 0.00000 -0.974167 0.00000 -0.975169 0.00000 -0.959530 0.00000 -0.967882 0.00000 -0.975132 0.00000 -0.984243 0.00000 -0.953980 0.00000 -0.967659 0.00000 -0.981443 0.00000 -0.999537 0.00000 -0.951840 0.00000 -0.971846 0.00000 -0.994170 0.00000 -1.024290 0.00000 -0.978128 0.00000 -1.007990 0.00000 -1.039880 0.00000 -1.082660 0.00000 -1.073610 0.00000 -1.118940 0.00000 -1.165060 0.00000 -1.225490 0.00000 -1.249690 0.00000 -1.318900 0.00000 -1.385690 0.00000 -1.470150 0.00000 - diff --git a/nnpdfcpp/data/NLOCFAC/CF_NUCI_CHORUSNUPb.dat b/nnpdfcpp/data/NLOCFAC/CF_NUCI_CHORUSNUPb.dat deleted file mode 100644 index 82bb6639f2..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NUCI_CHORUSNUPb.dat +++ /dev/null @@ -1,616 +0,0 @@ -******************************************************************************** -SetName: CHORUSNUPb_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01798 0.00000 -1.02156 0.00000 -1.02464 0.00000 -0.00000 0.00000 -1.01047 0.00000 -1.01361 0.00000 -1.01658 0.00000 -1.01903 0.00000 -0.98552 0.00000 -0.99022 0.00000 -0.99353 0.00000 -0.99620 0.00000 -0.99826 0.00000 -0.95688 0.00000 -0.96185 0.00000 -0.96532 0.00000 -0.96806 0.00000 -0.97016 0.00000 -0.90253 0.00000 -0.90816 0.00000 -0.91334 0.00000 -0.91780 0.00000 -0.83538 0.00000 -0.84357 0.00000 -0.85264 0.00000 -0.86096 0.00000 -0.80058 0.00000 -0.81504 0.00000 -0.82889 0.00000 -0.79579 0.00000 -0.82239 0.00000 -0.84490 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.99852 0.00000 -1.00263 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01150 0.00000 -1.01608 0.00000 -1.02018 0.00000 -1.02344 0.00000 -0.00000 0.00000 -1.00240 0.00000 -1.00585 0.00000 -1.00950 0.00000 -1.01280 0.00000 -1.01544 0.00000 -0.97763 0.00000 -0.98258 0.00000 -0.98598 0.00000 -0.98902 0.00000 -0.99167 0.00000 -0.99380 0.00000 -0.94937 0.00000 -0.95473 0.00000 -0.95818 0.00000 -0.96115 0.00000 -0.96374 0.00000 -0.96584 0.00000 -0.89454 0.00000 -0.89996 0.00000 -0.90544 0.00000 -0.91052 0.00000 -0.91497 0.00000 -0.91861 0.00000 -0.82270 0.00000 -0.83019 0.00000 -0.84057 0.00000 -0.85068 0.00000 -0.85956 0.00000 -0.78038 0.00000 -0.79521 0.00000 -0.81126 0.00000 -0.82625 0.00000 -0.83927 0.00000 -0.76628 0.00000 -0.79669 0.00000 -0.82280 0.00000 -0.84530 0.00000 -0.86460 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.94763 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.99526 0.00000 -1.00034 0.00000 -1.00395 0.00000 -1.00624 0.00000 -0.00000 0.00000 -1.00542 0.00000 -1.01060 0.00000 -1.01560 0.00000 -1.01978 0.00000 -1.02300 0.00000 -1.02521 0.00000 -0.99664 0.00000 -0.99932 0.00000 -1.00330 0.00000 -1.00726 0.00000 -1.01067 0.00000 -1.01338 0.00000 -1.01526 0.00000 -0.97629 0.00000 -0.97975 0.00000 -0.98294 0.00000 -0.98602 0.00000 -0.98875 0.00000 -0.99095 0.00000 -0.99250 0.00000 -0.94860 0.00000 -0.95218 0.00000 -0.95519 0.00000 -0.95811 0.00000 -0.96075 0.00000 -0.96292 0.00000 -0.96449 0.00000 -0.89249 0.00000 -0.89784 0.00000 -0.90325 0.00000 -0.90837 0.00000 -0.91290 0.00000 -0.91661 0.00000 -0.81784 0.00000 -0.82777 0.00000 -0.83911 0.00000 -0.84967 0.00000 -0.85880 0.00000 -0.86605 0.00000 -0.77574 0.00000 -0.79224 0.00000 -0.80935 0.00000 -0.82508 0.00000 -0.83868 0.00000 -0.84952 0.00000 -0.76704 0.00000 -0.79677 0.00000 -0.82294 0.00000 -0.84608 0.00000 -0.86502 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.94152 0.00000 -0.94652 0.00000 -0.94956 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.99064 0.00000 -0.99691 0.00000 -1.00154 0.00000 -1.00483 0.00000 -1.00691 0.00000 -0.00000 0.00000 -1.00475 0.00000 -1.01044 0.00000 -1.01549 0.00000 -1.01962 0.00000 -1.02278 0.00000 -1.02493 0.00000 -0.99394 0.00000 -0.99742 0.00000 -1.00175 0.00000 -1.00580 0.00000 -1.00926 0.00000 -1.01198 0.00000 -1.01388 0.00000 -0.97452 0.00000 -0.97750 0.00000 -0.98074 0.00000 -0.98391 0.00000 -0.98671 0.00000 -0.98896 0.00000 -0.99055 0.00000 -0.94712 0.00000 -0.94988 0.00000 -0.95283 0.00000 -0.95581 0.00000 -0.95855 0.00000 -0.96081 0.00000 -0.96245 0.00000 -0.89085 0.00000 -0.89605 0.00000 -0.90148 0.00000 -0.90669 0.00000 -0.91131 0.00000 -0.91477 0.00000 -0.91763 0.00000 -0.81508 0.00000 -0.82637 0.00000 -0.83819 0.00000 -0.84899 0.00000 -0.85812 0.00000 -0.86565 0.00000 -0.77269 0.00000 -0.79048 0.00000 -0.80832 0.00000 -0.82456 0.00000 -0.83831 0.00000 -0.84935 0.00000 -0.76717 0.00000 -0.79675 0.00000 -0.82353 0.00000 -0.84637 0.00000 -0.86549 0.00000 -0.88072 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.93901 0.00000 -0.94516 0.00000 -0.94922 0.00000 -0.95164 0.00000 -0.00000 0.00000 -0.98521 0.00000 -0.99292 0.00000 -0.99859 0.00000 -1.00280 0.00000 -1.00581 0.00000 -1.00772 0.00000 -0.99852 0.00000 -1.00461 0.00000 -1.01054 0.00000 -1.01552 0.00000 -1.01954 0.00000 -1.02259 0.00000 -1.02468 0.00000 -0.99146 0.00000 -0.99568 0.00000 -1.00025 0.00000 -1.00437 0.00000 -1.00782 0.00000 -1.01053 0.00000 -1.01242 0.00000 -0.97210 0.00000 -0.97501 0.00000 -0.97838 0.00000 -0.98164 0.00000 -0.98451 0.00000 -0.98682 0.00000 -0.98846 0.00000 -0.94470 0.00000 -0.94711 0.00000 -0.95014 0.00000 -0.95327 0.00000 -0.95614 0.00000 -0.95812 0.00000 -0.95988 0.00000 -0.88870 0.00000 -0.89381 0.00000 -0.89937 0.00000 -0.90473 0.00000 -0.90918 0.00000 -0.91316 0.00000 -0.91610 0.00000 -0.81270 0.00000 -0.82501 0.00000 -0.83723 0.00000 -0.84811 0.00000 -0.85759 0.00000 -0.86521 0.00000 -0.87082 0.00000 -0.76984 0.00000 -0.78892 0.00000 -0.80753 0.00000 -0.82408 0.00000 -0.83811 0.00000 -0.84933 0.00000 -0.76705 0.00000 -0.79720 0.00000 -0.82376 0.00000 -0.84686 0.00000 -0.86622 0.00000 -0.88164 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.93566 0.00000 -0.94321 0.00000 -0.94835 0.00000 -0.95178 0.00000 -0.95378 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.98798 0.00000 -0.99493 0.00000 -1.00008 0.00000 -1.00397 0.00000 -1.00682 0.00000 -1.00865 0.00000 -0.00000 0.00000 -0.99815 0.00000 -1.00496 0.00000 -1.01082 0.00000 -1.01565 0.00000 -1.01953 0.00000 -1.02248 0.00000 -1.02451 0.00000 -0.98804 0.00000 -0.98960 0.00000 -0.99436 0.00000 -0.99901 0.00000 -1.00311 0.00000 -1.00654 0.00000 -1.00922 0.00000 -1.01111 0.00000 -0.96793 0.00000 -0.96962 0.00000 -0.97269 0.00000 -0.97619 0.00000 -0.97954 0.00000 -0.98247 0.00000 -0.98451 0.00000 -0.98623 0.00000 -0.94068 0.00000 -0.94193 0.00000 -0.94434 0.00000 -0.94755 0.00000 -0.95085 0.00000 -0.95350 0.00000 -0.95604 0.00000 -0.95788 0.00000 -0.88304 0.00000 -0.88627 0.00000 -0.89148 0.00000 -0.89725 0.00000 -0.90251 0.00000 -0.90751 0.00000 -0.91160 0.00000 -0.91462 0.00000 -0.80186 0.00000 -0.81082 0.00000 -0.82381 0.00000 -0.83616 0.00000 -0.84746 0.00000 -0.85706 0.00000 -0.86476 0.00000 -0.87042 0.00000 -0.75142 0.00000 -0.76763 0.00000 -0.78786 0.00000 -0.80696 0.00000 -0.82385 0.00000 -0.83810 0.00000 -0.84948 0.00000 -0.85783 0.00000 -0.73404 0.00000 -0.76695 0.00000 -0.79733 0.00000 -0.82422 0.00000 -0.84759 0.00000 -0.86719 0.00000 -0.88280 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.85430 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.92941 0.00000 -0.93946 0.00000 -0.94608 0.00000 -0.95067 0.00000 -0.95375 0.00000 -0.00000 0.00000 -0.98054 0.00000 -0.98986 0.00000 -0.99631 0.00000 -1.00118 0.00000 -1.00494 0.00000 -1.00767 0.00000 -0.00000 0.00000 -0.99843 0.00000 -1.00534 0.00000 -1.01107 0.00000 -1.01576 0.00000 -1.01953 0.00000 -1.02241 0.00000 -0.98564 0.00000 -0.98855 0.00000 -0.99351 0.00000 -0.99817 0.00000 -1.00223 0.00000 -1.00562 0.00000 -1.00805 0.00000 -0.96646 0.00000 -0.96779 0.00000 -0.97103 0.00000 -0.97462 0.00000 -0.97803 0.00000 -0.98071 0.00000 -0.98314 0.00000 -0.93937 0.00000 -0.93970 0.00000 -0.94225 0.00000 -0.94564 0.00000 -0.94873 0.00000 -0.95191 0.00000 -0.95452 0.00000 -0.88130 0.00000 -0.88428 0.00000 -0.88967 0.00000 -0.89529 0.00000 -0.90113 0.00000 -0.90625 0.00000 -0.91043 0.00000 -0.79887 0.00000 -0.80957 0.00000 -0.82268 0.00000 -0.83553 0.00000 -0.84696 0.00000 -0.85665 0.00000 -0.86442 0.00000 -0.74822 0.00000 -0.76637 0.00000 -0.78725 0.00000 -0.80669 0.00000 -0.82378 0.00000 -0.83818 0.00000 -0.84967 0.00000 -0.73405 0.00000 -0.76726 0.00000 -0.79758 0.00000 -0.82473 0.00000 -0.84831 0.00000 -0.86807 0.00000 -0.88381 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.85213 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.93324 0.00000 -0.94223 0.00000 -0.94829 0.00000 -0.95254 0.00000 -0.00000 0.00000 -0.98257 0.00000 -0.99126 0.00000 -0.99737 0.00000 -1.00209 0.00000 -1.00572 0.00000 -0.99161 0.00000 -0.99883 0.00000 -1.00570 0.00000 -1.01129 0.00000 -1.01586 0.00000 -1.01954 0.00000 -0.98409 0.00000 -0.98786 0.00000 -0.99290 0.00000 -0.99753 0.00000 -1.00156 0.00000 -1.00470 0.00000 -0.96502 0.00000 -0.96639 0.00000 -0.96976 0.00000 -0.97341 0.00000 -0.97656 0.00000 -0.97961 0.00000 -0.93785 0.00000 -0.93789 0.00000 -0.94062 0.00000 -0.94376 0.00000 -0.94740 0.00000 -0.95066 0.00000 -0.87972 0.00000 -0.88262 0.00000 -0.88776 0.00000 -0.89407 0.00000 -0.90003 0.00000 -0.90525 0.00000 -0.79696 0.00000 -0.80863 0.00000 -0.82205 0.00000 -0.83503 0.00000 -0.84655 0.00000 -0.85632 0.00000 -0.74603 0.00000 -0.76553 0.00000 -0.78688 0.00000 -0.80655 0.00000 -0.82380 0.00000 -0.83831 0.00000 -0.73393 0.00000 -0.76730 0.00000 -0.79789 0.00000 -0.82525 0.00000 -0.84900 0.00000 -0.86888 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.92558 0.00000 -0.93843 0.00000 -0.94622 0.00000 -0.00000 0.00000 -0.98540 0.00000 -0.99326 0.00000 -0.99902 0.00000 -0.99129 0.00000 -0.99960 0.00000 -1.00624 0.00000 -1.01160 0.00000 -0.98231 0.00000 -0.98698 0.00000 -0.99204 0.00000 -0.99660 0.00000 -0.96265 0.00000 -0.96435 0.00000 -0.96787 0.00000 -0.97133 0.00000 -0.93502 0.00000 -0.93512 0.00000 -0.93775 0.00000 -0.94163 0.00000 -0.87702 0.00000 -0.88003 0.00000 -0.88564 0.00000 -0.89220 0.00000 -0.79454 0.00000 -0.80694 0.00000 -0.82106 0.00000 -0.83424 0.00000 -0.74332 0.00000 -0.76456 0.00000 -0.78648 0.00000 -0.80646 0.00000 -0.73369 0.00000 -0.76755 0.00000 -0.79857 0.00000 -0.82624 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NUCI_DYE605.dat b/nnpdfcpp/data/NLOCFAC/CF_NUCI_DYE605.dat deleted file mode 100644 index 0636103888..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NUCI_DYE605.dat +++ /dev/null @@ -1,128 +0,0 @@ -******************************************************************************** -SetName: DYE605_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -1.02516 0.00000 -1.03735 0.00000 -1.05080 0.00000 -1.06537 0.00000 -1.08208 0.00000 -1.10033 0.00000 -1.12037 0.00000 -1.14199 0.00000 -1.16618 0.00000 -1.19291 0.00000 -1.48633 0.00000 -1.53430 0.00000 -1.58518 0.00000 -1.69394 0.00000 -1.93774 0.00000 -2.34739 0.00000 -2.86905 0.00000 -1.02039 0.00000 -1.03169 0.00000 -1.04463 0.00000 -1.05885 0.00000 -1.07521 0.00000 -1.09326 0.00000 -1.11384 0.00000 -1.13596 0.00000 -1.16107 0.00000 -1.18941 0.00000 -1.52016 0.00000 -1.57510 0.00000 -1.63875 0.00000 -1.77110 0.00000 -2.08294 0.00000 -2.64350 0.00000 -3.38002 0.00000 -3.91444 0.00000 -1.02093 0.00000 -1.03191 0.00000 -1.04458 0.00000 -1.05866 0.00000 -1.07474 0.00000 -1.09270 0.00000 -1.11361 0.00000 -1.13554 0.00000 -1.16099 0.00000 -1.18996 0.00000 -1.53351 0.00000 -1.59223 0.00000 -1.66125 0.00000 -1.80491 0.00000 -2.15155 0.00000 -2.80895 0.00000 -3.75998 0.00000 -4.52929 0.00000 -1.02738 0.00000 -1.03874 0.00000 -1.05173 0.00000 -1.06600 0.00000 -1.08240 0.00000 -1.10046 0.00000 -1.12107 0.00000 -1.14328 0.00000 -1.16840 0.00000 -1.19675 0.00000 -1.53202 0.00000 -1.58889 0.00000 -1.65507 0.00000 -1.79417 0.00000 -2.13238 0.00000 -2.79281 0.00000 -3.83659 0.00000 -4.84716 0.00000 -1.03899 0.00000 -1.05136 0.00000 -1.06501 0.00000 -1.07984 0.00000 -1.09680 0.00000 -1.11533 0.00000 -1.13576 0.00000 -1.15787 0.00000 -1.18262 0.00000 -1.21000 0.00000 -1.52229 0.00000 -1.57538 0.00000 -1.63297 0.00000 -1.75861 0.00000 -2.05852 0.00000 -2.63891 0.00000 -3.59482 0.00000 -4.65591 0.00000 -1.05418 0.00000 -1.06754 0.00000 -1.08207 0.00000 -1.09780 0.00000 -1.11509 0.00000 -1.13388 0.00000 -1.15475 0.00000 -1.17608 0.00000 -1.20030 0.00000 -1.22640 0.00000 -1.51100 0.00000 -1.55804 0.00000 -1.60968 0.00000 -1.71746 0.00000 -1.97439 0.00000 -2.46396 0.00000 -3.25020 0.00000 -4.06964 0.00000 -1.17358 0.00000 -1.19552 0.00000 -1.21817 0.00000 -1.24325 0.00000 -1.50455 0.00000 -1.54896 0.00000 -1.59131 0.00000 -1.68797 0.00000 -1.90819 0.00000 -2.31425 0.00000 -2.90654 0.00000 -3.43485 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NUCI_EMCF2C.dat b/nnpdfcpp/data/NLOCFAC/CF_NUCI_EMCF2C.dat deleted file mode 100644 index 1673b220c5..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NUCI_EMCF2C.dat +++ /dev/null @@ -1,30 +0,0 @@ -******************************************************************************** -SetName: EMCF2C_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.77041 0.00000 -0.00000 0.00000 -2.93464 0.00000 -1.40915 0.00000 --2.5422 0.00000 -1.59855 0.00000 -1.24851 0.00000 -0.69964 0.00000 -1.01968 0.00000 -1.07151 0.00000 -0.21282 0.00000 -0.50069 0.00000 -0.66773 0.00000 -0.05176 0.00000 -0.16189 0.00000 -0.24895 0.00000 -0.01126 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NUCI_NTVNBDMNFe.dat b/nnpdfcpp/data/NLOCFAC/CF_NUCI_NTVNBDMNFe.dat deleted file mode 100644 index 8b63f518cd..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NUCI_NTVNBDMNFe.dat +++ /dev/null @@ -1,54 +0,0 @@ -******************************************************************************** -SetName: NTVNBDMNFe_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -1.08447 0.00000 -1.10474 0.00000 -1.00141 0.00000 -0.00000 0.00000 -0.95314 0.00000 -1.03941 0.00000 -1.11040 0.00000 -1.16431 0.00000 -0.00000 0.00000 -0.92603 0.00000 -1.01702 0.00000 -1.11188 0.00000 -1.24951 0.00000 -0.00000 0.00000 -0.96207 0.00000 -1.04574 0.00000 -1.09871 0.00000 -1.06599 0.00000 -0.00000 0.00000 -0.93073 0.00000 -1.02115 0.00000 -1.10861 0.00000 -1.18929 0.00000 -0.00000 0.00000 -0.91481 0.00000 -1.00840 0.00000 -1.11318 0.00000 -1.25942 0.00000 -0.00000 0.00000 -0.94820 0.00000 -1.03360 0.00000 -1.09892 0.00000 -1.09178 0.00000 -0.83160 0.00000 -0.92835 0.00000 -1.01844 0.00000 -1.11166 0.00000 -1.19936 0.00000 -0.82021 0.00000 -0.91675 0.00000 -1.00966 0.00000 -1.11763 0.00000 -1.26349 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NUCI_NTVNUDMNFe.dat b/nnpdfcpp/data/NLOCFAC/CF_NUCI_NTVNUDMNFe.dat deleted file mode 100644 index 19700b0639..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NUCI_NTVNUDMNFe.dat +++ /dev/null @@ -1,54 +0,0 @@ -******************************************************************************** -SetName: NTVNUDMNFe_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.81577 0.00000 -0.74612 0.00000 -0.73276 0.00000 -0.00000 0.00000 -0.86404 0.00000 -0.84077 0.00000 -0.78843 0.00000 -0.79038 0.00000 -0.00000 0.00000 -0.85626 0.00000 -0.84308 0.00000 -0.80512 0.00000 -0.82069 0.00000 -0.00000 0.00000 -0.88681 0.00000 -0.85878 0.00000 -0.78680 0.00000 -0.75078 0.00000 -0.82719 0.00000 -0.88204 0.00000 -0.86924 0.00000 -0.81698 0.00000 -0.79878 0.00000 -0.81497 0.00000 -0.87265 0.00000 -0.86766 0.00000 -0.82870 0.00000 -0.82563 0.00000 -0.00000 0.00000 -0.89568 0.00000 -0.87323 0.00000 -0.80210 0.00000 -0.75655 0.00000 -0.83195 0.00000 -0.88890 0.00000 -0.87941 0.00000 -0.82764 0.00000 -0.80169 0.00000 -0.82104 0.00000 -0.87973 0.00000 -0.87696 0.00000 -0.83760 0.00000 -0.82746 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NUC_CHORUSNBPb.dat b/nnpdfcpp/data/NLOCFAC/CF_NUC_CHORUSNBPb.dat deleted file mode 100644 index 4b0796b9b3..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NUC_CHORUSNBPb.dat +++ /dev/null @@ -1,616 +0,0 @@ -******************************************************************************** -SetName: CHORUSNBPb_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.948603 0.00000 -0.930946 0.00000 -0.906397 0.00000 -0.00000 0.00000 -0.940013 0.00000 -0.927882 0.00000 -0.91504 0.00000 -0.902543 0.00000 -0.944419 0.00000 -0.926325 0.00000 -0.926899 0.00000 -0.93689 0.00000 -0.943616 0.00000 -0.934657 0.00000 -0.952562 0.00000 -0.95968 0.00000 -0.962898 0.00000 -0.972215 0.00000 -0.972763 0.00000 -0.992554 0.00000 -1.02007 0.00000 -1.07074 0.00000 -1.0088 0.00000 -1.05907 0.00000 -1.1272 0.00000 -1.2416 0.00000 -1.14645 0.00000 -1.22708 0.00000 -1.35309 0.00000 -1.31384 0.00000 -1.44284 0.00000 -1.65241 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.901478 0.00000 -0.873831 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.963084 0.00000 -0.948769 0.00000 -0.930071 0.00000 -0.907916 0.00000 -0.00000 0.00000 -0.951165 0.00000 -0.9433 0.00000 -0.938884 0.00000 -0.932703 0.00000 -0.924053 0.00000 -0.949953 0.00000 -0.936863 0.00000 -0.945344 0.00000 -0.955994 0.00000 -0.957876 0.00000 -0.959381 0.00000 -0.933576 0.00000 -0.951518 0.00000 -0.953544 0.00000 -0.956097 0.00000 -0.967115 0.00000 -0.992014 0.00000 -0.961888 0.00000 -0.976691 0.00000 -0.995913 0.00000 -1.03259 0.00000 -1.0942 0.00000 -1.20291 0.00000 -0.982795 0.00000 -1.02486 0.00000 -1.07292 0.00000 -1.14573 0.00000 -1.26437 0.00000 -1.09732 0.00000 -1.1594 0.00000 -1.24685 0.00000 -1.38448 0.00000 -1.61957 0.00000 -1.2465 0.00000 -1.34723 0.00000 -1.49801 0.00000 -1.71891 0.00000 -2.06806 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.821824 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.923045 0.00000 -0.901677 0.00000 -0.877688 0.00000 -0.853135 0.00000 -0.00000 0.00000 -0.973311 0.00000 -0.962043 0.00000 -0.947647 0.00000 -0.93121 0.00000 -0.912929 0.00000 -0.893392 0.00000 -0.956276 0.00000 -0.951953 0.00000 -0.950497 0.00000 -0.948006 0.00000 -0.943232 0.00000 -0.936052 0.00000 -0.92712 0.00000 -0.946263 0.00000 -0.948202 0.00000 -0.959966 0.00000 -0.962055 0.00000 -0.964243 0.00000 -0.966056 0.00000 -0.973163 0.00000 -0.944994 0.00000 -0.951055 0.00000 -0.951785 0.00000 -0.962017 0.00000 -0.983126 0.00000 -1.01528 0.00000 -1.06147 0.00000 -0.966127 0.00000 -0.978025 0.00000 -1.00356 0.00000 -1.04475 0.00000 -1.11183 0.00000 -1.22082 0.00000 -0.99539 0.00000 -1.03348 0.00000 -1.08412 0.00000 -1.15789 0.00000 -1.27756 0.00000 -1.49464 0.00000 -1.10839 0.00000 -1.17242 0.00000 -1.26502 0.00000 -1.40505 0.00000 -1.64401 0.00000 -2.10069 0.00000 -1.26406 0.00000 -1.37946 0.00000 -1.52822 0.00000 -1.73125 0.00000 -2.06154 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.862212 0.00000 -0.851577 0.00000 -0.840614 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.940469 0.00000 -0.923333 0.00000 -0.904106 0.00000 -0.883917 0.00000 -0.863261 0.00000 -0.00000 0.00000 -0.97254 0.00000 -0.960905 0.00000 -0.948244 0.00000 -0.934608 0.00000 -0.919184 0.00000 -0.901688 0.00000 -0.958641 0.00000 -0.955919 0.00000 -0.956091 0.00000 -0.954071 0.00000 -0.949983 0.00000 -0.943943 0.00000 -0.936535 0.00000 -0.94405 0.00000 -0.960233 0.00000 -0.963204 0.00000 -0.965276 0.00000 -0.967912 0.00000 -0.974618 0.00000 -0.984277 0.00000 -0.950519 0.00000 -0.949 0.00000 -0.955283 0.00000 -0.971976 0.00000 -0.995313 0.00000 -1.02938 0.00000 -1.08075 0.00000 -0.965673 0.00000 -0.98175 0.00000 -1.01033 0.00000 -1.054 0.00000 -1.11836 0.00000 -1.22968 0.00000 -1.41971 0.00000 -1.00219 0.00000 -1.04113 0.00000 -1.09189 0.00000 -1.16566 0.00000 -1.28655 0.00000 -1.4998 0.00000 -1.11569 0.00000 -1.18487 0.00000 -1.27808 0.00000 -1.41952 0.00000 -1.65589 0.00000 -2.11045 0.00000 -1.28416 0.00000 -1.40273 0.00000 -1.53865 0.00000 -1.7337 0.00000 -2.04939 0.00000 -2.60565 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.882894 0.00000 -0.877882 0.00000 -0.871204 0.00000 -0.852478 0.00000 -0.00000 0.00000 -0.954223 0.00000 -0.940573 0.00000 -0.926367 0.00000 -0.911239 0.00000 -0.894247 0.00000 -0.875331 0.00000 -0.980798 0.00000 -0.971013 0.00000 -0.961147 0.00000 -0.951594 0.00000 -0.940353 0.00000 -0.926214 0.00000 -0.910522 0.00000 -0.959091 0.00000 -0.96148 0.00000 -0.961702 0.00000 -0.959926 0.00000 -0.956522 0.00000 -0.951791 0.00000 -0.946144 0.00000 -0.954158 0.00000 -0.963818 0.00000 -0.965801 0.00000 -0.968904 0.00000 -0.975033 0.00000 -0.984084 0.00000 -0.996852 0.00000 -0.948329 0.00000 -0.950597 0.00000 -0.964295 0.00000 -0.982006 0.00000 -1.00707 0.00000 -1.04656 0.00000 -1.10408 0.00000 -0.966408 0.00000 -0.987419 0.00000 -1.01806 0.00000 -1.05844 0.00000 -1.1241 0.00000 -1.23264 0.00000 -1.41998 0.00000 -1.00953 0.00000 -1.04922 0.00000 -1.09948 0.00000 -1.17383 0.00000 -1.29289 0.00000 -1.50537 0.00000 -1.91402 0.00000 -1.12745 0.00000 -1.19828 0.00000 -1.29204 0.00000 -1.43115 0.00000 -1.66737 0.00000 -2.11967 0.00000 -1.31046 0.00000 -1.41788 0.00000 -1.54463 0.00000 -1.73037 0.00000 -2.02917 0.00000 -2.55469 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.899099 0.00000 -0.899173 0.00000 -0.889885 0.00000 -0.872017 0.00000 -0.852214 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.953987 0.00000 -0.943529 0.00000 -0.93276 0.00000 -0.919749 0.00000 -0.902293 0.00000 -0.883913 0.00000 -0.00000 0.00000 -0.979523 0.00000 -0.970761 0.00000 -0.964082 0.00000 -0.956162 0.00000 -0.945688 0.00000 -0.933107 0.00000 -0.919327 0.00000 -0.962212 0.00000 -0.963546 0.00000 -0.966228 0.00000 -0.966215 0.00000 -0.964721 0.00000 -0.962164 0.00000 -0.958663 0.00000 -0.954738 0.00000 -0.950738 0.00000 -0.963279 0.00000 -0.965896 0.00000 -0.968667 0.00000 -0.974116 0.00000 -0.981974 0.00000 -0.993863 0.00000 -1.00912 0.00000 -0.944521 0.00000 -0.946732 0.00000 -0.957273 0.00000 -0.97184 0.00000 -0.990734 0.00000 -1.01912 0.00000 -1.05978 0.00000 -1.11764 0.00000 -0.958693 0.00000 -0.970202 0.00000 -0.993423 0.00000 -1.02093 0.00000 -1.0622 0.00000 -1.12666 0.00000 -1.2344 0.00000 -1.41856 0.00000 -0.979113 0.00000 -1.01747 0.00000 -1.05626 0.00000 -1.10637 0.00000 -1.17936 0.00000 -1.29886 0.00000 -1.51159 0.00000 -1.91639 0.00000 -1.07738 0.00000 -1.14034 0.00000 -1.21103 0.00000 -1.30209 0.00000 -1.44117 0.00000 -1.6771 0.00000 -2.1256 0.00000 -3.0956 0.00000 -1.21955 0.00000 -1.33094 0.00000 -1.42534 0.00000 -1.54566 0.00000 -1.72345 0.00000 -2.01635 0.00000 -2.52653 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.698014 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.907598 0.00000 -0.911093 0.00000 -0.905125 0.00000 -0.889193 0.00000 -0.870739 0.00000 -0.00000 0.00000 -0.964504 0.00000 -0.955289 0.00000 -0.947961 0.00000 -0.938272 0.00000 -0.923896 0.00000 -0.907453 0.00000 -0.00000 0.00000 -0.978373 0.00000 -0.972197 0.00000 -0.966951 0.00000 -0.959422 0.00000 -0.949867 0.00000 -0.938389 0.00000 -0.96393 0.00000 -0.967054 0.00000 -0.969216 0.00000 -0.969107 0.00000 -0.967981 0.00000 -0.966069 0.00000 -0.964133 0.00000 -0.948545 0.00000 -0.964907 0.00000 -0.96698 0.00000 -0.971664 0.00000 -0.978067 0.00000 -0.987366 0.00000 -0.999869 0.00000 -0.948834 0.00000 -0.948686 0.00000 -0.962332 0.00000 -0.977009 0.00000 -0.997579 0.00000 -1.02553 0.00000 -1.06637 0.00000 -0.957804 0.00000 -0.973727 0.00000 -0.995599 0.00000 -1.02309 0.00000 -1.06359 0.00000 -1.12781 0.00000 -1.23534 0.00000 -0.985206 0.00000 -1.023 0.00000 -1.06133 0.00000 -1.11019 0.00000 -1.18356 0.00000 -1.30356 0.00000 -1.51639 0.00000 -1.08422 0.00000 -1.14965 0.00000 -1.21834 0.00000 -1.30903 0.00000 -1.44799 0.00000 -1.68345 0.00000 -2.12932 0.00000 -1.2368 0.00000 -1.3404 0.00000 -1.42879 0.00000 -1.54482 0.00000 -1.72254 0.00000 -2.01051 0.00000 -2.50592 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.722875 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.915655 0.00000 -0.917754 0.00000 -0.904364 0.00000 -0.887862 0.00000 -0.00000 0.00000 -0.964603 0.00000 -0.958092 0.00000 -0.952093 0.00000 -0.941033 0.00000 -0.927229 0.00000 -0.986733 0.00000 -0.978129 0.00000 -0.974179 0.00000 -0.9691 0.00000 -0.962134 0.00000 -0.953248 0.00000 -0.963456 0.00000 -0.969582 0.00000 -0.971253 0.00000 -0.971201 0.00000 -0.970381 0.00000 -0.969453 0.00000 -0.953859 0.00000 -0.965908 0.00000 -0.968886 0.00000 -0.974078 0.00000 -0.981273 0.00000 -0.99088 0.00000 -0.947562 0.00000 -0.952363 0.00000 -0.965711 0.00000 -0.981305 0.00000 -1.00136 0.00000 -1.02929 0.00000 -0.957689 0.00000 -0.976638 0.00000 -0.997121 0.00000 -1.02398 0.00000 -1.06439 0.00000 -1.12874 0.00000 -0.989618 0.00000 -1.0271 0.00000 -1.0643 0.00000 -1.11321 0.00000 -1.18692 0.00000 -1.30728 0.00000 -1.09104 0.00000 -1.15733 0.00000 -1.22371 0.00000 -1.31418 0.00000 -1.45297 0.00000 -1.68808 0.00000 -1.25167 0.00000 -1.34564 0.00000 -1.43012 0.00000 -1.54582 0.00000 -1.72242 0.00000 -2.00595 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.918866 0.00000 -0.928296 0.00000 -0.916925 0.00000 -0.00000 0.00000 -0.966479 0.00000 -0.963885 0.00000 -0.956083 0.00000 -0.98554 0.00000 -0.979571 0.00000 -0.977033 0.00000 -0.972522 0.00000 -0.966715 0.00000 -0.972761 0.00000 -0.973961 0.00000 -0.974148 0.00000 -0.963573 0.00000 -0.966972 0.00000 -0.971738 0.00000 -0.97765 0.00000 -0.945358 0.00000 -0.957698 0.00000 -0.970908 0.00000 -0.985988 0.00000 -0.959856 0.00000 -0.978901 0.00000 -0.998146 0.00000 -1.02497 0.00000 -0.997215 0.00000 -1.03278 0.00000 -1.06865 0.00000 -1.11785 0.00000 -1.1036 0.00000 -1.16602 0.00000 -1.23136 0.00000 -1.32141 0.00000 -1.2736 0.00000 -1.35132 0.00000 -1.43272 0.00000 -1.5488 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NUC_CHORUSNUPb.dat b/nnpdfcpp/data/NLOCFAC/CF_NUC_CHORUSNUPb.dat deleted file mode 100644 index aa403964c4..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NUC_CHORUSNUPb.dat +++ /dev/null @@ -1,616 +0,0 @@ -******************************************************************************** -SetName: CHORUSNUPb_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.02838 0.00000 -1.03033 0.00000 -1.03279 0.00000 -0.00000 0.00000 -1.03094 0.00000 -1.03184 0.00000 -1.03158 0.00000 -1.03118 0.00000 -1.00044 0.00000 -1.00835 0.00000 -1.01308 0.00000 -1.01604 0.00000 -1.01822 0.00000 -0.96213 0.00000 -0.973142 0.00000 -0.979112 0.00000 -0.98364 0.00000 -0.987076 0.00000 -0.919647 0.00000 -0.924856 0.00000 -0.929542 0.00000 -0.934437 0.00000 -0.836432 0.00000 -0.845992 0.00000 -0.85657 0.00000 -0.865836 0.00000 -0.808031 0.00000 -0.82003 0.00000 -0.831081 0.00000 -0.796654 0.00000 -0.816634 0.00000 -0.835165 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.98308 0.00000 -0.987211 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01935 0.00000 -1.02259 0.00000 -1.02632 0.00000 -1.02933 0.00000 -0.00000 0.00000 -1.02184 0.00000 -1.02108 0.00000 -1.02077 0.00000 -1.02208 0.00000 -1.02357 0.00000 -0.992044 0.00000 -1.00127 0.00000 -1.00593 0.00000 -1.00907 0.00000 -1.01176 0.00000 -1.01363 0.00000 -0.951931 0.00000 -0.966486 0.00000 -0.973041 0.00000 -0.977979 0.00000 -0.981902 0.00000 -0.984799 0.00000 -0.91183 0.00000 -0.916248 0.00000 -0.921599 0.00000 -0.927757 0.00000 -0.932555 0.00000 -0.936096 0.00000 -0.822432 0.00000 -0.831703 0.00000 -0.843831 0.00000 -0.85506 0.00000 -0.865155 0.00000 -0.787705 0.00000 -0.799531 0.00000 -0.812021 0.00000 -0.824501 0.00000 -0.835966 0.00000 -0.770364 0.00000 -0.7923 0.00000 -0.815004 0.00000 -0.836251 0.00000 -0.854533 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.986995 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.981209 0.00000 -0.987049 0.00000 -0.992511 0.00000 -0.99727 0.00000 -0.00000 0.00000 -1.01285 0.00000 -1.01612 0.00000 -1.02063 0.00000 -1.02449 0.00000 -1.02754 0.00000 -1.02964 0.00000 -1.01619 0.00000 -1.01459 0.00000 -1.01357 0.00000 -1.01541 0.00000 -1.0178 0.00000 -1.02003 0.00000 -1.02162 0.00000 -0.993196 0.00000 -0.999659 0.00000 -1.00296 0.00000 -1.006 0.00000 -1.00824 0.00000 -1.01 0.00000 -1.01115 0.00000 -0.958119 0.00000 -0.966603 0.00000 -0.972116 0.00000 -0.976484 0.00000 -0.97995 0.00000 -0.98273 0.00000 -0.984764 0.00000 -0.909392 0.00000 -0.913831 0.00000 -0.920413 0.00000 -0.925735 0.00000 -0.930035 0.00000 -0.93355 0.00000 -0.817879 0.00000 -0.83004 0.00000 -0.842738 0.00000 -0.854824 0.00000 -0.865057 0.00000 -0.87286 0.00000 -0.78154 0.00000 -0.793549 0.00000 -0.807575 0.00000 -0.821587 0.00000 -0.833839 0.00000 -0.843665 0.00000 -0.767094 0.00000 -0.790663 0.00000 -0.815248 0.00000 -0.836968 0.00000 -0.854941 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.976945 0.00000 -0.986491 0.00000 -0.995806 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.977715 0.00000 -0.984796 0.00000 -0.991736 0.00000 -0.997977 0.00000 -1.0033 0.00000 -0.00000 0.00000 -1.01017 0.00000 -1.01487 0.00000 -1.01947 0.00000 -1.02339 0.00000 -1.02646 0.00000 -1.02856 0.00000 -1.01201 0.00000 -1.00861 0.00000 -1.00959 0.00000 -1.0124 0.00000 -1.01541 0.00000 -1.01789 0.00000 -1.01967 0.00000 -0.99365 0.00000 -0.997398 0.00000 -1.0006 0.00000 -1.00319 0.00000 -1.00545 0.00000 -1.00728 0.00000 -1.00853 0.00000 -0.959272 0.00000 -0.965968 0.00000 -0.970945 0.00000 -0.974891 0.00000 -0.978313 0.00000 -0.981097 0.00000 -0.98313 0.00000 -0.906873 0.00000 -0.912805 0.00000 -0.918716 0.00000 -0.923637 0.00000 -0.928007 0.00000 -0.930973 0.00000 -0.933616 0.00000 -0.815614 0.00000 -0.828925 0.00000 -0.8425 0.00000 -0.854636 0.00000 -0.864457 0.00000 -0.872555 0.00000 -0.776453 0.00000 -0.789687 0.00000 -0.80526 0.00000 -0.819924 0.00000 -0.83249 0.00000 -0.842611 0.00000 -0.764402 0.00000 -0.790774 0.00000 -0.815604 0.00000 -0.837121 0.00000 -0.855398 0.00000 -0.870111 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.972563 0.00000 -0.985988 0.00000 -0.997503 0.00000 -0.998716 0.00000 -0.00000 0.00000 -0.9734 0.00000 -0.982117 0.00000 -0.991044 0.00000 -0.998986 0.00000 -1.00553 0.00000 -1.01008 0.00000 -1.00472 0.00000 -1.00857 0.00000 -1.0138 0.00000 -1.01849 0.00000 -1.02243 0.00000 -1.02544 0.00000 -1.0275 0.00000 -1.0052 0.00000 -1.00337 0.00000 -1.00627 0.00000 -1.00993 0.00000 -1.01323 0.00000 -1.01593 0.00000 -1.01786 0.00000 -0.991967 0.00000 -0.994746 0.00000 -0.997386 0.00000 -0.999981 0.00000 -1.00237 0.00000 -1.00432 0.00000 -1.00569 0.00000 -0.959287 0.00000 -0.964771 0.00000 -0.969029 0.00000 -0.972948 0.00000 -0.976386 0.00000 -0.978827 0.00000 -0.980916 0.00000 -0.904595 0.00000 -0.910954 0.00000 -0.916103 0.00000 -0.921067 0.00000 -0.924979 0.00000 -0.928707 0.00000 -0.931452 0.00000 -0.814002 0.00000 -0.82831 0.00000 -0.842165 0.00000 -0.853883 0.00000 -0.86403 0.00000 -0.872122 0.00000 -0.87805 0.00000 -0.770855 0.00000 -0.786438 0.00000 -0.803187 0.00000 -0.818364 0.00000 -0.831367 0.00000 -0.84181 0.00000 -0.763018 0.00000 -0.790725 0.00000 -0.81551 0.00000 -0.83747 0.00000 -0.856123 0.00000 -0.871132 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.967827 0.00000 -0.984573 0.00000 -0.992481 0.00000 -0.993466 0.00000 -0.992835 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.97785 0.00000 -0.988856 0.00000 -0.998594 0.00000 -1.00643 0.00000 -1.01111 0.00000 -1.01447 0.00000 -0.00000 0.00000 -1.00218 0.00000 -1.00774 0.00000 -1.01312 0.00000 -1.01782 0.00000 -1.02167 0.00000 -1.02465 0.00000 -1.02671 0.00000 -1.00663 0.00000 -0.998529 0.00000 -1.00007 0.00000 -1.00406 0.00000 -1.00805 0.00000 -1.01157 0.00000 -1.01443 0.00000 -1.01645 0.00000 -0.984912 0.00000 -0.989338 0.00000 -0.991618 0.00000 -0.994188 0.00000 -0.996944 0.00000 -0.999489 0.00000 -1.0014 0.00000 -1.00304 0.00000 -0.95004 0.00000 -0.95847 0.00000 -0.962857 0.00000 -0.966997 0.00000 -0.970923 0.00000 -0.974075 0.00000 -0.976979 0.00000 -0.979115 0.00000 -0.899756 0.00000 -0.903136 0.00000 -0.908087 0.00000 -0.913286 0.00000 -0.917916 0.00000 -0.922604 0.00000 -0.926594 0.00000 -0.929499 0.00000 -0.800693 0.00000 -0.812613 0.00000 -0.827876 0.00000 -0.841259 0.00000 -0.853326 0.00000 -0.863501 0.00000 -0.87161 0.00000 -0.877541 0.00000 -0.757015 0.00000 -0.766428 0.00000 -0.784133 0.00000 -0.801594 0.00000 -0.817308 0.00000 -0.830662 0.00000 -0.841344 0.00000 -0.849171 0.00000 -0.736534 0.00000 -0.762484 0.00000 -0.790279 0.00000 -0.815634 0.00000 -0.83806 0.00000 -0.857078 0.00000 -0.872381 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.849317 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.959335 0.00000 -0.977964 0.00000 -0.987695 0.00000 -0.989031 0.00000 -0.988939 0.00000 -0.00000 0.00000 -0.970086 0.00000 -0.982788 0.00000 -0.994939 0.00000 -1.00429 0.00000 -1.01004 0.00000 -1.01435 0.00000 -0.00000 0.00000 -1.00149 0.00000 -1.00735 0.00000 -1.01278 0.00000 -1.0174 0.00000 -1.0212 0.00000 -1.02416 0.00000 -1.00279 0.00000 -0.995179 0.00000 -0.99835 0.00000 -1.00275 0.00000 -1.00693 0.00000 -1.01056 0.00000 -1.01328 0.00000 -0.985573 0.00000 -0.987228 0.00000 -0.989104 0.00000 -0.991841 0.00000 -0.994753 0.00000 -0.997304 0.00000 -0.999706 0.00000 -0.951354 0.00000 -0.957319 0.00000 -0.961209 0.00000 -0.965363 0.00000 -0.969015 0.00000 -0.972618 0.00000 -0.975576 0.00000 -0.897181 0.00000 -0.901171 0.00000 -0.905756 0.00000 -0.910523 0.00000 -0.915955 0.00000 -0.920948 0.00000 -0.925023 0.00000 -0.798269 0.00000 -0.812114 0.00000 -0.826923 0.00000 -0.840728 0.00000 -0.852844 0.00000 -0.863045 0.00000 -0.871173 0.00000 -0.751954 0.00000 -0.764078 0.00000 -0.782712 0.00000 -0.800709 0.00000 -0.81675 0.00000 -0.830314 0.00000 -0.84115 0.00000 -0.733599 0.00000 -0.762114 0.00000 -0.790104 0.00000 -0.815904 0.00000 -0.838672 0.00000 -0.857969 0.00000 -0.873496 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.84513 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.965983 0.00000 -0.982997 0.00000 -0.985103 0.00000 -0.985579 0.00000 -0.00000 0.00000 -0.973236 0.00000 -0.987711 0.00000 -0.999925 0.00000 -1.00728 0.00000 -1.01264 0.00000 -0.997874 0.00000 -1.00113 0.00000 -1.00719 0.00000 -1.01257 0.00000 -1.01714 0.00000 -1.02092 0.00000 -0.998517 0.00000 -0.993212 0.00000 -0.99726 0.00000 -1.00191 0.00000 -1.0062 0.00000 -1.00969 0.00000 -0.984686 0.00000 -0.985199 0.00000 -0.98714 0.00000 -0.990035 0.00000 -0.992939 0.00000 -0.995954 0.00000 -0.951587 0.00000 -0.956012 0.00000 -0.959831 0.00000 -0.963661 0.00000 -0.967787 0.00000 -0.971451 0.00000 -0.895423 0.00000 -0.899119 0.00000 -0.903105 0.00000 -0.908787 0.00000 -0.914518 0.00000 -0.919606 0.00000 -0.797024 0.00000 -0.811749 0.00000 -0.82643 0.00000 -0.840263 0.00000 -0.85241 0.00000 -0.862642 0.00000 -0.747996 0.00000 -0.762445 0.00000 -0.78179 0.00000 -0.800175 0.00000 -0.816433 0.00000 -0.830148 0.00000 -0.731915 0.00000 -0.761626 0.00000 -0.790079 0.00000 -0.816239 0.00000 -0.839288 0.00000 -0.858812 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.953675 0.00000 -0.977494 0.00000 -0.979753 0.00000 -0.00000 0.00000 -0.979951 0.00000 -0.995915 0.00000 -1.00498 0.00000 -0.995011 0.00000 -1.00091 0.00000 -1.00706 0.00000 -1.01235 0.00000 -0.991423 0.00000 -0.99119 0.00000 -0.996018 0.00000 -1.00088 0.00000 -0.982189 0.00000 -0.981977 0.00000 -0.984239 0.00000 -0.987319 0.00000 -0.95089 0.00000 -0.953763 0.00000 -0.957241 0.00000 -0.961653 0.00000 -0.893641 0.00000 -0.895765 0.00000 -0.900134 0.00000 -0.906308 0.00000 -0.795172 0.00000 -0.810361 0.00000 -0.825561 0.00000 -0.839464 0.00000 -0.74286 0.00000 -0.760475 0.00000 -0.780743 0.00000 -0.799577 0.00000 -0.731237 0.00000 -0.76108 0.00000 -0.790272 0.00000 -0.816965 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NUC_DYE605.dat b/nnpdfcpp/data/NLOCFAC/CF_NUC_DYE605.dat deleted file mode 100644 index a3037b27fa..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NUC_DYE605.dat +++ /dev/null @@ -1,128 +0,0 @@ -******************************************************************************** -SetName: DYE605_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -1.02293 0.00000 -1.03286 0.00000 -1.04371 0.00000 -1.05545 0.00000 -1.06898 0.00000 -1.08373 0.00000 -1.10003 0.00000 -1.11775 0.00000 -1.13744 0.00000 -1.15883 0.00000 -1.38028 0.00000 -1.41644 0.00000 -1.45272 0.00000 -1.52719 0.00000 -1.67598 0.00000 -1.97483 0.00000 -2.48278 0.00000 -1.02010 0.00000 -1.02801 0.00000 -1.03714 0.00000 -1.04735 0.00000 -1.05910 0.00000 -1.07208 0.00000 -1.08687 0.00000 -1.10291 0.00000 -1.12125 0.00000 -1.14193 0.00000 -1.38355 0.00000 -1.42306 0.00000 -1.46837 0.00000 -1.56574 0.00000 -1.79414 0.00000 -2.12856 0.00000 -2.75998 0.00000 -3.55510 0.00000 -1.01976 0.00000 -1.02712 0.00000 -1.03556 0.00000 -1.04485 0.00000 -1.05570 0.00000 -1.06782 0.00000 -1.08199 0.00000 -1.09732 0.00000 -1.11511 0.00000 -1.13533 0.00000 -1.39028 0.00000 -1.43413 0.00000 -1.48461 0.00000 -1.58610 0.00000 -1.82602 0.00000 -2.34917 0.00000 -3.00599 0.00000 -3.79645 0.00000 -1.02367 0.00000 -1.03132 0.00000 -1.04007 0.00000 -1.04985 0.00000 -1.06109 0.00000 -1.07356 0.00000 -1.08785 0.00000 -1.10361 0.00000 -1.12169 0.00000 -1.14217 0.00000 -1.39406 0.00000 -1.43592 0.00000 -1.48454 0.00000 -1.59176 0.00000 -1.87141 0.00000 -2.39061 0.00000 -3.18658 0.00000 -4.02960 0.00000 -1.03093 0.00000 -1.04001 0.00000 -1.05008 0.00000 -1.06120 0.00000 -1.07406 0.00000 -1.08818 0.00000 -1.10421 0.00000 -1.12190 0.00000 -1.14173 0.00000 -1.16347 0.00000 -1.40902 0.00000 -1.45430 0.00000 -1.50443 0.00000 -1.61469 0.00000 -1.86113 0.00000 -2.31942 0.00000 -3.12548 0.00000 -5.10798 0.00000 -1.04136 0.00000 -1.05209 0.00000 -1.06444 0.00000 -1.07814 0.00000 -1.09335 0.00000 -1.10979 0.00000 -1.12799 0.00000 -1.14608 0.00000 -1.16623 0.00000 -1.18749 0.00000 -1.43827 0.00000 -1.47815 0.00000 -1.52119 0.00000 -1.60779 0.00000 -1.82729 0.00000 -2.26414 0.00000 -3.30619 0.00000 -4.20667 0.00000 -1.14876 0.00000 -1.16866 0.00000 -1.18987 0.00000 -1.21406 0.00000 -1.45171 0.00000 -1.49288 0.00000 -1.53310 0.00000 -1.62798 0.00000 -1.82995 0.00000 -2.32404 0.00000 -2.98542 0.00000 -3.62274 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NUC_EMCF2C.dat b/nnpdfcpp/data/NLOCFAC/CF_NUC_EMCF2C.dat deleted file mode 100644 index d7680b7c08..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NUC_EMCF2C.dat +++ /dev/null @@ -1,30 +0,0 @@ -******************************************************************************** -SetName: EMCF2C_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.88921 0.00000 -0.00000 0.00000 -1.84017 0.00000 -1.30236 0.00000 -1.86217 0.00000 -1.04350 0.00000 -1.02180 0.00000 -0.62768 0.00000 -1.39470 0.00000 -1.31401 0.00000 -0.16979 0.00000 -0.42162 0.00000 -0.58695 0.00000 -0.05925 0.00000 -0.18152 0.00000 -0.27436 0.00000 -0.01025 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NUC_NTVNBDMNFe.dat b/nnpdfcpp/data/NLOCFAC/CF_NUC_NTVNBDMNFe.dat deleted file mode 100644 index 05dfa9805c..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NUC_NTVNBDMNFe.dat +++ /dev/null @@ -1,54 +0,0 @@ -******************************************************************************** -SetName: NTVNBDMNFe_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -1.10217 0.00000 -0.99194 0.00000 -0.92420 0.00000 -0.00000 0.00000 -1.12618 0.00000 -1.10481 0.00000 -1.06434 0.00000 -1.09188 0.00000 -0.00000 0.00000 -1.05880 0.00000 -1.09516 0.00000 -1.07749 0.00000 -1.17869 0.00000 -0.00000 0.00000 -1.08749 0.00000 -1.12661 0.00000 -1.03533 0.00000 -1.02689 0.00000 -0.00000 0.00000 -0.96006 0.00000 -1.09141 0.00000 -1.06015 0.00000 -1.14515 0.00000 -0.00000 0.00000 -0.92438 0.00000 -1.06550 0.00000 -1.07511 0.00000 -1.20531 0.00000 -0.00000 0.00000 -0.97154 0.00000 -1.11192 0.00000 -1.03798 0.00000 -1.06714 0.00000 -0.84109 0.00000 -0.92139 0.00000 -1.07643 0.00000 -1.06776 0.00000 -1.16110 0.00000 -0.84592 0.00000 -0.90156 0.00000 -1.06451 0.00000 -1.08126 0.00000 -1.21415 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_NUC_NTVNUDMNFe.dat b/nnpdfcpp/data/NLOCFAC/CF_NUC_NTVNUDMNFe.dat deleted file mode 100644 index 52f5b257de..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_NUC_NTVNUDMNFe.dat +++ /dev/null @@ -1,54 +0,0 @@ -******************************************************************************** -SetName: NTVNUDMNFe_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.77090 0.00000 -0.75204 0.00000 -0.86524 0.00000 -0.00000 0.00000 -0.92943 0.00000 -0.79226 0.00000 -0.79349 0.00000 -0.94421 0.00000 -0.00000 0.00000 -0.95545 0.00000 -0.80233 0.00000 -0.81206 0.00000 -0.98544 0.00000 -0.00000 0.00000 -0.95406 0.00000 -0.80805 0.00000 -0.78659 0.00000 -0.88914 0.00000 -0.74807 0.00000 -0.98024 0.00000 -0.83222 0.00000 -0.82163 0.00000 -0.94843 0.00000 -0.75022 0.00000 -0.98578 0.00000 -0.83866 0.00000 -0.83591 0.00000 -0.98177 0.00000 -0.00000 0.00000 -0.97656 0.00000 -0.82890 0.00000 -0.80286 0.00000 -0.89285 0.00000 -0.77362 0.00000 -0.99155 0.00000 -0.84827 0.00000 -0.83300 0.00000 -0.94692 0.00000 -0.77159 0.00000 -0.98236 0.00000 -0.85286 0.00000 -0.84586 0.00000 -0.97835 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_QCD_ATLASWPT31PB_WM.dat b/nnpdfcpp/data/NLOCFAC/CF_QCD_ATLASWPT31PB_WM.dat deleted file mode 100644 index bdf46b69f9..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_QCD_ATLASWPT31PB_WM.dat +++ /dev/null @@ -1,20 +0,0 @@ -******************************************************************************************* -SetName: ATLASWPT31PB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: 2014 -CodesUsed: FEWZ -TheoryInput: NNPDF2.3 NLO, alphas(MZ)=0.119 -PDFset: NNPDF23_nlo_as_0119 -Warnings: -******************************************************************************************** -1.0 0.00000 -1.0 0.00000 -1.39877382 0.00000 -1.43357471 0.00000 -1.45363014 0.00000 -1.46540533 0.00000 -1.46020938 0.00000 -1.4684685 0.00000 -1.41557491 0.00000 -1.39499509 0.00000 -1.34579322 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_QCD_ATLASWPT31PB_WM_TOT.dat b/nnpdfcpp/data/NLOCFAC/CF_QCD_ATLASWPT31PB_WM_TOT.dat deleted file mode 100644 index 05ca7800dd..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_QCD_ATLASWPT31PB_WM_TOT.dat +++ /dev/null @@ -1,20 +0,0 @@ -******************************************************************************************* -SetName: ATLASWPT31PB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: 2014 -CodesUsed: FEWZ -TheoryInput: NNPDF2.3 NLO, alphas(MZ)=0.119 -PDFset: NNPDF23_nlo_as_0119 -Warnings: -******************************************************************************************** -0.98033 0.00000 -0.98033 0.00000 -0.98033 0.00000 -0.98033 0.00000 -0.98033 0.00000 -0.98033 0.00000 -0.98033 0.00000 -0.98033 0.00000 -0.98033 0.00000 -0.98033 0.00000 -0.98033 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_QCD_ATLASWPT31PB_WP.dat b/nnpdfcpp/data/NLOCFAC/CF_QCD_ATLASWPT31PB_WP.dat deleted file mode 100644 index 621e38d8bf..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_QCD_ATLASWPT31PB_WP.dat +++ /dev/null @@ -1,20 +0,0 @@ -******************************************************************************************* -SetName: ATLASWPT31PB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: 2014 -CodesUsed: FEWZ -TheoryInput: NNPDF2.3 NLO, alphas(MZ)=0.119 -PDFset: NNPDF23_nlo_as_0119 -Warnings: -******************************************************************************************** -1.0 0.00000 -1.0 0.00000 -1.40455941 0.00000 -1.43942805 0.00000 -1.46034438 0.00000 -1.46920806 0.00000 -1.46964978 0.00000 -1.45210886 0.00000 -1.42229187 0.00000 -1.39592503 0.00000 -1.34420816 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_QCD_ATLASWPT31PB_WP_TOT.dat b/nnpdfcpp/data/NLOCFAC/CF_QCD_ATLASWPT31PB_WP_TOT.dat deleted file mode 100644 index 35ef136694..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_QCD_ATLASWPT31PB_WP_TOT.dat +++ /dev/null @@ -1,20 +0,0 @@ -******************************************************************************************* -SetName: ATLASWPT31PB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: 2014 -CodesUsed: FEWZ -TheoryInput: NNPDF2.3 NLO, alphas(MZ)=0.119 -PDFset: NNPDF23_nlo_as_0119 -Warnings: -******************************************************************************************** -0.98509 0.00000 -0.98509 0.00000 -0.98509 0.00000 -0.98509 0.00000 -0.98509 0.00000 -0.98509 0.00000 -0.98509 0.00000 -0.98509 0.00000 -0.98509 0.00000 -0.98509 0.00000 -0.98509 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_QCD_LHCBWZMU7TEV_PI.dat b/nnpdfcpp/data/NLOCFAC/CF_QCD_LHCBWZMU7TEV_PI.dat deleted file mode 100644 index 81676368ed..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_QCD_LHCBWZMU7TEV_PI.dat +++ /dev/null @@ -1,42 +0,0 @@ -******************************************************************************** -SetName: LHCBWZMU7TEV -Author: Nathan Hartland -Date: 20/10/2017 -CodesUsed: NA -TheoryInput: NA -PDFset: NA -Warnings: Obviously this is a placeholder -******************************************************************************** -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_QCD_LHCBWZMU8TEV_PI.dat b/nnpdfcpp/data/NLOCFAC/CF_QCD_LHCBWZMU8TEV_PI.dat deleted file mode 100644 index 0391ac66a0..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_QCD_LHCBWZMU8TEV_PI.dat +++ /dev/null @@ -1,43 +0,0 @@ -******************************************************************************** -SetName: LHCBWZMU7TEV -Author: Nathan Hartland -Date: 20/10/2017 -CodesUsed: NA -TheoryInput: NA -PDFset: NA -Warnings: Obviously this is a placeholder -******************************************************************************** -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_RES_ATLASTTBARTOT.dat b/nnpdfcpp/data/NLOCFAC/CF_RES_ATLASTTBARTOT.dat deleted file mode 100644 index 47911d25c3..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_RES_ATLASTTBARTOT.dat +++ /dev/null @@ -1,12 +0,0 @@ -******************************************************************************** -SetName: ATLASTTBARTOT -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: top++ v2.0 -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nlo_as_0118 -Warnings: NLL K-factor -******************************************************************************** - 1.0603 0.0000 - 1.0564 0.0000 - 1.0577 0.0000 diff --git a/nnpdfcpp/data/NLOCFAC/CF_RES_CMSTTBARTOT.dat b/nnpdfcpp/data/NLOCFAC/CF_RES_CMSTTBARTOT.dat deleted file mode 100644 index b4f049060c..0000000000 --- a/nnpdfcpp/data/NLOCFAC/CF_RES_CMSTTBARTOT.dat +++ /dev/null @@ -1,12 +0,0 @@ -******************************************************************************** -SetName: CMSTTBARTOT -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: top++ v2.0 -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nlo_as_0118 -Warnings: NLL K-factor -******************************************************************************** - 1.0603 0.0000 - 1.0564 0.0000 - 1.0577 0.0000 diff --git a/nnpdfcpp/data/NLOCFAC/registeredCFactors.dat b/nnpdfcpp/data/NLOCFAC/registeredCFactors.dat deleted file mode 100644 index 0aee9a92c8..0000000000 --- a/nnpdfcpp/data/NLOCFAC/registeredCFactors.dat +++ /dev/null @@ -1,105 +0,0 @@ -DEUT BCDMSD BCDMSD -DEUT NMCPD NMCPD -DEUT SLACD SLACD -DEU SLACD SLACD_sh -DEU BCDMSD BCDMSD_sh -DEU NMCPD_D NMCPD_sh -DEU NMCPD_P NMCPD_sh -DEU DYE886R_D DYE886R_sh -DEU DYE886R_P DYE886R_sh -NUC CHORUSNUPb CHORUSNUPb_sh -NUC CHORUSNBPb CHORUSNBPb_sh -NUC NTVNUDMNFe NTVNUDMNFe_sh -NUC NTVNBDMNFe NTVNBDMNFe_sh -NUC EMCF2C EMCF2C_sh -NUC DYE605 DYE605_sh -DEUI SLACD SLACD_sh_ite -DEUI BCDMSD BCDMSD_sh_ite -DEUI NMCPD_D NMCPD_sh_ite -DEUI NMCPD_P NMCPD_sh_ite -DEUI DYE886R_D DYE886R_sh_ite -DEUI DYE886R_P DYE886R_sh_ite -DEUI DYE906R_D_BIN01 DYE906R_BIN01 -DEUI DYE906R_D_BIN02 DYE906R_BIN02 -DEUI DYE906R_D_BIN03 DYE906R_BIN03 -DEUI DYE906R_D_BIN04 DYE906R_BIN04 -DEUI DYE906R_D_BIN05 DYE906R_BIN05 -DEUI DYE906R_D_BIN06 DYE906R_BIN06 -DEUI DYE906R_D_BIN07 DYE906R_BIN07 -DEUI DYE906R_D_BIN08 DYE906R_BIN08 -DEUI DYE906R_D_BIN09 DYE906R_BIN09 -DEUI DYE906R_D_BIN10 DYE906R_BIN10 -DEUI DYE906R_P_BIN01 DYE906R_BIN01 -DEUI DYE906R_P_BIN02 DYE906R_BIN02 -DEUI DYE906R_P_BIN03 DYE906R_BIN03 -DEUI DYE906R_P_BIN04 DYE906R_BIN04 -DEUI DYE906R_P_BIN05 DYE906R_BIN05 -DEUI DYE906R_P_BIN06 DYE906R_BIN06 -DEUI DYE906R_P_BIN07 DYE906R_BIN07 -DEUI DYE906R_P_BIN08 DYE906R_BIN08 -DEUI DYE906R_P_BIN09 DYE906R_BIN09 -DEUI DYE906R_P_BIN10 DYE906R_BIN10 -NUCI CHORUSNUPb CHORUSNUPb_sh_ite -NUCI CHORUSNBPb CHORUSNBPb_sh_ite -NUCI NTVNUDMNFe NTVNUDMNFe_sh_ite -NUCI NTVNBDMNFe NTVNBDMNFe_sh_ite -NUCI EMCF2C EMCF2C_sh_ite -NUCI DYE605 DYE605_sh_ite -ACC DYE906R_D_BIN01 DYE906R_BIN01 -ACC DYE906R_D_BIN02 DYE906R_BIN02 -ACC DYE906R_D_BIN03 DYE906R_BIN03 -ACC DYE906R_D_BIN04 DYE906R_BIN04 -ACC DYE906R_D_BIN05 DYE906R_BIN05 -ACC DYE906R_D_BIN06 DYE906R_BIN06 -ACC DYE906R_D_BIN07 DYE906R_BIN07 -ACC DYE906R_D_BIN08 DYE906R_BIN08 -ACC DYE906R_D_BIN09 DYE906R_BIN09 -ACC DYE906R_D_BIN10 DYE906R_BIN10 -ACC DYE906R_P_BIN01 DYE906R_BIN01 -ACC DYE906R_P_BIN02 DYE906R_BIN02 -ACC DYE906R_P_BIN03 DYE906R_BIN03 -ACC DYE906R_P_BIN04 DYE906R_BIN04 -ACC DYE906R_P_BIN05 DYE906R_BIN05 -ACC DYE906R_P_BIN06 DYE906R_BIN06 -ACC DYE906R_P_BIN07 DYE906R_BIN07 -ACC DYE906R_P_BIN08 DYE906R_BIN08 -ACC DYE906R_P_BIN09 DYE906R_BIN09 -ACC DYE906R_P_BIN10 DYE906R_BIN10 -EWK ATLASLOMASSDY11 ATLASLOMASSDY11 -EWK ATLASLOMASSDY11EXT ATLASLOMASSDY11EXT -EWK ATLASWZRAP36PB ATLASWZRAP36PB -EWK ATLASWZTOT13TEV81PB ATLASWZTOT13TEV81PB -EWK ATLASZHIGHMASS49FB ATLASZHIGHMASS49FB -EWK CMSDY2D11 CMSDY2D11 -EWK CMSDY2D12 CMSDY2D12 -EWK LHCBWZMU7TEV LHCBWZMU7TEV -EWK LHCBWZMU8TEV LHCBWZMU8TEV -EWK LHCBZ940PB LHCBZ940PB -EWK LHCBZEE2FB LHCBZEE2FB -EWK ATLASPHT12 ATLASPHT12 -EWK ATLASPHT15 ATLASPHT15 -EWK ATLAS1JET11_NEW_SCALE ATLAS1JET11_NEW_SCALE -EWK ATLAS_1JET_8TEV_R04 ATLAS_1JET_8TEV_R04 -EWK ATLAS_1JET_8TEV_R06 ATLAS_1JET_8TEV_R06 -EWK ATLAS_2JET_7TEV_R04 ATLAS_2JET_7TEV_R04 -EWK ATLAS_2JET_7TEV_R06 ATLAS_2JET_7TEV_R06 -EWK CMSJETS11_NEW_SCALE CMSJETS11_NEW_SCALE -EWK CMS_1JET_8TEV CMS_1JET_8TEV -EWK CMS_2JET_7TEV CMS_2JET_7TEV -EWK CMS_2JET_3D_8TEV CMS_2JET_3D_8TEV -NRM ATLASWZTOT13TEV81PB ATLASWZTOT13TEV81PB -NRM ATLASZPT7TEV ATLASZPT7TEV -NRM ATLASZPT7TEV_PTZ ATLASZPT7TEV -NRM ATLASZPT7TEV_TOT ATLASZPT7TEV MZ -NRM ATLASZPT8TEVMDIST ATLASZPT8TEVMDIST -NRM ATLASPHT12 ATLASPHT12 -NRM CMSZDIFF12 CMSZDIFF12 -NRM LHCBWZMU7TEV LHCBWZMU7TEV -NRM LHCBWZMU8TEV LHCBWZMU8TEV -NRM LHCBWZMU7TEV_PI LHCBWZMU7TEV -NRM LHCBWZMU8TEV_PI LHCBWZMU8TEV -QCD ATLASWPT31PB_WM ATLASWPT31PB -QCD ATLASWPT31PB_WM_TOT ATLASWPT31PB MW -QCD ATLASWPT31PB_WP ATLASWPT31PB -QCD ATLASWPT31PB_WP_TOT ATLASWPT31PB MW - diff --git a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_ATLASR04JETS2P76TEV.dat b/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_ATLASR04JETS2P76TEV.dat deleted file mode 100644 index 8f9116e522..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_ATLASR04JETS2P76TEV.dat +++ /dev/null @@ -1,68 +0,0 @@ -************************************************************************************************************ -SetName: ATLASR04JETS2P76TEV -Author: Stefano Carrazza and Joao Pires, stefano.carrazza@mi.infn.it and Joao.Pires@mib.infn.it -Date: Early 2014 -CodesUsed: Private gg->jj code from JP, validated with threshold approximation code from Vogelsang -TheoryInput: NNPDF2.3 NNLO, alphas(MZ)=0.119 -PDFset: NNPDF23_nnlo_as_0119 -Warnings: Uses pt_jet as central scale rather than pt_leading, to update once final pp -> jj code available -************************************************************************************************************* -1.9772 0.00000 -1.6992 0.00000 -1.5179 0.00000 -1.4124 0.00000 -1.3262 0.00000 -1.2497 0.00000 -1.1929 0.00000 -1.1635 0.00000 -1.1415 0.00000 -1.1284 0.00000 -1.1222 0.00000 -2.0411 0.00000 -1.7594 0.00000 -1.5675 0.00000 -1.4572 0.00000 -1.3699 0.00000 -1.2933 0.00000 -1.2317 0.00000 -1.2024 0.00000 -1.1871 0.00000 -1.1783 0.00000 -1.1706 0.00000 -2.1871 0.00000 -1.8944 0.00000 -1.6906 0.00000 -1.57 0.00000 -1.4742 0.00000 -1.3923 0.00000 -1.3402 0.00000 -1.3203 0.00000 -1.3147 0.00000 -1.3119 0.00000 -2.5353 0.00000 -2.2084 0.00000 -1.9788 0.00000 -1.8438 0.00000 -1.7509 0.00000 -1.6861 0.00000 -1.6521 0.00000 -1.6371 0.00000 -1.6295 0.00000 -1.6362 0.00000 -3.1308 0.00000 -2.7929 0.00000 -2.5984 0.00000 -2.5477 0.00000 -2.5872 0.00000 -2.7237 0.00000 -3.0981 0.00000 -3.9726 0.00000 -3.9357 0.00000 -3.8226 0.00000 -3.9743 0.00000 -4.3093 0.00000 -5.1219 0.00000 -8.1394 0.00000 -6.0433 0.00000 -7.201 0.00000 -11.74 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_ATLASR04JETS36PB.dat b/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_ATLASR04JETS36PB.dat deleted file mode 100644 index ae510d7bb7..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_ATLASR04JETS36PB.dat +++ /dev/null @@ -1,99 +0,0 @@ -******************************************************************************************* -SetName: ATLASR04JETS36PB -Author: Stefano Carrazza and Joao Pires, stefano.carrazza@mi.infn.it and Joao.Pires@mib.infn.it -Date: Early 2014 -CodesUsed: Private gg->jj code from JP, validated with threshold approximation code from Vogelsang -TheoryInput: NNPDF2.3 NNLO, alphas(MZ)=0.119 -PDFset: NNPDF23_nnlo_as_0119 -Warnings: Uses pt_jet as central scale rather than pt_leading, to update once final pp -> jj code available -******************************************************************************************** -2.3578 0.00000 -2.0056 0.00000 -1.7647 0.00000 -1.6151 0.00000 -1.4948 0.00000 -1.387 0.00000 -1.3012 0.00000 -1.2509 0.00000 -1.2149 0.00000 -1.1853 0.00000 -1.157 0.00000 -1.1349 0.00000 -1.1208 0.00000 -1.1072 0.00000 -1.1008 0.00000 -1.101 0.00000 -2.4117 0.00000 -2.0521 0.00000 -1.8076 0.00000 -1.6592 0.00000 -1.5323 0.00000 -1.4234 0.00000 -1.332 0.00000 -1.2784 0.00000 -1.2461 0.00000 -1.2157 0.00000 -1.1878 0.00000 -1.169 0.00000 -1.1548 0.00000 -1.1466 0.00000 -1.1411 0.00000 -1.141 0.00000 -2.5167 0.00000 -2.1617 0.00000 -1.9081 0.00000 -1.7537 0.00000 -1.6256 0.00000 -1.5083 0.00000 -1.4117 0.00000 -1.3572 0.00000 -1.3209 0.00000 -1.295 0.00000 -1.2704 0.00000 -1.2572 0.00000 -1.2553 0.00000 -1.2561 0.00000 -1.2627 0.00000 -1.2779 0.00000 -2.7916 0.00000 -2.4185 0.00000 -2.1545 0.00000 -1.9852 0.00000 -1.843 0.00000 -1.7161 0.00000 -1.6125 0.00000 -1.5632 0.00000 -1.5354 0.00000 -1.5206 0.00000 -1.5118 0.00000 -1.5054 0.00000 -1.5016 0.00000 -1.5096 0.00000 -1.5387 0.00000 -3.2556 0.00000 -2.868 0.00000 -2.583 0.00000 -2.3997 0.00000 -2.2627 0.00000 -2.175 0.00000 -2.156 0.00000 -2.1978 0.00000 -2.2699 0.00000 -2.3636 0.00000 -2.5888 0.00000 -3.0231 0.00000 -3.771 0.00000 -3.3858 0.00000 -3.1397 0.00000 -3.0405 0.00000 -3.0465 0.00000 -3.1776 0.00000 -3.5113 0.00000 -4.114 0.00000 -5.3198 0.00000 -4.4631 0.00000 -4.3113 0.00000 -4.4781 0.00000 -4.8591 0.00000 -5.6304 0.00000 -8.0077 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_ATLASR06JETS36PB.dat b/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_ATLASR06JETS36PB.dat deleted file mode 100644 index ddc535a3cc..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_ATLASR06JETS36PB.dat +++ /dev/null @@ -1,99 +0,0 @@ -******************************************************************************************* -SetName: ATLASR06JETS36PB -Author: Stefano Carrazza and Joao Pires, stefano.carrazza@mi.infn.it and Joao.Pires@mib.infn.it -Date: Early 2014 -CodesUsed: Private gg->jj code from JP, validated with threshold approximation code from Vogelsang -TheoryInput: NNPDF2.3 NNLO, alphas(MZ)=0.119 -PDFset: NNPDF23_nnlo_as_0119 -Warnings: Uses pt_jet as central scale rather than pt_leading, to update once final pp -> jj code available -******************************************************************************************** -2.0105 0.00000 -1.7417 0.00000 -1.5597 0.00000 -1.4477 0.00000 -1.3588 0.00000 -1.2801 0.00000 -1.2187 0.00000 -1.1834 0.00000 -1.1582 0.00000 -1.1383 0.00000 -1.1207 0.00000 -1.1066 0.00000 -1.0996 0.00000 -1.0941 0.00000 -1.0934 0.00000 -1.0985 0.00000 -2.0574 0.00000 -1.7814 0.00000 -1.596 0.00000 -1.4844 0.00000 -1.3898 0.00000 -1.3101 0.00000 -1.244 0.00000 -1.2061 0.00000 -1.1844 0.00000 -1.1637 0.00000 -1.1461 0.00000 -1.1347 0.00000 -1.1268 0.00000 -1.1254 0.00000 -1.1245 0.00000 -1.1283 0.00000 -2.149 0.00000 -1.8749 0.00000 -1.6804 0.00000 -1.5638 0.00000 -1.4681 0.00000 -1.3811 0.00000 -1.3113 0.00000 -1.2729 0.00000 -1.2475 0.00000 -1.2306 0.00000 -1.2149 0.00000 -1.2075 0.00000 -1.209 0.00000 -1.213 0.00000 -1.2206 0.00000 -1.2357 0.00000 -2.3904 0.00000 -2.0965 0.00000 -1.8915 0.00000 -1.7615 0.00000 -1.6544 0.00000 -1.5599 0.00000 -1.4841 0.00000 -1.4502 0.00000 -1.431 0.00000 -1.4224 0.00000 -1.4188 0.00000 -1.4147 0.00000 -1.4127 0.00000 -1.4202 0.00000 -1.4435 0.00000 -2.8046 0.00000 -2.4927 0.00000 -2.2688 0.00000 -2.1288 0.00000 -2.0267 0.00000 -1.9651 0.00000 -1.958 0.00000 -1.9969 0.00000 -2.0585 0.00000 -2.1351 0.00000 -2.3167 0.00000 -2.6572 0.00000 -3.2822 0.00000 -2.9738 0.00000 -2.7827 0.00000 -2.7105 0.00000 -2.7233 0.00000 -2.8379 0.00000 -3.1127 0.00000 -3.5965 0.00000 -4.535 0.00000 -3.9541 0.00000 -3.8368 0.00000 -3.9857 0.00000 -4.3033 0.00000 -4.9355 0.00000 -6.8124 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_ATLASWZRAP36PB.dat b/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_ATLASWZRAP36PB.dat deleted file mode 100644 index 5041199cd8..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_ATLASWZRAP36PB.dat +++ /dev/null @@ -1,39 +0,0 @@ -******************************************************************************************* -SetName: ATLASWZRAP36PB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: Early 2012 -CodesUsed: FEWZ -TheoryInput: NNPDF2.1 NNLO alphas(MZ)=0.119 -PDFset: NNPDF21_nnlo_as_0119 -Warnings: C-factors smeared to reduce stat fluctuations -******************************************************************************************** -0.983712871105245 0.00000 -0.9845662317033809 0.00000 -0.9856845323582702 0.00000 -0.9869450185044369 0.00000 -0.9882249355764054 0.00000 -0.9896773159202764 0.00000 -0.9906290516562485 0.00000 -0.9910383714369997 0.00000 -0.9910171952835766 0.00000 -0.9903115332879585 0.00000 -0.9882430209694673 0.00000 -0.9852046515369433 0.00000 -0.9853373705556813 0.00000 -0.9863462016498418 0.00000 -0.9879025508033406 0.00000 -0.9896778240000941 0.00000 -0.9917205932817182 0.00000 -0.9928544464050068 0.00000 -0.992984186608102 0.00000 -0.9919676671964468 0.00000 -0.9892776724246043 0.00000 -0.9829968902007941 0.00000 -0.9928047468719114 0.00000 -0.9910453125053015 0.00000 -0.9915267682129278 0.00000 -0.9930003521670738 0.00000 -0.9942173025400232 0.00000 -0.9939288575040589 0.00000 -0.9908862552314646 0.00000 -0.9784266405057616 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_ATLASZHIGHMASS49FB.dat b/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_ATLASZHIGHMASS49FB.dat deleted file mode 100644 index 11581cbf75..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_ATLASZHIGHMASS49FB.dat +++ /dev/null @@ -1,22 +0,0 @@ -******************************************************************************************* -SetName: ATLASZHIGHMASS49PB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: 2014 -CodesUsed: FEWZ -TheoryInput: NNPDF2.3 NLO, alphas(MZ)=0.119 -PDFset: NNPDF23_nlo_as_0119 -Warnings: -******************************************************************************************** -1.009 0.00000 -1.013 0.00000 -1.015 0.00000 -1.028 0.00000 -1.035 0.00000 -1.017 0.00000 -1.004 0.00000 -1.000 0.00000 -0.967 0.00000 -0.955 0.00000 -0.952 0.00000 -0.918 0.00000 -1.011 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CDFR2KT.dat b/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CDFR2KT.dat deleted file mode 100644 index 87b0f25967..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CDFR2KT.dat +++ /dev/null @@ -1,85 +0,0 @@ -******************************************************************************************* -SetName: CDFR2KT -Author: Stefano Carrazza and Joao Pires, stefano.carrazza@mi.infn.it and Joao.Pires@mib.infn.it -Date: Early 2014 -CodesUsed: Private gg->jj code from JP, validated with threshold approximation code from Vogelsang -TheoryInput: NNPDF2.3 NNLO, alphas(MZ)=0.119 -PDFset: NNPDF23_nnlo_as_0119 -Warnings: Uses pt_jet as central scale rather than pt_leading, to update once final pp -> jj code available -******************************************************************************************** -1.2507 0.00000 -1.2249 0.00000 -1.2016 0.00000 -1.1837 0.00000 -1.1665 0.00000 -1.153 0.00000 -1.1415 0.00000 -1.1327 0.00000 -1.1235 0.00000 -1.12 0.00000 -1.1154 0.00000 -1.1159 0.00000 -1.1146 0.00000 -1.1174 0.00000 -1.1198 0.00000 -1.1263 0.00000 -1.1368 0.00000 -1.2733 0.00000 -1.2472 0.00000 -1.2245 0.00000 -1.2051 0.00000 -1.1858 0.00000 -1.1753 0.00000 -1.162 0.00000 -1.1534 0.00000 -1.146 0.00000 -1.1417 0.00000 -1.1376 0.00000 -1.1368 0.00000 -1.1368 0.00000 -1.1383 0.00000 -1.1416 0.00000 -1.1479 0.00000 -1.1545 0.00000 -1.3588 0.00000 -1.33 0.00000 -1.304 0.00000 -1.2807 0.00000 -1.2654 0.00000 -1.2522 0.00000 -1.2421 0.00000 -1.2326 0.00000 -1.2303 0.00000 -1.2289 0.00000 -1.2298 0.00000 -1.2338 0.00000 -1.236 0.00000 -1.246 0.00000 -1.2557 0.00000 -1.2651 0.00000 -1.4988 0.00000 -1.4673 0.00000 -1.4408 0.00000 -1.4231 0.00000 -1.4102 0.00000 -1.4007 0.00000 -1.3997 0.00000 -1.4025 0.00000 -1.4068 0.00000 -1.4183 0.00000 -1.4302 0.00000 -1.4465 0.00000 -1.4631 0.00000 -1.4894 0.00000 -1.7541 0.00000 -1.729 0.00000 -1.723 0.00000 -1.7242 0.00000 -1.7332 0.00000 -1.7536 0.00000 -1.7894 0.00000 -1.8343 0.00000 -1.8978 0.00000 -1.9736 0.00000 -2.0908 0.00000 -2.3038 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CDFZRAP.dat b/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CDFZRAP.dat deleted file mode 100644 index b395ef3c60..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CDFZRAP.dat +++ /dev/null @@ -1,38 +0,0 @@ -******************************************************************************************* -SetName: D0ZRAP -Author: Juan Rojo juan.rojo@physics.ox.ac.uk -Date: Early 2011 -CodesUsed: VRAP v0.9 -TheoryInput: Fixed muR and muF settings, as(MZ) = 0.119 -PDFset: Preliminary version of NNPDF2.1 NNLO -Warnings: To update with recent C-factors (NNPDFres paper) with dynamical central scale -******************************************************************************************** - 1.0235212000000000 0.00000 - 1.0235512000000000 0.00000 - 1.0236103999999999 0.00000 - 1.0237271999999999 0.00000 - 1.0238727999999999 0.00000 - 1.0240480999999999 0.00000 - 1.0242407000000000 0.00000 - 1.0244413000000001 0.00000 - 1.0246333999999999 0.00000 - 1.0248310000000000 0.00000 - 1.0250013000000000 0.00000 - 1.0251691999999999 0.00000 - 1.0253123000000000 0.00000 - 1.0254387000000000 0.00000 - 1.0255491000000001 0.00000 - 1.0256574000000001 0.00000 - 1.0257761000000001 0.00000 - 1.0259464000000000 0.00000 - 1.0261765000000000 0.00000 - 1.0265029999999999 0.00000 - 1.0269877000000001 0.00000 - 1.0276935000000000 0.00000 - 1.0287056000000001 0.00000 - 1.0301511000000001 0.00000 - 1.0322286000000001 0.00000 - 1.0353458000000000 0.00000 - 1.0401423999999999 0.00000 - 1.0479670000000001 0.00000 - 1.0626272999999999 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CMSDY2D11.dat b/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CMSDY2D11.dat deleted file mode 100644 index ba53c54338..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CMSDY2D11.dat +++ /dev/null @@ -1,141 +0,0 @@ -******************************************************************************************* -SetName: CMSDY2D11 -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: 2014 -CodesUsed: FEWZ -TheoryInput: NNPDF2.3 NLO, alphas(MZ)=0.119 -PDFset: NNPDF23_nlo_as_0119 -Warnings: -******************************************************************************************** -1.0813606751 0.00000 -1.0893721223 0.00000 -1.0901773142 0.00000 -1.0888376576 0.00000 -1.087716985 0.00000 -1.0878591297 0.00000 -1.0894135413 0.00000 -1.0918751106 0.00000 -1.0944196619 0.00000 -1.0963365218 0.00000 -1.0973988195 0.00000 -1.0979899376 0.00000 -1.0988973639 0.00000 -1.1008192062 0.00000 -1.1037555663 0.00000 -1.106569096 0.00000 -1.1070488453 0.00000 -1.1026847656 0.00000 -1.0920416321 0.00000 -1.0763835283 0.00000 -1.0614378941 0.00000 -1.0599582542 0.00000 -1.0950965812 0.00000 -1.1342757992 0.00000 -0.9327474816 0.00000 -0.9364428947 0.00000 -0.9384197365 0.00000 -0.9388785783 0.00000 -0.9389851466 0.00000 -0.9397499516 0.00000 -0.9415453581 0.00000 -0.9440725316 0.00000 -0.946584383 0.00000 -0.9482273838 0.00000 -0.9483984281 0.00000 -0.9470158484 0.00000 -0.9446247093 0.00000 -0.9423219371 0.00000 -0.9415631018 0.00000 -0.9439426399 0.00000 -0.9510016392 0.00000 -0.9640318624 0.00000 -0.9837255224 0.00000 -1.0093368353 0.00000 -1.0367116294 0.00000 -1.0540551837 0.00000 -1.0319682554 0.00000 -0.8253684828 0.00000 -0.9434015456 0.00000 -0.9541351208 0.00000 -0.9614602509 0.00000 -0.9660484669 0.00000 -0.96860283 0.00000 -0.9697838993 0.00000 -0.9701706976 0.00000 -0.970248359 0.00000 -0.9704126661 0.00000 -0.9709834208 0.00000 -0.972221231 0.00000 -0.9743446495 0.00000 -0.9775463099 0.00000 -0.9820077919 0.00000 -0.9879136333 0.00000 -0.9954653713 0.00000 -1.0048969867 0.00000 -1.0164939293 0.00000 -1.0306197008 0.00000 -1.0477587845 0.00000 -1.0686005061 0.00000 -1.0942564223 0.00000 -1.1271511804 0.00000 -1.1805167802 0.00000 -0.977979346 0.00000 -0.9786802175 0.00000 -0.9795766087 0.00000 -0.9806481293 0.00000 -0.9818790922 0.00000 -0.9832577549 0.00000 -0.9847758356 0.00000 -0.9864282637 0.00000 -0.9882131536 0.00000 -0.9901320234 0.00000 -0.9921903195 0.00000 -0.9943983691 0.00000 -0.9967729843 0.00000 -0.9993401284 0.00000 -1.002139425 0.00000 -1.0052320514 0.00000 -1.0087152833 0.00000 -1.0127511593 0.00000 -1.017628208 0.00000 -1.0239111407 0.00000 -1.0328700847 0.00000 -1.0480732044 0.00000 -1.0848514418 0.00000 -1.4452649384 0.00000 -0.994 0.00000 -0.992 0.00000 -0.992 0.00000 -0.994 0.00000 -0.995 0.00000 -0.997 0.00000 -0.999 0.00000 -1.000 0.00000 -1.001 0.00000 -1.002 0.00000 -1.002 0.00000 -1.001 0.00000 -1.001 0.00000 -1.001 0.00000 -1.001 0.00000 -1.001 0.00000 -1.003 0.00000 -1.006 0.00000 -1.011 0.00000 -1.018 0.00000 -1.028 0.00000 -1.040 0.00000 -1.048 0.00000 -0.976 0.00000 -1.013 0.00000 -1.016 0.00000 -1.016 0.00000 -1.018 0.00000 -1.021 0.00000 -1.024 0.00000 -1.024 0.00000 -1.022 0.00000 -1.018 0.00000 -1.019 0.00000 -1.040 0.00000 -1.137 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CMSJETS11.dat b/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CMSJETS11.dat deleted file mode 100644 index d217eccf67..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CMSJETS11.dat +++ /dev/null @@ -1,142 +0,0 @@ -******************************************************************************************* -SetName: CMSJETS11 -Author: Stefano Carrazza and Joao Pires, stefano.carrazza@mi.infn.it and Joao.Pires@mib.infn.it -Date: Early 2014 -CodesUsed: Private gg->jj code from JP, validated with threshold approximation code from Vogelsang -TheoryInput: NNPDF2.3 NNLO, alphas(MZ)=0.119 -PDFset: NNPDF23_nnlo_as_0119 -Warnings: Uses pt_jet as central scale rather than pt_leading, to update once final pp -> jj code available -******************************************************************************************** -1.2659 0.00000 -1.2386 0.00000 -1.2168 0.00000 -1.1982 0.00000 -1.1823 0.00000 -1.1687 0.00000 -1.1591 0.00000 -1.1474 0.00000 -1.1402 0.00000 -1.1321 0.00000 -1.128 0.00000 -1.1207 0.00000 -1.1163 0.00000 -1.1115 0.00000 -1.1085 0.00000 -1.1051 0.00000 -1.1027 0.00000 -1.1029 0.00000 -1.0991 0.00000 -1.0986 0.00000 -1.0973 0.00000 -1.097 0.00000 -1.0984 0.00000 -1.0989 0.00000 -1.1009 0.00000 -1.1018 0.00000 -1.1035 0.00000 -1.1051 0.00000 -1.1081 0.00000 -1.1116 0.00000 -1.1166 0.00000 -1.1208 0.00000 -1.1339 0.00000 -1.3116 0.00000 -1.284 0.00000 -1.2606 0.00000 -1.2428 0.00000 -1.2259 0.00000 -1.2121 0.00000 -1.2015 0.00000 -1.1917 0.00000 -1.1815 0.00000 -1.174 0.00000 -1.1691 0.00000 -1.1646 0.00000 -1.1588 0.00000 -1.1557 0.00000 -1.1511 0.00000 -1.15 0.00000 -1.1497 0.00000 -1.1485 0.00000 -1.1477 0.00000 -1.1457 0.00000 -1.1459 0.00000 -1.1468 0.00000 -1.1478 0.00000 -1.1472 0.00000 -1.1502 0.00000 -1.1512 0.00000 -1.1535 0.00000 -1.1561 0.00000 -1.1577 0.00000 -1.1612 0.00000 -1.4093 0.00000 -1.3789 0.00000 -1.3522 0.00000 -1.3321 0.00000 -1.3168 0.00000 -1.3018 0.00000 -1.2892 0.00000 -1.2811 0.00000 -1.2737 0.00000 -1.2682 0.00000 -1.2664 0.00000 -1.2621 0.00000 -1.2627 0.00000 -1.2608 0.00000 -1.2611 0.00000 -1.2627 0.00000 -1.2645 0.00000 -1.2665 0.00000 -1.2708 0.00000 -1.2736 0.00000 -1.2782 0.00000 -1.2823 0.00000 -1.2876 0.00000 -1.2919 0.00000 -1.2965 0.00000 -1.2998 0.00000 -1.3084 0.00000 -1.5544 0.00000 -1.5253 0.00000 -1.5034 0.00000 -1.4828 0.00000 -1.4727 0.00000 -1.4619 0.00000 -1.458 0.00000 -1.454 0.00000 -1.4585 0.00000 -1.4631 0.00000 -1.4705 0.00000 -1.4771 0.00000 -1.4874 0.00000 -1.4985 0.00000 -1.5136 0.00000 -1.5283 0.00000 -1.5463 0.00000 -1.5663 0.00000 -1.5877 0.00000 -1.6082 0.00000 -1.6355 0.00000 -1.667 0.00000 -1.7052 0.00000 -1.776 0.00000 -1.7812 0.00000 -1.7645 0.00000 -1.7495 0.00000 -1.7521 0.00000 -1.7595 0.00000 -1.7722 0.00000 -1.7908 0.00000 -1.8194 0.00000 -1.8523 0.00000 -1.8915 0.00000 -1.9422 0.00000 -1.9919 0.00000 -2.049 0.00000 -2.1233 0.00000 -2.2112 0.00000 -2.3253 0.00000 -2.4816 0.00000 -2.6971 0.00000 -3.0712 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CMSWEASY840PB_WM.dat b/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CMSWEASY840PB_WM.dat deleted file mode 100644 index 650309a381..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CMSWEASY840PB_WM.dat +++ /dev/null @@ -1,20 +0,0 @@ -******************************************************************************************* -SetName: CMSWEASY840PB_WM -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: Early 2012 -CodesUsed: FEWZ -TheoryInput: NNPDF2.1 NNLO alphas(MZ)=0.119 -PDFset: NNPDF21_nnlo_as_0119 -Warnings: C-factors smeared to reduce stat fluctuations -******************************************************************************************** -1.0227853801540996 0.00000 -1.0247299810886719 0.00000 -1.0253651973471551 0.00000 -1.0252478141755952 0.00000 -1.0248360227280262 0.00000 -1.024489420066469 0.00000 -1.0244690091609314 0.00000 -1.0259578040378856 0.00000 -1.02749604530033 0.00000 -1.0294185492786998 0.00000 -1.0314933484829396 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CMSWEASY840PB_WP.dat b/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CMSWEASY840PB_WP.dat deleted file mode 100644 index 7d7625cfea..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CMSWEASY840PB_WP.dat +++ /dev/null @@ -1,20 +0,0 @@ -******************************************************************************************* -SetName: CMSWEASY840PB_WP -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: Early 2012 -CodesUsed: FEWZ -TheoryInput: NNPDF2.1 NNLO alphas(MZ)=0.119 -PDFset: NNPDF21_nnlo_as_0119 -Warnings: C-factors smeared to reduce stat fluctuations -******************************************************************************************** -1.0213057936299228 0.00000 -1.024221728269291 0.00000 -1.024932626178962 0.00000 -1.0246534529704248 0.00000 -1.0242341711441867 0.00000 -1.0241597400897704 0.00000 -1.0245501160857162 0.00000 -1.0253800987879413 0.00000 -1.0242346024963855 0.00000 -1.0203837072595225 0.00000 -1.0121223538009778 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CMSWMASY47FB_WM.dat b/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CMSWMASY47FB_WM.dat deleted file mode 100644 index 8206686f4b..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CMSWMASY47FB_WM.dat +++ /dev/null @@ -1,20 +0,0 @@ -******************************************************************************************* -SetName: CMSWMASY47FB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: 2014 -CodesUsed: FEWZ -TheoryInput: NNPDF2.3 NLO, alphas(MZ)=0.119 -PDFset: NNPDF23_nlo_as_0119 -Warnings: -******************************************************************************************** -1.02103437795 0.00000 -1.00313128705 0.00000 -0.995787000292 0.00000 -0.994831316313 0.00000 -0.996973696994 0.00000 -0.999742902899 0.00000 -1.00149693071 0.00000 -1.00141268824 0.00000 -0.9989982381 0.00000 -0.99478473306 0.00000 -0.991814315274 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CMSWMASY47FB_WP.dat b/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CMSWMASY47FB_WP.dat deleted file mode 100644 index 613b664fba..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_CMSWMASY47FB_WP.dat +++ /dev/null @@ -1,20 +0,0 @@ -******************************************************************************************* -SetName: CMSWMASY47FB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: 2014 -CodesUsed: FEWZ -TheoryInput: NNPDF2.3 NLO, alphas(MZ)=0.119 -PDFset: NNPDF23_nlo_as_0119 -Warnings: -******************************************************************************************** -1.02103437795 0.00000 -1.00313128705 0.00000 -0.995787000292 0.00000 -0.994831316313 0.00000 -0.996973696994 0.00000 -0.999742902899 0.00000 -1.00149693071 0.00000 -1.00141268824 0.00000 -0.9989982381 0.00000 -0.99478473306 0.00000 -0.991814315274 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_D0ZRAP.dat b/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_D0ZRAP.dat deleted file mode 100644 index 107487d1c8..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_D0ZRAP.dat +++ /dev/null @@ -1,37 +0,0 @@ -******************************************************************************************* -SetName: D0ZRAP -Author: Juan Rojo juan.rojo@physics.ox.ac.uk -Date: Early 2011 -CodesUsed: VRAP v0.9 -TheoryInput: Fixed muR and muF settings, as(MZ) = 0.119 -PDFset: Preliminary version of NNPDF2.1 NNLO -Warnings: To update with recent C-factors (NNPDFres paper) with dynamical central scale -******************************************************************************************** - 1.0235212000000000 0.00000 - 1.0235512000000000 0.00000 - 1.0236103999999999 0.00000 - 1.0237271999999999 0.00000 - 1.0238727999999999 0.00000 - 1.0240480999999999 0.00000 - 1.0242407000000000 0.00000 - 1.0244413000000001 0.00000 - 1.0246333999999999 0.00000 - 1.0248310000000000 0.00000 - 1.0250013000000000 0.00000 - 1.0251691999999999 0.00000 - 1.0253123000000000 0.00000 - 1.0254387000000000 0.00000 - 1.0255491000000001 0.00000 - 1.0256574000000001 0.00000 - 1.0257761000000001 0.00000 - 1.0259464000000000 0.00000 - 1.0261765000000000 0.00000 - 1.0265029999999999 0.00000 - 1.0269877000000001 0.00000 - 1.0276935000000000 0.00000 - 1.0287056000000001 0.00000 - 1.0301511000000001 0.00000 - 1.0322286000000001 0.00000 - 1.0353458000000000 0.00000 - 1.0401423999999999 0.00000 - 1.0479670000000001 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_D0ZRAP_TOT.dat b/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_D0ZRAP_TOT.dat deleted file mode 100644 index e943694273..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_D0ZRAP_TOT.dat +++ /dev/null @@ -1,37 +0,0 @@ -******************************************************************************************* -SetName: D0ZRAP_TOT -Author: Juan Rojo juan.rojo@physics.ox.ac.uk -Date: Early 2011 -CodesUsed: VRAP v0.9 -TheoryInput: Fixed muR and muF settings, as(MZ) = 0.119 -PDFset: Preliminary version of NNPDF2.1 NNLO -Warnings: To update with recent C-factors (NNPDFres paper) with dynamical central scale -******************************************************************************************** -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 -1.02362180802 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_LHCBW36PB.dat b/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_LHCBW36PB.dat deleted file mode 100644 index 60eca194fd..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_LHCBW36PB.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************************* -SetName: LHCBW36PB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: Early 2012 -CodesUsed: FEWZ (version?) -TheoryInput: NNPDF2.1 NNLO alphas(MZ)=0.119 -PDFset: NNPDF21_nnlo -Warnings: -******************************************************************************************** -1.00978 0.00000 -1.00185 0.00000 -1.00472 0.00000 -1.00543 0.00000 -1.02676 0.00000 -1.00440 0.00000 -0.99798 0.00000 -0.99600 0.00000 -0.99854 0.00000 -0.96613 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_LHCBZ940PB.dat b/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_LHCBZ940PB.dat deleted file mode 100644 index 969bcf1125..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/119CFAC/CF_QCD_LHCBZ940PB.dat +++ /dev/null @@ -1,18 +0,0 @@ -******************************************************************************************* -SetName: LHCBZ940PB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: 2014 -CodesUsed: FEWZ -TheoryInput: NNPDF2.3 NLO, alphas(MZ)=0.119 -PDFset: NNPDF23_nlo_as_0119 -Warnings: Smearing applied? Which version of FEWZ? -******************************************************************************************** -1.01205299745 0.00000 -1.00782920359 0.00000 -1.0017871254 0.00000 -0.994648434235 0.00000 -0.987825235422 0.00000 -0.981062962982 0.00000 -0.974107205125 0.00000 -0.969530625122 0.00000 -0.959893693805 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN01.dat b/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN01.dat deleted file mode 100644 index d7d6c2aac8..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN01.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN01 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0000 0.00000 -0.0000 0.00000 -0.0000 0.00000 -0.0000 0.00000 -0.0002 0.00000 -0.0006 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN02.dat b/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN02.dat deleted file mode 100644 index ad719fd3b1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN02.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN02 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0000 0.00000 -0.0000 0.00000 -0.0001 0.00000 -0.0015 0.00000 -0.0035 0.00000 -0.0052 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN03.dat b/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN03.dat deleted file mode 100644 index 14bda9be88..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN03.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN03 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0000 0.00000 -0.0000 0.00000 -0.0023 0.00000 -0.0078 0.00000 -0.0120 0.00000 -0.0125 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN04.dat b/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN04.dat deleted file mode 100644 index f1dbb802ba..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN04.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN04 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0000 0.00000 -0.0007 0.00000 -0.0105 0.00000 -0.0176 0.00000 -0.0207 0.00000 -0.0203 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN05.dat b/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN05.dat deleted file mode 100644 index 77c3aac13c..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN05.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN05 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0000 0.00000 -0.0071 0.00000 -0.0205 0.00000 -0.0270 0.00000 -0.0298 0.00000 -0.0268 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN06.dat b/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN06.dat deleted file mode 100644 index 565c19f43b..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN06.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN06 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0007 0.00000 -0.0188 0.00000 -0.0298 0.00000 -0.0364 0.00000 -0.0379 0.00000 -0.0336 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN07.dat b/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN07.dat deleted file mode 100644 index d4801d0ba6..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN07.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN07 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0064 0.00000 -0.0299 0.00000 -0.0384 0.00000 -0.0436 0.00000 -0.0455 0.00000 -0.0374 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN08.dat b/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN08.dat deleted file mode 100644 index 4cc8398804..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN08.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN08 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0175 0.00000 -0.0366 0.00000 -0.0456 0.00000 -0.0499 0.00000 -0.0518 0.00000 -0.0405 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN09.dat b/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN09.dat deleted file mode 100644 index 7f4a0e5495..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN09.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN09 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0304 0.00000 -0.0432 0.00000 -0.0510 0.00000 -0.0550 0.00000 -0.0544 0.00000 -0.0415 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN10.dat b/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN10.dat deleted file mode 100644 index 8eba95e506..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_D_BIN10.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN10 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0370 0.00000 -0.0471 0.00000 -0.0557 0.00000 -0.0591 0.00000 -0.0568 0.00000 -0.0413 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN01.dat b/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN01.dat deleted file mode 100644 index 39ca399219..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN01.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN01 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0000 0.00000 -0.0000 0.00000 -0.0000 0.00000 -0.0000 0.00000 -0.0002 0.00000 -0.0006 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN02.dat b/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN02.dat deleted file mode 100644 index 59c0490791..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN02.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN02 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0000 0.00000 -0.0000 0.00000 -0.0001 0.00000 -0.0015 0.00000 -0.0035 0.00000 -0.0052 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN03.dat b/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN03.dat deleted file mode 100644 index f30d443914..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN03.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN03 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0000 0.00000 -0.0000 0.00000 -0.0023 0.00000 -0.0078 0.00000 -0.0120 0.00000 -0.0125 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN04.dat b/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN04.dat deleted file mode 100644 index f4cf5b454d..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN04.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN04 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0000 0.00000 -0.0007 0.00000 -0.0105 0.00000 -0.0176 0.00000 -0.0207 0.00000 -0.0203 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN05.dat b/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN05.dat deleted file mode 100644 index a3cf9d57e6..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN05.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN05 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0000 0.00000 -0.0071 0.00000 -0.0205 0.00000 -0.0270 0.00000 -0.0298 0.00000 -0.0268 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN06.dat b/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN06.dat deleted file mode 100644 index d205bcb9a0..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN06.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN06 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0007 0.00000 -0.0188 0.00000 -0.0298 0.00000 -0.0364 0.00000 -0.0379 0.00000 -0.0336 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN07.dat b/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN07.dat deleted file mode 100644 index d78ba9fc67..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN07.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN07 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0064 0.00000 -0.0299 0.00000 -0.0384 0.00000 -0.0436 0.00000 -0.0455 0.00000 -0.0374 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN08.dat b/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN08.dat deleted file mode 100644 index 4213c51f6f..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN08.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN08 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0175 0.00000 -0.0366 0.00000 -0.0456 0.00000 -0.0499 0.00000 -0.0518 0.00000 -0.0405 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN09.dat b/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN09.dat deleted file mode 100644 index 79803c6687..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN09.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN09 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0304 0.00000 -0.0432 0.00000 -0.0510 0.00000 -0.0550 0.00000 -0.0544 0.00000 -0.0415 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN10.dat b/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN10.dat deleted file mode 100644 index 072120afb4..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_ACC_DYE906R_P_BIN10.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN10 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: acceptance factors given in Extended Data Tab.3 of arXiv:2103.04024 -TheoryInput: -PDFset: -Warnings: -******************************************************************************** -0.0370 0.00000 -0.0471 0.00000 -0.0557 0.00000 -0.0591 0.00000 -0.0568 0.00000 -0.0413 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_BCDMSD.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_BCDMSD.dat deleted file mode 100644 index 031ce6d311..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_BCDMSD.dat +++ /dev/null @@ -1,263 +0,0 @@ -******************************************************************************** -SetName: BCDMSD_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -0.99579 0.00000 -0.99466 0.00000 -0.99840 0.00000 -0.99723 0.00000 -0.99624 0.00000 -1.00119 0.00000 -1.00010 0.00000 -0.99901 0.00000 -0.99799 0.00000 -0.99709 0.00000 -1.00153 0.00000 -1.00067 0.00000 -0.99974 0.00000 -0.99881 0.00000 -0.99800 0.00000 -0.99713 0.00000 -0.99609 0.00000 -1.00017 0.00000 -0.99975 0.00000 -0.99918 0.00000 -0.99855 0.00000 -0.99796 0.00000 -0.99729 0.00000 -0.99632 0.00000 -0.99561 0.00000 -0.99484 0.00000 -0.99836 0.00000 -0.99816 0.00000 -0.99786 0.00000 -0.99755 0.00000 -0.99714 0.00000 -0.99632 0.00000 -0.99582 0.00000 -0.99523 0.00000 -0.99468 0.00000 -0.99412 0.00000 -0.99444 0.00000 -0.99444 0.00000 -0.99440 0.00000 -0.99434 0.00000 -0.99422 0.00000 -0.99365 0.00000 -0.99347 0.00000 -0.99324 0.00000 -0.99298 0.00000 -0.99271 0.00000 -0.99241 0.00000 -0.99213 0.00000 -0.98656 0.00000 -0.98728 0.00000 -0.98792 0.00000 -0.98845 0.00000 -0.98896 0.00000 -0.98893 0.00000 -0.98939 0.00000 -0.98983 0.00000 -0.99020 0.00000 -0.99050 0.00000 -0.99077 0.00000 -0.99099 0.00000 -0.99120 0.00000 -0.99138 0.00000 -0.96753 0.00000 -0.97033 0.00000 -0.97273 0.00000 -0.97524 0.00000 -0.97697 0.00000 -0.97933 0.00000 -0.98176 0.00000 -0.98391 0.00000 -0.98580 0.00000 -0.98760 0.00000 -0.98923 0.00000 -0.99071 0.00000 -0.99205 0.00000 -0.99332 0.00000 -0.97260 0.00000 -0.97774 0.00000 -0.98333 0.00000 -0.98824 0.00000 -0.99379 0.00000 -0.99969 0.00000 -1.00505 0.00000 -1.00991 0.00000 -1.01463 0.00000 -1.01906 0.00000 -1.02315 0.00000 -1.02692 0.00000 -1.03052 0.00000 -1.03402 0.00000 -1.16299 0.00000 -1.17618 0.00000 -1.18814 0.00000 -1.19977 0.00000 -1.21073 0.00000 -1.22090 0.00000 -1.23025 0.00000 -1.23919 0.00000 -1.24788 0.00000 -0.99206 0.00000 -0.99164 0.00000 -0.99377 0.00000 -0.99306 0.00000 -0.99239 0.00000 -0.99616 0.00000 -0.99519 0.00000 -0.99432 0.00000 -0.99342 0.00000 -0.99713 0.00000 -0.99609 0.00000 -0.99521 0.00000 -0.99430 0.00000 -0.99346 0.00000 -0.99268 0.00000 -0.99561 0.00000 -0.99484 0.00000 -0.99409 0.00000 -0.99340 0.00000 -0.99271 0.00000 -0.99205 0.00000 -0.99582 0.00000 -0.99523 0.00000 -0.99468 0.00000 -0.99412 0.00000 -0.99355 0.00000 -0.99298 0.00000 -0.99243 0.00000 -0.99192 0.00000 -0.99324 0.00000 -0.99298 0.00000 -0.99271 0.00000 -0.99241 0.00000 -0.99213 0.00000 -0.99182 0.00000 -0.99153 0.00000 -0.99123 0.00000 -0.99094 0.00000 -0.98983 0.00000 -0.99020 0.00000 -0.99050 0.00000 -0.99077 0.00000 -0.99099 0.00000 -0.99120 0.00000 -0.99138 0.00000 -0.99159 0.00000 -0.99174 0.00000 -0.99190 0.00000 -0.98176 0.00000 -0.98391 0.00000 -0.98580 0.00000 -0.98760 0.00000 -0.98923 0.00000 -0.99071 0.00000 -0.99205 0.00000 -0.99332 0.00000 -0.99454 0.00000 -0.99577 0.00000 -0.99711 0.00000 -0.99969 0.00000 -1.00505 0.00000 -1.00991 0.00000 -1.01463 0.00000 -1.01906 0.00000 -1.02315 0.00000 -1.02692 0.00000 -1.03052 0.00000 -1.03402 0.00000 -1.03762 0.00000 -1.04144 0.00000 -1.18814 0.00000 -1.19977 0.00000 -1.21073 0.00000 -1.22090 0.00000 -1.23025 0.00000 -1.23919 0.00000 -1.24788 0.00000 -1.25684 0.00000 -1.26632 0.00000 -0.99112 0.00000 -0.99056 0.00000 -0.99262 0.00000 -0.99190 0.00000 -0.99121 0.00000 -0.99058 0.00000 -0.99346 0.00000 -0.99268 0.00000 -0.99194 0.00000 -0.99125 0.00000 -0.99060 0.00000 -0.99409 0.00000 -0.99340 0.00000 -0.99271 0.00000 -0.99205 0.00000 -0.99143 0.00000 -0.99085 0.00000 -0.99031 0.00000 -0.99468 0.00000 -0.99412 0.00000 -0.99355 0.00000 -0.99298 0.00000 -0.99243 0.00000 -0.99192 0.00000 -0.99142 0.00000 -0.99093 0.00000 -0.99042 0.00000 -0.99271 0.00000 -0.99241 0.00000 -0.99213 0.00000 -0.99182 0.00000 -0.99153 0.00000 -0.99123 0.00000 -0.99094 0.00000 -0.99064 0.00000 -0.99031 0.00000 -0.99050 0.00000 -0.99077 0.00000 -0.99099 0.00000 -0.99120 0.00000 -0.99138 0.00000 -0.99159 0.00000 -0.99174 0.00000 -0.99190 0.00000 -0.99208 0.00000 -0.99231 0.00000 -0.98580 0.00000 -0.98760 0.00000 -0.98923 0.00000 -0.99071 0.00000 -0.99205 0.00000 -0.99332 0.00000 -0.99454 0.00000 -0.99577 0.00000 -0.99711 0.00000 -0.99877 0.00000 -1.00047 0.00000 -1.01463 0.00000 -1.01906 0.00000 -1.02315 0.00000 -1.02692 0.00000 -1.03052 0.00000 -1.03402 0.00000 -1.03762 0.00000 -1.04144 0.00000 -1.04634 0.00000 -1.05143 0.00000 -1.21073 0.00000 -1.22090 0.00000 -1.23025 0.00000 -1.23919 0.00000 -1.24788 0.00000 -1.25684 0.00000 -1.26632 0.00000 -1.27844 0.00000 -1.29094 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE886R_D.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE886R_D.dat deleted file mode 100644 index 89547b01b5..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE886R_D.dat +++ /dev/null @@ -1,24 +0,0 @@ -******************************************************************************** -SetName: DYE886R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -0.91877 0.00000 -0.95867 0.00000 -0.96999 0.00000 -0.97256 0.00000 -0.97029 0.00000 -0.96768 0.00000 -0.96536 0.00000 -0.96404 0.00000 -0.96185 0.00000 -0.95957 0.00000 -0.95549 0.00000 -0.95105 0.00000 -0.94652 0.00000 -0.95347 0.00000 -0.93102 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE886R_P.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE886R_P.dat deleted file mode 100644 index c7483e4769..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE886R_P.dat +++ /dev/null @@ -1,24 +0,0 @@ -******************************************************************************** -SetName: DYE886R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN01.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN01.dat deleted file mode 100644 index a9f5983ae1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN01.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.03295 0.00000 -1.00381 0.00000 -1.00724 0.00000 -1.01601 0.00000 -1.00514 0.00000 -0.90877 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN02.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN02.dat deleted file mode 100644 index a9f5983ae1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN02.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.03295 0.00000 -1.00381 0.00000 -1.00724 0.00000 -1.01601 0.00000 -1.00514 0.00000 -0.90877 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN03.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN03.dat deleted file mode 100644 index a9f5983ae1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN03.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.03295 0.00000 -1.00381 0.00000 -1.00724 0.00000 -1.01601 0.00000 -1.00514 0.00000 -0.90877 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN04.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN04.dat deleted file mode 100644 index a9f5983ae1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN04.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.03295 0.00000 -1.00381 0.00000 -1.00724 0.00000 -1.01601 0.00000 -1.00514 0.00000 -0.90877 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN05.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN05.dat deleted file mode 100644 index a9f5983ae1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN05.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.03295 0.00000 -1.00381 0.00000 -1.00724 0.00000 -1.01601 0.00000 -1.00514 0.00000 -0.90877 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN06.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN06.dat deleted file mode 100644 index a9f5983ae1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN06.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.03295 0.00000 -1.00381 0.00000 -1.00724 0.00000 -1.01601 0.00000 -1.00514 0.00000 -0.90877 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN07.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN07.dat deleted file mode 100644 index a9f5983ae1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN07.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.03295 0.00000 -1.00381 0.00000 -1.00724 0.00000 -1.01601 0.00000 -1.00514 0.00000 -0.90877 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN08.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN08.dat deleted file mode 100644 index a9f5983ae1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN08.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.03295 0.00000 -1.00381 0.00000 -1.00724 0.00000 -1.01601 0.00000 -1.00514 0.00000 -0.90877 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN09.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN09.dat deleted file mode 100644 index a9f5983ae1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN09.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.03295 0.00000 -1.00381 0.00000 -1.00724 0.00000 -1.01601 0.00000 -1.00514 0.00000 -0.90877 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN10.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN10.dat deleted file mode 100644 index a9f5983ae1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_D_BIN10.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.03295 0.00000 -1.00381 0.00000 -1.00724 0.00000 -1.01601 0.00000 -1.00514 0.00000 -0.90877 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN01.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN01.dat deleted file mode 100644 index 3e69b2ca33..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN01.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 - diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN02.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN02.dat deleted file mode 100644 index 3e69b2ca33..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN02.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 - diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN03.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN03.dat deleted file mode 100644 index 3e69b2ca33..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN03.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 - diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN04.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN04.dat deleted file mode 100644 index 3e69b2ca33..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN04.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 - diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN05.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN05.dat deleted file mode 100644 index 3e69b2ca33..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN05.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 - diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN06.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN06.dat deleted file mode 100644 index 3e69b2ca33..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN06.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 - diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN07.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN07.dat deleted file mode 100644 index 3e69b2ca33..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN07.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 - diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN08.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN08.dat deleted file mode 100644 index 3e69b2ca33..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN08.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 - diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN09.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN09.dat deleted file mode 100644 index 3e69b2ca33..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN09.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 - diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN10.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN10.dat deleted file mode 100644 index 3e69b2ca33..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_DYE906R_P_BIN10.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: DYE906R_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 - diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_NMCPD_D.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_NMCPD_D.dat deleted file mode 100644 index 1cbbb6d5e6..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_NMCPD_D.dat +++ /dev/null @@ -1,269 +0,0 @@ -******************************************************************************** -SetName: NMCPD_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.97898 0.00000 -0.97733 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.00268 0.00000 -0.99923 0.00000 -0.99609 0.00000 -0.99412 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01179 0.00000 -1.00743 0.00000 -1.00392 0.00000 -1.00162 0.00000 -0.99962 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01302 0.00000 -1.00872 0.00000 -1.00511 0.00000 -1.00293 0.00000 -1.00099 0.00000 -0.99946 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.00998 0.00000 -1.00586 0.00000 -1.00252 0.00000 -1.00042 0.00000 -0.99863 0.00000 -0.99727 0.00000 -0.99637 0.00000 -0.99589 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.00712 0.00000 -1.00348 0.00000 -1.00027 0.00000 -0.99821 0.00000 -0.99630 0.00000 -0.99475 0.00000 -0.99367 0.00000 -0.99293 0.00000 -0.99250 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.00785 0.00000 -1.00483 0.00000 -1.00179 0.00000 -0.99961 0.00000 -0.99739 0.00000 -0.99541 0.00000 -0.99384 0.00000 -0.99255 0.00000 -0.99157 0.00000 -0.99086 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01062 0.00000 -1.00834 0.00000 -1.00559 0.00000 -1.00339 0.00000 -1.00092 0.00000 -0.99851 0.00000 -0.99653 0.00000 -0.99468 0.00000 -0.99312 0.00000 -0.99188 0.00000 -0.99090 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01222 0.00000 -1.01108 0.00000 -1.00892 0.00000 -1.00691 0.00000 -1.00448 0.00000 -1.00183 0.00000 -0.99954 0.00000 -0.99735 0.00000 -0.99535 0.00000 -0.99361 0.00000 -0.99221 0.00000 -0.99124 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.00968 0.00000 -1.01058 0.00000 -1.00999 0.00000 -1.00882 0.00000 -1.00699 0.00000 -1.00462 0.00000 -1.00235 0.00000 -0.99997 0.00000 -0.99769 0.00000 -0.99555 0.00000 -0.99383 0.00000 -0.99235 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.99933 0.00000 -1.00266 0.00000 -1.00449 0.00000 -1.00499 0.00000 -1.00469 0.00000 -1.00354 0.00000 -1.00205 0.00000 -1.00014 0.00000 -0.99809 0.00000 -0.99596 0.00000 -0.99423 0.00000 -0.99268 0.00000 -0.99125 0.00000 -0.00000 0.00000 -0.98828 0.00000 -0.99342 0.00000 -0.99696 0.00000 -0.99884 0.00000 -1.00010 0.00000 -1.00040 0.00000 -1.00003 0.00000 -0.99905 0.00000 -0.99766 0.00000 -0.99586 0.00000 -0.99443 0.00000 -0.99306 0.00000 -0.99170 0.00000 -0.98582 0.00000 -0.98951 0.00000 -0.99299 0.00000 -0.99509 0.00000 -0.99681 0.00000 -0.99793 0.00000 -0.99833 0.00000 -0.99812 0.00000 -0.99742 0.00000 -0.99608 0.00000 -0.99501 0.00000 -0.99389 0.00000 -0.99273 0.00000 -0.99145 0.00000 -0.99156 0.00000 -0.99282 0.00000 -0.99364 0.00000 -0.99428 0.00000 -0.99475 0.00000 -0.99504 0.00000 -0.99512 0.00000 -0.99497 0.00000 -0.99424 0.00000 -0.99379 0.00000 -0.99321 0.00000 -0.99262 0.00000 -0.99176 0.00000 -0.97271 0.00000 -0.97591 0.00000 -0.97964 0.00000 -0.98284 0.00000 -0.98532 0.00000 -0.98739 0.00000 -0.98901 0.00000 -0.98980 0.00000 -0.99079 0.00000 -0.99151 0.00000 -0.99207 0.00000 -0.99272 0.00000 -0.94272 0.00000 -0.94765 0.00000 -0.95418 0.00000 -0.96042 0.00000 -0.96700 0.00000 -0.97325 0.00000 -0.97835 0.00000 -0.98318 0.00000 -0.98706 0.00000 -0.99055 0.00000 -0.99479 0.00000 -0.94297 0.00000 -0.95511 0.00000 -0.96871 0.00000 -0.98371 0.00000 -0.99936 0.00000 -1.01364 0.00000 -1.02717 0.00000 -1.03907 0.00000 -1.05033 0.00000 -1.06469 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_NMCPD_P.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_NMCPD_P.dat deleted file mode 100644 index 4b6cb2f734..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_NMCPD_P.dat +++ /dev/null @@ -1,269 +0,0 @@ -******************************************************************************** -SetName: NMCPD_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 \ No newline at end of file diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_SLACD.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUI_SLACD.dat deleted file mode 100644 index 0555e65e13..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUI_SLACD.dat +++ /dev/null @@ -1,220 +0,0 @@ -******************************************************************************** -SetName: SLACD_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 -PDFset: -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01153 0.00000 -1.01036 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.00959 0.00000 -1.00999 0.00000 -1.01010 0.00000 -1.01003 0.00000 -1.00980 0.00000 -1.00882 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.99435 0.00000 -0.99633 0.00000 -0.99758 0.00000 -0.99893 0.00000 -1.00079 0.00000 -1.00150 0.00000 -1.00222 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.98972 0.00000 -0.99117 0.00000 -0.99301 0.00000 -0.99474 0.00000 -0.99626 0.00000 -0.99757 0.00000 -0.99873 0.00000 -0.99921 0.00000 -0.99972 0.00000 -1.00003 0.00000 -1.00064 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.98764 0.00000 -0.98886 0.00000 -0.98991 0.00000 -0.99266 0.00000 -0.99386 0.00000 -0.99492 0.00000 -0.99610 0.00000 -0.99685 0.00000 -0.99740 0.00000 -0.99780 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.98935 0.00000 -0.99030 0.00000 -0.99090 0.00000 -0.99154 0.00000 -0.99209 0.00000 -0.99283 0.00000 -0.99325 0.00000 -0.99345 0.00000 -0.99373 0.00000 -0.99392 0.00000 -0.99413 0.00000 -0.99421 0.00000 -0.99431 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.96871 0.00000 -0.97079 0.00000 -0.97406 0.00000 -0.97545 0.00000 -0.97642 0.00000 -0.97755 0.00000 -0.97850 0.00000 -0.97949 0.00000 -0.98066 0.00000 -0.98193 0.00000 -0.98270 0.00000 -0.98343 0.00000 -0.98423 0.00000 -0.98494 0.00000 -0.98560 0.00000 -0.98627 0.00000 -0.98728 0.00000 -0.98774 0.00000 -0.00000 0.00000 -0.93389 0.00000 -0.93467 0.00000 -0.93546 0.00000 -0.93652 0.00000 -0.94007 0.00000 -0.94148 0.00000 -0.94325 0.00000 -0.94516 0.00000 -0.94978 0.00000 -0.95271 0.00000 -0.95466 0.00000 -0.95714 0.00000 -0.95921 0.00000 -0.96182 0.00000 -0.96390 0.00000 -0.96609 0.00000 -0.96840 0.00000 -0.96996 0.00000 -0.97147 0.00000 -0.97326 0.00000 -0.91472 0.00000 -0.91617 0.00000 -0.91958 0.00000 -0.92385 0.00000 -0.92721 0.00000 -0.93020 0.00000 -0.93704 0.00000 -0.94044 0.00000 -0.94614 0.00000 -0.95009 0.00000 -0.95409 0.00000 -0.96049 0.00000 -0.96408 0.00000 -0.96746 0.00000 -0.97229 0.00000 -0.97600 0.00000 -0.98146 0.00000 -0.98474 0.00000 -0.95104 0.00000 -0.97108 0.00000 -0.98162 0.00000 -0.99224 0.00000 -1.00246 0.00000 -1.01597 0.00000 -1.03256 0.00000 -1.04820 0.00000 -1.06314 0.00000 -1.07548 0.00000 -1.08534 0.00000 -1.09436 0.00000 -1.10396 0.00000 -1.11295 0.00000 -1.12168 0.00000 -1.13430 0.00000 -1.14384 0.00000 -1.37124 0.00000 -1.41055 0.00000 -1.44785 0.00000 -1.50059 0.00000 -1.53980 0.00000 -1.56776 0.00000 -1.60603 0.00000 -1.63456 0.00000 -1.68894 0.00000 -1.75823 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUT_BCDMSD.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUT_BCDMSD.dat deleted file mode 100644 index a1b17f7aa1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUT_BCDMSD.dat +++ /dev/null @@ -1,263 +0,0 @@ -******************************************************************************************* -SetName: BCDMSD -Author: Juan Rojo juan.rojo@physics.ox.ac.uk -Date: 2016 -CodesUsed: None -TheoryInput: MMHT14 NLO fitted functional form for deuteron nuclear correction -PDFset: MMHT14 NLO -Warnings: Normalisation corrections for APPLgrid -******************************************************************************************** -1.00544 0.00000 -1.00544 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.00264 0.00000 -1.00264 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUT_NMCPD.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUT_NMCPD.dat deleted file mode 100644 index f05bb20acd..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUT_NMCPD.dat +++ /dev/null @@ -1,269 +0,0 @@ -******************************************************************************************* -SetName: NMCPD -Author: Juan Rojo juan.rojo@physics.ox.ac.uk -Date: 2016 -CodesUsed: None -TheoryInput: MMHT14 NLO fitted functional form for deuteron nuclear correction -PDFset: MMHT14 NLO -Warnings: Normalisation corrections for APPLgrid -******************************************************************************************** -0.991947 0.00000 -0.991947 0.00000 -0.991947 0.00000 -0.991947 0.00000 -0.991947 0.00000 -0.99706 0.00000 -0.99706 0.00000 -0.99706 0.00000 -0.99706 0.00000 -0.99706 0.00000 -0.99706 0.00000 -0.99706 0.00000 -1.00011 0.00000 -1.00011 0.00000 -1.00011 0.00000 -1.00011 0.00000 -1.00011 0.00000 -1.00011 0.00000 -1.00011 0.00000 -1.00011 0.00000 -1.00011 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00238 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00406 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00501 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00574 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.00615 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.0063 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00366 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -1.00156 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.993784 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -1.02506 0.00000 -1.02506 0.00000 -1.02506 0.00000 -1.02506 0.00000 -1.02506 0.00000 -1.02506 0.00000 -1.02506 0.00000 -1.02506 0.00000 -1.02506 0.00000 -1.02506 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEUT_SLACD.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEUT_SLACD.dat deleted file mode 100644 index 91d741c718..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEUT_SLACD.dat +++ /dev/null @@ -1,220 +0,0 @@ -******************************************************************************************* -SetName: SLACD -Author: Juan Rojo juan.rojo@physics.ox.ac.uk -Date: 2016 -CodesUsed: None -TheoryInput: MMHT14 NLO fitted functional form for deuteron nuclear correction -PDFset: MMHT14 NLO -Warnings: Normalisation corrections for APPLgrid -******************************************************************************************** -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00544 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -1.00264 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.998214 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.991641 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.989045 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.984147 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.977627 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.971856 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -0.976115 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.0087 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.10611 0.00000 -1.32955 0.00000 -1.32955 0.00000 -1.32955 0.00000 -1.32955 0.00000 -1.32955 0.00000 -1.32955 0.00000 -1.32955 0.00000 -1.32955 0.00000 -1.32955 0.00000 -1.32955 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEU_BCDMSD.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEU_BCDMSD.dat deleted file mode 100644 index c708a5d125..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEU_BCDMSD.dat +++ /dev/null @@ -1,263 +0,0 @@ -******************************************************************************** -SetName: BCDMSD_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.99816 0.00000 -0.99695 0.00000 -0.99613 0.00000 -0.99417 0.00000 -0.99260 0.00000 -0.99154 0.00000 -0.99008 0.00000 -0.98886 0.00000 -0.98779 0.00000 -0.98693 0.00000 -0.99225 0.00000 -0.99051 0.00000 -0.98876 0.00000 -0.98714 0.00000 -0.98581 0.00000 -0.98448 0.00000 -0.98335 0.00000 -0.99617 0.00000 -0.99514 0.00000 -0.99390 0.00000 -0.99259 0.00000 -0.99141 0.00000 -0.99009 0.00000 -0.98872 0.00000 -0.98735 0.00000 -0.98594 0.00000 -0.99670 0.00000 -0.99572 0.00000 -0.99472 0.00000 -0.99380 0.00000 -0.99273 0.00000 -0.99129 0.00000 -0.99010 0.00000 -0.98876 0.00000 -0.98751 0.00000 -0.98629 0.00000 -0.99603 0.00000 -0.99548 0.00000 -0.99479 0.00000 -0.99412 0.00000 -0.99322 0.00000 -0.99158 0.00000 -0.99049 0.00000 -0.98921 0.00000 -0.98796 0.00000 -0.98680 0.00000 -0.98566 0.00000 -0.98456 0.00000 -0.99272 0.00000 -0.99335 0.00000 -0.99339 0.00000 -0.99314 0.00000 -0.99264 0.00000 -0.99160 0.00000 -0.99120 0.00000 -0.99070 0.00000 -0.99013 0.00000 -0.98955 0.00000 -0.98894 0.00000 -0.98848 0.00000 -0.98804 0.00000 -0.98762 0.00000 -0.97856 0.00000 -0.98162 0.00000 -0.98393 0.00000 -0.98581 0.00000 -0.98625 0.00000 -0.98743 0.00000 -0.98865 0.00000 -0.98964 0.00000 -0.99041 0.00000 -0.99106 0.00000 -0.99163 0.00000 -0.99239 0.00000 -0.99309 0.00000 -0.99375 0.00000 -0.99699 0.00000 -1.00206 0.00000 -1.00654 0.00000 -1.01001 0.00000 -1.01321 0.00000 -1.01649 0.00000 -1.01968 0.00000 -1.02256 0.00000 -1.02525 0.00000 -1.02769 0.00000 -1.03012 0.00000 -1.03257 0.00000 -1.03503 0.00000 -1.03743 0.00000 -1.12475 0.00000 -1.13257 0.00000 -1.14064 0.00000 -1.14887 0.00000 -1.15710 0.00000 -1.16523 0.00000 -1.17549 0.00000 -1.18762 0.00000 -1.20075 0.00000 -0.99261 0.00000 -0.99178 0.00000 -0.98902 0.00000 -0.98820 0.00000 -0.98760 0.00000 -0.98609 0.00000 -0.98537 0.00000 -0.98451 0.00000 -0.98364 0.00000 -0.98448 0.00000 -0.98335 0.00000 -0.98216 0.00000 -0.98098 0.00000 -0.97995 0.00000 -0.97905 0.00000 -0.98735 0.00000 -0.98594 0.00000 -0.98465 0.00000 -0.98348 0.00000 -0.98234 0.00000 -0.98127 0.00000 -0.99010 0.00000 -0.98876 0.00000 -0.98751 0.00000 -0.98629 0.00000 -0.98507 0.00000 -0.98389 0.00000 -0.98276 0.00000 -0.98171 0.00000 -0.98921 0.00000 -0.98796 0.00000 -0.98680 0.00000 -0.98566 0.00000 -0.98456 0.00000 -0.98347 0.00000 -0.98243 0.00000 -0.98141 0.00000 -0.98041 0.00000 -0.99069 0.00000 -0.99013 0.00000 -0.98955 0.00000 -0.98894 0.00000 -0.98848 0.00000 -0.98804 0.00000 -0.98762 0.00000 -0.98725 0.00000 -0.98685 0.00000 -0.98644 0.00000 -0.98865 0.00000 -0.98964 0.00000 -0.99041 0.00000 -0.99106 0.00000 -0.99163 0.00000 -0.99239 0.00000 -0.99309 0.00000 -0.99375 0.00000 -0.99438 0.00000 -0.99504 0.00000 -0.99576 0.00000 -1.01649 0.00000 -1.01968 0.00000 -1.02256 0.00000 -1.02525 0.00000 -1.02769 0.00000 -1.03012 0.00000 -1.03257 0.00000 -1.03503 0.00000 -1.03743 0.00000 -1.03994 0.00000 -1.04263 0.00000 -1.14064 0.00000 -1.14887 0.00000 -1.15710 0.00000 -1.16523 0.00000 -1.17549 0.00000 -1.18762 0.00000 -1.20075 0.00000 -1.21480 0.00000 -1.23065 0.00000 -0.98627 0.00000 -0.98568 0.00000 -0.98288 0.00000 -0.98220 0.00000 -0.98155 0.00000 -0.98095 0.00000 -0.97995 0.00000 -0.97905 0.00000 -0.97822 0.00000 -0.97746 0.00000 -0.97676 0.00000 -0.98465 0.00000 -0.98348 0.00000 -0.98234 0.00000 -0.98127 0.00000 -0.98027 0.00000 -0.97935 0.00000 -0.97847 0.00000 -0.98751 0.00000 -0.98629 0.00000 -0.98507 0.00000 -0.98389 0.00000 -0.98276 0.00000 -0.98171 0.00000 -0.98069 0.00000 -0.97968 0.00000 -0.97862 0.00000 -0.98680 0.00000 -0.98566 0.00000 -0.98456 0.00000 -0.98347 0.00000 -0.98243 0.00000 -0.98141 0.00000 -0.98041 0.00000 -0.97936 0.00000 -0.97823 0.00000 -0.98955 0.00000 -0.98894 0.00000 -0.98848 0.00000 -0.98804 0.00000 -0.98762 0.00000 -0.98725 0.00000 -0.98685 0.00000 -0.98644 0.00000 -0.98601 0.00000 -0.98546 0.00000 -0.99041 0.00000 -0.99106 0.00000 -0.99163 0.00000 -0.99239 0.00000 -0.99309 0.00000 -0.99375 0.00000 -0.99438 0.00000 -0.99504 0.00000 -0.99576 0.00000 -0.99668 0.00000 -0.99764 0.00000 -1.02525 0.00000 -1.02769 0.00000 -1.03012 0.00000 -1.03257 0.00000 -1.03503 0.00000 -1.03743 0.00000 -1.03994 0.00000 -1.04263 0.00000 -1.04615 0.00000 -1.04986 0.00000 -1.15710 0.00000 -1.16523 0.00000 -1.17549 0.00000 -1.18762 0.00000 -1.20075 0.00000 -1.21480 0.00000 -1.23065 0.00000 -1.25222 0.00000 -1.27591 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEU_DYE886R_D.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEU_DYE886R_D.dat deleted file mode 100644 index aeda079b64..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEU_DYE886R_D.dat +++ /dev/null @@ -1,24 +0,0 @@ -******************************************************************************** -SetName: DYE886R_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.975621 0.00000 -0.980274 0.00000 -0.994362 0.00000 -0.991678 0.00000 -0.993497 0.00000 -0.976795 0.00000 -0.981990 0.00000 -0.992045 0.00000 -0.991585 0.00000 -0.994908 0.00000 -1.006980 0.00000 -1.003970 0.00000 -1.002800 0.00000 -0.961659 0.00000 -0.830935 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEU_DYE886R_P.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEU_DYE886R_P.dat deleted file mode 100644 index 6152cb85be..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEU_DYE886R_P.dat +++ /dev/null @@ -1,24 +0,0 @@ -******************************************************************************** -SetName: DYE886R_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEU_NMCPD_D.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEU_NMCPD_D.dat deleted file mode 100644 index 11db1f581e..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEU_NMCPD_D.dat +++ /dev/null @@ -1,269 +0,0 @@ -******************************************************************************** -SetName: NMCPD_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.07453 0.00000 -1.05207 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01215 0.00000 -1.00618 0.00000 -1.00035 0.00000 -0.99647 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01698 0.00000 -1.01094 0.00000 -1.00514 0.00000 -1.00079 0.00000 -0.99660 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01994 0.00000 -1.01401 0.00000 -1.00829 0.00000 -1.00428 0.00000 -1.00016 0.00000 -0.99621 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01029 0.00000 -1.01022 0.00000 -1.00634 0.00000 -1.00364 0.00000 -1.00099 0.00000 -0.99831 0.00000 -0.99586 0.00000 -0.99381 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.03063 0.00000 -1.02017 0.00000 -1.01280 0.00000 -1.00719 0.00000 -1.00173 0.00000 -0.99673 0.00000 -0.99400 0.00000 -0.99206 0.00000 -0.99050 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.02178 0.00000 -1.01338 0.00000 -1.00750 0.00000 -1.00442 0.00000 -1.00187 0.00000 -1.00014 0.00000 -0.99790 0.00000 -0.99534 0.00000 -0.99328 0.00000 -0.99164 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.02975 0.00000 -1.01998 0.00000 -1.01093 0.00000 -1.00552 0.00000 -1.00089 0.00000 -0.99708 0.00000 -0.99422 0.00000 -0.99219 0.00000 -0.99065 0.00000 -0.98958 0.00000 -0.98870 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.03428 0.00000 -1.02489 0.00000 -1.01774 0.00000 -1.01269 0.00000 -1.00716 0.00000 -1.00231 0.00000 -0.99871 0.00000 -0.99573 0.00000 -0.99329 0.00000 -0.99145 0.00000 -0.98993 0.00000 -0.98892 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.02609 0.00000 -1.01962 0.00000 -1.01410 0.00000 -1.01044 0.00000 -1.00646 0.00000 -1.00179 0.00000 -0.99809 0.00000 -0.99483 0.00000 -0.99240 0.00000 -0.99053 0.00000 -0.98895 0.00000 -0.98762 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.02156 0.00000 -1.01917 0.00000 -1.01460 0.00000 -1.01057 0.00000 -1.00580 0.00000 -1.00139 0.00000 -0.99785 0.00000 -0.99448 0.00000 -0.99155 0.00000 -0.98924 0.00000 -0.98740 0.00000 -0.98589 0.00000 -0.98454 0.00000 -0.00000 0.00000 -0.98674 0.00000 -0.99517 0.00000 -0.99917 0.00000 -1.00016 0.00000 -1.00095 0.00000 -1.00072 0.00000 -0.99935 0.00000 -0.99721 0.00000 -0.99469 0.00000 -0.99200 0.00000 -0.98963 0.00000 -0.98753 0.00000 -0.98551 0.00000 -0.97613 0.00000 -0.98656 0.00000 -0.99366 0.00000 -0.99695 0.00000 -0.99893 0.00000 -1.00026 0.00000 -1.00039 0.00000 -0.99888 0.00000 -0.99660 0.00000 -0.99390 0.00000 -0.99166 0.00000 -0.98945 0.00000 -0.98721 0.00000 -0.98475 0.00000 -0.99590 0.00000 -0.99281 0.00000 -0.99164 0.00000 -0.99332 0.00000 -0.99411 0.00000 -0.99515 0.00000 -0.99503 0.00000 -0.99406 0.00000 -0.99227 0.00000 -0.99084 0.00000 -0.98918 0.00000 -0.98741 0.00000 -0.98495 0.00000 -0.99118 0.00000 -0.99138 0.00000 -0.99040 0.00000 -0.99031 0.00000 -0.99078 0.00000 -0.99201 0.00000 -0.99124 0.00000 -0.98949 0.00000 -0.98819 0.00000 -0.98673 0.00000 -0.98520 0.00000 -0.98321 0.00000 -0.95063 0.00000 -0.95487 0.00000 -0.96023 0.00000 -0.96700 0.00000 -0.97463 0.00000 -0.98130 0.00000 -0.98437 0.00000 -0.98680 0.00000 -0.98883 0.00000 -0.99040 0.00000 -0.99197 0.00000 -0.99940 0.00000 -0.99710 0.00000 -0.99596 0.00000 -0.99461 0.00000 -0.99795 0.00000 -1.00262 0.00000 -1.00921 0.00000 -1.01578 0.00000 -1.02098 0.00000 -1.02742 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEU_NMCPD_P.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEU_NMCPD_P.dat deleted file mode 100644 index 547b589c34..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEU_NMCPD_P.dat +++ /dev/null @@ -1,269 +0,0 @@ -******************************************************************************** -SetName: NMCPD_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 -1.00000 0.00000 \ No newline at end of file diff --git a/nnpdfcpp/data/NNLOCFAC/CF_DEU_SLACD.dat b/nnpdfcpp/data/NNLOCFAC/CF_DEU_SLACD.dat deleted file mode 100644 index ded00f3a61..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_DEU_SLACD.dat +++ /dev/null @@ -1,220 +0,0 @@ -******************************************************************************** -SetName: SLACD_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.03254 0.00000 -1.02777 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.02971 0.00000 -1.02777 0.00000 -1.02419 0.00000 -1.01956 0.00000 -1.01596 0.00000 -1.01012 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.99780 0.00000 -0.99885 0.00000 -0.99947 0.00000 -1.00023 0.00000 -1.00111 0.00000 -1.00099 0.00000 -1.00069 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.98520 0.00000 -0.98757 0.00000 -0.98925 0.00000 -0.99097 0.00000 -0.99273 0.00000 -0.99434 0.00000 -0.99581 0.00000 -0.99650 0.00000 -0.99720 0.00000 -0.99756 0.00000 -0.99815 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.97982 0.00000 -0.98358 0.00000 -0.98671 0.00000 -0.99229 0.00000 -0.99424 0.00000 -0.99579 0.00000 -0.99743 0.00000 -0.99851 0.00000 -0.99884 0.00000 -0.99893 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.00552 0.00000 -1.00744 0.00000 -1.00699 0.00000 -1.00503 0.00000 -1.00181 0.00000 -0.99912 0.00000 -0.99744 0.00000 -0.99671 0.00000 -0.99617 0.00000 -0.99608 0.00000 -0.99612 0.00000 -0.99619 0.00000 -0.99630 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.96769 0.00000 -0.97619 0.00000 -0.98338 0.00000 -0.98457 0.00000 -0.98455 0.00000 -0.98450 0.00000 -0.98464 0.00000 -0.98475 0.00000 -0.98516 0.00000 -0.98594 0.00000 -0.98684 0.00000 -0.98793 0.00000 -0.98917 0.00000 -0.99047 0.00000 -0.99146 0.00000 -0.99230 0.00000 -0.99325 0.00000 -0.99333 0.00000 -0.00000 0.00000 -0.91981 0.00000 -0.92608 0.00000 -0.93138 0.00000 -0.94054 0.00000 -0.94491 0.00000 -0.94560 0.00000 -0.94646 0.00000 -0.94778 0.00000 -0.95210 0.00000 -0.95550 0.00000 -0.95843 0.00000 -0.96209 0.00000 -0.96546 0.00000 -0.96991 0.00000 -0.97370 0.00000 -0.97674 0.00000 -0.97972 0.00000 -0.98127 0.00000 -0.98289 0.00000 -0.98433 0.00000 -0.92971 0.00000 -0.93106 0.00000 -0.93492 0.00000 -0.93782 0.00000 -0.93863 0.00000 -0.93955 0.00000 -0.94427 0.00000 -0.94773 0.00000 -0.95403 0.00000 -0.96525 0.00000 -0.97390 0.00000 -0.98284 0.00000 -0.98707 0.00000 -0.99135 0.00000 -0.99679 0.00000 -1.00077 0.00000 -1.00516 0.00000 -1.00768 0.00000 -0.99713 0.00000 -1.01356 0.00000 -1.02458 0.00000 -1.04116 0.00000 -1.05376 0.00000 -1.06621 0.00000 -1.07728 0.00000 -1.08513 0.00000 -1.09136 0.00000 -1.09469 0.00000 -1.09733 0.00000 -1.09935 0.00000 -1.10206 0.00000 -1.1046 0.00000 -1.10774 0.00000 -1.11248 0.00000 -1.11632 0.00000 -2.46888 0.00000 -2.66970 0.00000 -2.84803 0.00000 -3.07669 0.00000 -3.21178 0.00000 -3.30290 0.00000 -3.42214 0.00000 -3.50589 0.00000 -3.65464 0.00000 -3.83125 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLAS1JET11_NEW_SCALE.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLAS1JET11_NEW_SCALE.dat deleted file mode 100644 index fa92bf82dd..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLAS1JET11_NEW_SCALE.dat +++ /dev/null @@ -1,149 +0,0 @@ -******************************************************************************** -SetName: ATLAS1JET11_NEW_SCALE -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: Numbers provided by A. Huss et al. -TheoryInput: NNPDF3.1 NLO, alphas(MZ)=0.118, R=0.6 -PDFset: NNPDF31_qed_nlo_as_0118 -Warnings: Uses average Mij as central scale. -******************************************************************************** -9.997019e-01 0.00000 -9.996679e-01 0.00000 -9.996802e-01 0.00000 -9.997258e-01 0.00000 -9.998189e-01 0.00000 -1.000012e+00 0.00000 -1.000229e+00 0.00000 -1.000699e+00 0.00000 -1.001216e+00 0.00000 -1.002043e+00 0.00000 -1.003085e+00 0.00000 -1.004410e+00 0.00000 -1.006096e+00 0.00000 -1.008174e+00 0.00000 -1.010739e+00 0.00000 -1.013925e+00 0.00000 -1.017566e+00 0.00000 -1.021977e+00 0.00000 -1.026925e+00 0.00000 -1.032569e+00 0.00000 -1.038524e+00 0.00000 -1.045956e+00 0.00000 -1.053050e+00 0.00000 -1.061686e+00 0.00000 -1.070742e+00 0.00000 -1.079847e+00 0.00000 -1.090705e+00 0.00000 -1.102765e+00 0.00000 -1.118995e+00 0.00000 -1.147138e+00 0.00000 -1.187961e+00 0.00000 -9.997141e-01 0.00000 -9.997156e-01 0.00000 -9.997119e-01 0.00000 -9.997280e-01 0.00000 -9.997796e-01 0.00000 -9.999378e-01 0.00000 -1.000140e+00 0.00000 -1.000483e+00 0.00000 -1.000928e+00 0.00000 -1.001576e+00 0.00000 -1.002452e+00 0.00000 -1.003464e+00 0.00000 -1.004816e+00 0.00000 -1.006373e+00 0.00000 -1.008340e+00 0.00000 -1.010739e+00 0.00000 -1.013367e+00 0.00000 -1.016442e+00 0.00000 -1.019946e+00 0.00000 -1.023883e+00 0.00000 -1.027948e+00 0.00000 -1.032588e+00 0.00000 -1.037497e+00 0.00000 -1.042596e+00 0.00000 -1.048288e+00 0.00000 -1.053829e+00 0.00000 -1.063046e+00 0.00000 -1.078010e+00 0.00000 -1.097374e+00 0.00000 -9.997042e-01 0.00000 -9.997067e-01 0.00000 -9.996588e-01 0.00000 -9.996550e-01 0.00000 -9.996889e-01 0.00000 -9.996569e-01 0.00000 -9.998067e-01 0.00000 -9.999144e-01 0.00000 -1.000111e+00 0.00000 -1.000437e+00 0.00000 -1.000763e+00 0.00000 -1.001190e+00 0.00000 -1.001858e+00 0.00000 -1.002629e+00 0.00000 -1.003515e+00 0.00000 -1.004552e+00 0.00000 -1.005719e+00 0.00000 -1.007035e+00 0.00000 -1.008639e+00 0.00000 -1.010091e+00 0.00000 -1.011967e+00 0.00000 -1.013852e+00 0.00000 -1.015925e+00 0.00000 -1.018042e+00 0.00000 -1.021211e+00 0.00000 -1.027612e+00 0.00000 -9.994165e-01 0.00000 -9.995961e-01 0.00000 -9.995265e-01 0.00000 -9.994355e-01 0.00000 -9.993069e-01 0.00000 -9.990878e-01 0.00000 -9.987504e-01 0.00000 -9.985953e-01 0.00000 -9.984549e-01 0.00000 -9.982370e-01 0.00000 -9.980601e-01 0.00000 -9.978644e-01 0.00000 -9.977155e-01 0.00000 -9.975561e-01 0.00000 -9.975831e-01 0.00000 -9.974471e-01 0.00000 -9.974848e-01 0.00000 -9.974541e-01 0.00000 -9.976219e-01 0.00000 -9.977660e-01 0.00000 -9.977726e-01 0.00000 -9.979850e-01 0.00000 -9.985414e-01 0.00000 -9.995878e-01 0.00000 -9.991734e-01 0.00000 -9.990730e-01 0.00000 -9.988724e-01 0.00000 -9.983003e-01 0.00000 -9.980066e-01 0.00000 -9.974228e-01 0.00000 -9.968642e-01 0.00000 -9.963834e-01 0.00000 -9.958210e-01 0.00000 -9.951620e-01 0.00000 -9.944454e-01 0.00000 -9.938385e-01 0.00000 -9.931463e-01 0.00000 -9.924221e-01 0.00000 -9.916308e-01 0.00000 -9.906833e-01 0.00000 -9.893708e-01 0.00000 -9.886149e-01 0.00000 -9.992611e-01 0.00000 -9.987673e-01 0.00000 -9.984457e-01 0.00000 -9.977326e-01 0.00000 -9.976301e-01 0.00000 -9.966742e-01 0.00000 -9.960706e-01 0.00000 -9.951062e-01 0.00000 -9.945340e-01 0.00000 -9.934212e-01 0.00000 -9.922291e-01 0.00000 -9.901583e-01 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASLOMASSDY11.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASLOMASSDY11.dat deleted file mode 100644 index 7a9a8a0ae8..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASLOMASSDY11.dat +++ /dev/null @@ -1,17 +0,0 @@ -******************************************************************************************* -SetName: ATLASLOMASSDY11 -Author: Alberto Guffanti -Date: 24/11/2015 -CodesUsed: FEWZ 3.1b2 -TheoryInput: NLO QCD, EW corrections flag = 1: ISR, ISRxFSR, EW -PDFset: NNPDF30_nlo_as_0118 -Warnings: No photon initiated processes, no FSR - data are corrected -******************************************************************************************** -1.0138 0.00000 -1.0289 0.00000 -1.0358 0.00000 -1.0394 0.00000 -1.0368 0.00000 -1.0424 0.00000 -1.0395 0.00000 -1.0319 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASLOMASSDY11EXT.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASLOMASSDY11EXT.dat deleted file mode 100644 index d475ce6259..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASLOMASSDY11EXT.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************************* -SetName: ATLASLOMASSDY11EXT -Author: Alberto Guffanti -Date: 26/11/2015 -CodesUsed: FEWZ 3.1b2 -TheoryInput: NLO QCD, EW corrections flag = 1: ISR, ISRxFSR, EW -PDFset: NNPDF30_nlo_as_0118 -Warnings: No photon initiated processes, no FSR - data are corrected -******************************************************************************************** -1.0032 0.00000 -1.0127 0.00000 -1.0238 0.00000 -1.0291 0.00000 -1.0360 0.00000 -1.0376 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASPHT12.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASPHT12.dat deleted file mode 100644 index bbc4d12d7b..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASPHT12.dat +++ /dev/null @@ -1,58 +0,0 @@ -************************************************************************************************************ -SetName: ATLASPHT12 -Author: Ciaran Williams and John Campbell -Date: 2017 -CodesUsed: None - Private message -TheoryInput: Polynomial fit from 1509.01961 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -************************************************************************************************************* -1.00000 0 -1.00000 0 -0.99934 0 -0.99399 0 -0.98984 0 -0.98520 0 -0.98078 0 -0.97486 0 -0.96655 0 -0.95879 0 -0.95135 0 -0.94404 0 -0.93455 0 -0.92516 0 -0.91532 0 -0.90468 0 -0.89332 0 -0.88369 0 -1.004 0 -1.003 0 -1.002 0 -0.999 0 -0.995 0 -0.990 0 -0.986 0 -0.980 0 -0.972 0 -0.964 0 -0.956 0 -0.949 0 -0.940 0 -0.931 0 -0.919 0 -0.910 0 -0.894 0 -1.004 0 -1.003 0 -1.002 0 -0.999 0 -0.995 0 -0.991 0 -0.987 0 -0.982 0 -0.973 0 -0.966 0 -0.960 0 -0.950 0 -0.941 0 -0.931 0 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASPHT15.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASPHT15.dat deleted file mode 100644 index f3c68f609b..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASPHT15.dat +++ /dev/null @@ -1,63 +0,0 @@ -************************************************************************************************************ -SetName: ATLASPHT15 -Author: John Campbell and Ciaran Williams -Date: 2017 -CodesUsed: None - Private message -TheoryInput: Polynomial fit from 1509.01961 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -************************************************************************************************************* -0.990 0 -0.985 0 -0.980 0 -0.974 0 -0.966 0 -0.958 0 -0.951 0 -0.944 0 -0.933 0 -0.923 0 -0.914 0 -0.903 0 -0.891 0 -0.878 0 -0.990 0 -0.985 0 -0.980 0 -0.974 0 -0.966 0 -0.958 0 -0.951 0 -0.944 0 -0.933 0 -0.924 0 -0.914 0 -0.903 0 -0.890 0 -0.877 0 -0.990 0 -0.985 0 -0.980 0 -0.974 0 -0.966 0 -0.958 0 -0.951 0 -0.944 0 -0.932 0 -0.924 0 -0.917 0 -0.902 0 -0.891 0 -0.990 0 -0.985 0 -0.980 0 -0.974 0 -0.966 0 -0.958 0 -0.951 0 -0.945 0 -0.932 0 -0.924 0 -0.913 0 -0.902 0 - diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASWZRAP36PB.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASWZRAP36PB.dat deleted file mode 100644 index 2cbf3accbc..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASWZRAP36PB.dat +++ /dev/null @@ -1,39 +0,0 @@ -******************************************************************************************* -SetName: ATLASWZRAP36PB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: Early 2012 -CodesUsed: FEWZ -TheoryInput: NNPDF2.1 NLO, alphas(MZ)=0.119 -PDFset: NNPDF21_nlo_as_0119 -Warnings: Applied smearing, redo with more updated PDF set -******************************************************************************************** -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.0000000000 0.00000 -1.009051091 0.00000 -1.0071642542 0.00000 -1.0068702798 0.00000 -1.0080971424 0.00000 -1.0060788856 0.00000 -1.0088218024 0.00000 -1.0071822924 0.00000 -1.0070149312 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASWZTOT13TEV81PB.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASWZTOT13TEV81PB.dat deleted file mode 100644 index df5b9c6ee7..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASWZTOT13TEV81PB.dat +++ /dev/null @@ -1,12 +0,0 @@ -******************************************************************************************* -SetName: ATLASWZTOT13TEV81PB -Author: Alberto Guffanti -Date: 04.07.2016 -CodesUsed: FEWZ 3.1b2 -TheoryInput: NLO QCD, EW corrections flag = 1: ISR, ISRxFSR, EW -PDFset: CT14nlo -Warnings: No photon initiated processes, no FSR - data are corrected -******************************************************************************************** -1. 0.00000 -1. 0.00000 -0.996324 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASZHIGHMASS49FB.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASZHIGHMASS49FB.dat deleted file mode 100644 index 2616871a05..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLASZHIGHMASS49FB.dat +++ /dev/null @@ -1,22 +0,0 @@ -******************************************************************************************* -SetName: ATLASZHIGHMASS49FB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: 2014 -CodesUsed: FEWZ -TheoryInput: NNPDF2.3 NLO, alphas(MZ)=0.119 -PDFset: NNPDF23_nlo_as_0119 -Warnings: Only pure EW, no photon-initiated effects included -******************************************************************************************** -0.993 0.00000 -0.996 0.00000 -0.999 0.00000 -1.001 0.00000 -1.002 0.00000 -1.001 0.00000 -1.002 0.00000 -1.000 0.00000 -0.997 0.00000 -0.990 0.00000 -0.985 0.00000 -0.966 0.00000 -0.932 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLAS_1JET_8TEV_R04.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLAS_1JET_8TEV_R04.dat deleted file mode 100644 index beaa749281..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLAS_1JET_8TEV_R04.dat +++ /dev/null @@ -1,180 +0,0 @@ -******************************************************************************** -SetName: ATLAS_1JET_8TEV_R06 -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: Numbers provided by A. Huss et al. -TheoryInput: NNPDF3.1 NLO, alphas(MZ)=0.118, R=0.6 -PDFset: NNPDF31_qed_nlo_as_0118 -Warnings: Uses average HThat as central scale. -******************************************************************************** -9.996882e-01 0.00000 -9.996210e-01 0.00000 -9.995264e-01 0.00000 -9.994142e-01 0.00000 -9.993273e-01 0.00000 -9.992265e-01 0.00000 -9.991832e-01 0.00000 -9.991108e-01 0.00000 -9.991342e-01 0.00000 -9.992675e-01 0.00000 -9.993228e-01 0.00000 -9.997955e-01 0.00000 -1.000285e+00 0.00000 -1.001028e+00 0.00000 -1.001971e+00 0.00000 -1.003202e+00 0.00000 -1.004870e+00 0.00000 -1.006901e+00 0.00000 -1.009273e+00 0.00000 -1.012409e+00 0.00000 -1.015929e+00 0.00000 -1.020017e+00 0.00000 -1.024545e+00 0.00000 -1.029959e+00 0.00000 -1.035723e+00 0.00000 -1.042252e+00 0.00000 -1.049508e+00 0.00000 -1.057462e+00 0.00000 -1.065946e+00 0.00000 -1.075994e+00 0.00000 -1.091116e+00 0.00000 -1.115421e+00 0.00000 -1.151715e+00 0.00000 -1.222414e+00 0.00000 -9.997080e-01 0.00000 -9.995874e-01 0.00000 -9.995471e-01 0.00000 -9.994410e-01 0.00000 -9.993526e-01 0.00000 -9.992495e-01 0.00000 -9.991974e-01 0.00000 -9.990278e-01 0.00000 -9.990821e-01 0.00000 -9.990804e-01 0.00000 -9.992562e-01 0.00000 -9.995018e-01 0.00000 -9.998293e-01 0.00000 -1.000434e+00 0.00000 -1.001160e+00 0.00000 -1.002036e+00 0.00000 -1.003269e+00 0.00000 -1.004773e+00 0.00000 -1.006723e+00 0.00000 -1.008820e+00 0.00000 -1.011271e+00 0.00000 -1.014058e+00 0.00000 -1.017427e+00 0.00000 -1.020796e+00 0.00000 -1.024658e+00 0.00000 -1.029162e+00 0.00000 -1.033589e+00 0.00000 -1.038015e+00 0.00000 -1.043187e+00 0.00000 -1.050111e+00 0.00000 -1.058702e+00 0.00000 -1.072750e+00 0.00000 -1.096099e+00 0.00000 -9.997125e-01 0.00000 -9.996514e-01 0.00000 -9.995656e-01 0.00000 -9.994768e-01 0.00000 -9.993343e-01 0.00000 -9.992346e-01 0.00000 -9.990848e-01 0.00000 -9.989493e-01 0.00000 -9.988509e-01 0.00000 -9.986914e-01 0.00000 -9.986768e-01 0.00000 -9.986960e-01 0.00000 -9.986989e-01 0.00000 -9.988473e-01 0.00000 -9.991371e-01 0.00000 -9.994313e-01 0.00000 -9.999443e-01 0.00000 -1.000541e+00 0.00000 -1.001238e+00 0.00000 -1.002056e+00 0.00000 -1.003055e+00 0.00000 -1.004185e+00 0.00000 -1.005431e+00 0.00000 -1.006837e+00 0.00000 -1.008308e+00 0.00000 -1.010141e+00 0.00000 -1.011643e+00 0.00000 -1.013224e+00 0.00000 -1.015873e+00 0.00000 -1.018184e+00 0.00000 -1.021679e+00 0.00000 -1.027478e+00 0.00000 -9.997587e-01 0.00000 -9.996004e-01 0.00000 -9.995055e-01 0.00000 -9.994097e-01 0.00000 -9.992734e-01 0.00000 -9.989357e-01 0.00000 -9.988907e-01 0.00000 -9.983934e-01 0.00000 -9.981051e-01 0.00000 -9.977662e-01 0.00000 -9.974319e-01 0.00000 -9.970470e-01 0.00000 -9.966604e-01 0.00000 -9.964069e-01 0.00000 -9.959022e-01 0.00000 -9.957045e-01 0.00000 -9.953494e-01 0.00000 -9.950591e-01 0.00000 -9.946841e-01 0.00000 -9.945945e-01 0.00000 -9.943039e-01 0.00000 -9.942645e-01 0.00000 -9.939004e-01 0.00000 -9.940333e-01 0.00000 -9.937317e-01 0.00000 -9.935795e-01 0.00000 -9.930750e-01 0.00000 -9.931389e-01 0.00000 -9.928326e-01 0.00000 -9.947259e-01 0.00000 -9.997044e-01 0.00000 -9.995104e-01 0.00000 -9.994031e-01 0.00000 -9.993460e-01 0.00000 -9.990457e-01 0.00000 -9.984247e-01 0.00000 -9.981381e-01 0.00000 -9.978046e-01 0.00000 -9.969733e-01 0.00000 -9.962674e-01 0.00000 -9.957204e-01 0.00000 -9.949752e-01 0.00000 -9.943353e-01 0.00000 -9.933947e-01 0.00000 -9.927547e-01 0.00000 -9.920133e-01 0.00000 -9.908795e-01 0.00000 -9.901534e-01 0.00000 -9.891593e-01 0.00000 -9.880819e-01 0.00000 -9.871347e-01 0.00000 -9.855919e-01 0.00000 -9.847704e-01 0.00000 -9.839098e-01 0.00000 -9.996151e-01 0.00000 -9.994598e-01 0.00000 -9.991800e-01 0.00000 -9.986223e-01 0.00000 -9.982242e-01 0.00000 -9.978390e-01 0.00000 -9.970789e-01 0.00000 -9.966074e-01 0.00000 -9.957572e-01 0.00000 -9.949295e-01 0.00000 -9.941268e-01 0.00000 -9.932433e-01 0.00000 -9.922381e-01 0.00000 -9.909965e-01 0.00000 -9.899542e-01 0.00000 -9.881051e-01 0.00000 -9.870529e-01 0.00000 -9.845335e-01 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLAS_1JET_8TEV_R06.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLAS_1JET_8TEV_R06.dat deleted file mode 100644 index beaa749281..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLAS_1JET_8TEV_R06.dat +++ /dev/null @@ -1,180 +0,0 @@ -******************************************************************************** -SetName: ATLAS_1JET_8TEV_R06 -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: Numbers provided by A. Huss et al. -TheoryInput: NNPDF3.1 NLO, alphas(MZ)=0.118, R=0.6 -PDFset: NNPDF31_qed_nlo_as_0118 -Warnings: Uses average HThat as central scale. -******************************************************************************** -9.996882e-01 0.00000 -9.996210e-01 0.00000 -9.995264e-01 0.00000 -9.994142e-01 0.00000 -9.993273e-01 0.00000 -9.992265e-01 0.00000 -9.991832e-01 0.00000 -9.991108e-01 0.00000 -9.991342e-01 0.00000 -9.992675e-01 0.00000 -9.993228e-01 0.00000 -9.997955e-01 0.00000 -1.000285e+00 0.00000 -1.001028e+00 0.00000 -1.001971e+00 0.00000 -1.003202e+00 0.00000 -1.004870e+00 0.00000 -1.006901e+00 0.00000 -1.009273e+00 0.00000 -1.012409e+00 0.00000 -1.015929e+00 0.00000 -1.020017e+00 0.00000 -1.024545e+00 0.00000 -1.029959e+00 0.00000 -1.035723e+00 0.00000 -1.042252e+00 0.00000 -1.049508e+00 0.00000 -1.057462e+00 0.00000 -1.065946e+00 0.00000 -1.075994e+00 0.00000 -1.091116e+00 0.00000 -1.115421e+00 0.00000 -1.151715e+00 0.00000 -1.222414e+00 0.00000 -9.997080e-01 0.00000 -9.995874e-01 0.00000 -9.995471e-01 0.00000 -9.994410e-01 0.00000 -9.993526e-01 0.00000 -9.992495e-01 0.00000 -9.991974e-01 0.00000 -9.990278e-01 0.00000 -9.990821e-01 0.00000 -9.990804e-01 0.00000 -9.992562e-01 0.00000 -9.995018e-01 0.00000 -9.998293e-01 0.00000 -1.000434e+00 0.00000 -1.001160e+00 0.00000 -1.002036e+00 0.00000 -1.003269e+00 0.00000 -1.004773e+00 0.00000 -1.006723e+00 0.00000 -1.008820e+00 0.00000 -1.011271e+00 0.00000 -1.014058e+00 0.00000 -1.017427e+00 0.00000 -1.020796e+00 0.00000 -1.024658e+00 0.00000 -1.029162e+00 0.00000 -1.033589e+00 0.00000 -1.038015e+00 0.00000 -1.043187e+00 0.00000 -1.050111e+00 0.00000 -1.058702e+00 0.00000 -1.072750e+00 0.00000 -1.096099e+00 0.00000 -9.997125e-01 0.00000 -9.996514e-01 0.00000 -9.995656e-01 0.00000 -9.994768e-01 0.00000 -9.993343e-01 0.00000 -9.992346e-01 0.00000 -9.990848e-01 0.00000 -9.989493e-01 0.00000 -9.988509e-01 0.00000 -9.986914e-01 0.00000 -9.986768e-01 0.00000 -9.986960e-01 0.00000 -9.986989e-01 0.00000 -9.988473e-01 0.00000 -9.991371e-01 0.00000 -9.994313e-01 0.00000 -9.999443e-01 0.00000 -1.000541e+00 0.00000 -1.001238e+00 0.00000 -1.002056e+00 0.00000 -1.003055e+00 0.00000 -1.004185e+00 0.00000 -1.005431e+00 0.00000 -1.006837e+00 0.00000 -1.008308e+00 0.00000 -1.010141e+00 0.00000 -1.011643e+00 0.00000 -1.013224e+00 0.00000 -1.015873e+00 0.00000 -1.018184e+00 0.00000 -1.021679e+00 0.00000 -1.027478e+00 0.00000 -9.997587e-01 0.00000 -9.996004e-01 0.00000 -9.995055e-01 0.00000 -9.994097e-01 0.00000 -9.992734e-01 0.00000 -9.989357e-01 0.00000 -9.988907e-01 0.00000 -9.983934e-01 0.00000 -9.981051e-01 0.00000 -9.977662e-01 0.00000 -9.974319e-01 0.00000 -9.970470e-01 0.00000 -9.966604e-01 0.00000 -9.964069e-01 0.00000 -9.959022e-01 0.00000 -9.957045e-01 0.00000 -9.953494e-01 0.00000 -9.950591e-01 0.00000 -9.946841e-01 0.00000 -9.945945e-01 0.00000 -9.943039e-01 0.00000 -9.942645e-01 0.00000 -9.939004e-01 0.00000 -9.940333e-01 0.00000 -9.937317e-01 0.00000 -9.935795e-01 0.00000 -9.930750e-01 0.00000 -9.931389e-01 0.00000 -9.928326e-01 0.00000 -9.947259e-01 0.00000 -9.997044e-01 0.00000 -9.995104e-01 0.00000 -9.994031e-01 0.00000 -9.993460e-01 0.00000 -9.990457e-01 0.00000 -9.984247e-01 0.00000 -9.981381e-01 0.00000 -9.978046e-01 0.00000 -9.969733e-01 0.00000 -9.962674e-01 0.00000 -9.957204e-01 0.00000 -9.949752e-01 0.00000 -9.943353e-01 0.00000 -9.933947e-01 0.00000 -9.927547e-01 0.00000 -9.920133e-01 0.00000 -9.908795e-01 0.00000 -9.901534e-01 0.00000 -9.891593e-01 0.00000 -9.880819e-01 0.00000 -9.871347e-01 0.00000 -9.855919e-01 0.00000 -9.847704e-01 0.00000 -9.839098e-01 0.00000 -9.996151e-01 0.00000 -9.994598e-01 0.00000 -9.991800e-01 0.00000 -9.986223e-01 0.00000 -9.982242e-01 0.00000 -9.978390e-01 0.00000 -9.970789e-01 0.00000 -9.966074e-01 0.00000 -9.957572e-01 0.00000 -9.949295e-01 0.00000 -9.941268e-01 0.00000 -9.932433e-01 0.00000 -9.922381e-01 0.00000 -9.909965e-01 0.00000 -9.899542e-01 0.00000 -9.881051e-01 0.00000 -9.870529e-01 0.00000 -9.845335e-01 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLAS_2JET_7TEV_R04.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLAS_2JET_7TEV_R04.dat deleted file mode 100644 index 05d708220d..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLAS_2JET_7TEV_R04.dat +++ /dev/null @@ -1,99 +0,0 @@ -******************************************************************************** -SetName: ATLAS_2JET_7TEV_R06 -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: Numbers provided by A. Huss et al. -TheoryInput: NNPDF3.1 NLO, alphas(MZ)=0.118, R=0.4 -PDFset: NNPDF31_qed_nlo_as_0118 -Warnings: Uses average HThat as central scale. -******************************************************************************** -1.000619e+00 0.000000 -1.000764e+00 0.000000 -1.000915e+00 0.000000 -1.001263e+00 0.000000 -1.001861e+00 0.000000 -1.002835e+00 0.000000 -1.004266e+00 0.000000 -1.006300e+00 0.000000 -1.009071e+00 0.000000 -1.012545e+00 0.000000 -1.017246e+00 0.000000 -1.023141e+00 0.000000 -1.030349e+00 0.000000 -1.038763e+00 0.000000 -1.047986e+00 0.000000 -1.059158e+00 0.000000 -1.070989e+00 0.000000 -1.083602e+00 0.000000 -1.097749e+00 0.000000 -1.112286e+00 0.000000 -1.134011e+00 0.000000 -9.992300e-01 0.000000 -9.990582e-01 0.000000 -9.988828e-01 0.000000 -9.988061e-01 0.000000 -9.988139e-01 0.000000 -9.989582e-01 0.000000 -9.992958e-01 0.000000 -9.998633e-01 0.000000 -1.000745e+00 0.000000 -1.001953e+00 0.000000 -1.003534e+00 0.000000 -1.005534e+00 0.000000 -1.007930e+00 0.000000 -1.010602e+00 0.000000 -1.013616e+00 0.000000 -1.016496e+00 0.000000 -1.019547e+00 0.000000 -1.023043e+00 0.000000 -1.025785e+00 0.000000 -1.027843e+00 0.000000 -1.030979e+00 0.000000 -9.987786e-01 0.000000 -9.986883e-01 0.000000 -9.986606e-01 0.000000 -9.986450e-01 0.000000 -9.987129e-01 0.000000 -9.988521e-01 0.000000 -9.990701e-01 0.000000 -9.993587e-01 0.000000 -9.997290e-01 0.000000 -1.000133e+00 0.000000 -1.000549e+00 0.000000 -1.000912e+00 0.000000 -1.001109e+00 0.000000 -1.001169e+00 0.000000 -1.001025e+00 0.000000 -1.000688e+00 0.000000 -9.991107e-01 0.000000 -9.978250e-01 0.000000 -9.953674e-01 0.000000 -9.995234e-01 0.000000 -9.997070e-01 0.000000 -9.999587e-01 0.000000 -1.000245e+00 0.000000 -1.000572e+00 0.000000 -1.000938e+00 0.000000 -1.001256e+00 0.000000 -1.001547e+00 0.000000 -1.001756e+00 0.000000 -1.001812e+00 0.000000 -1.001669e+00 0.000000 -1.001185e+00 0.000000 -1.000371e+00 0.000000 -9.992824e-01 0.000000 -9.975426e-01 0.000000 -9.954928e-01 0.000000 -9.898100e-01 0.000000 -1.001961e+00 0.000000 -1.002611e+00 0.000000 -1.003259e+00 0.000000 -1.004039e+00 0.000000 -1.004822e+00 0.000000 -1.004643e+00 0.000000 -1.002793e+00 0.000000 -9.972979e-01 0.000000 -1.006008e+00 0.000000 -1.007158e+00 0.000000 -1.007061e+00 0.000000 -1.000554e+00 0.000000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLAS_2JET_7TEV_R06.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLAS_2JET_7TEV_R06.dat deleted file mode 100644 index 88c764e936..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_ATLAS_2JET_7TEV_R06.dat +++ /dev/null @@ -1,99 +0,0 @@ -******************************************************************************** -SetName: ATLAS_2JET_7TEV_R06 -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: Numbers provided by A. Huss et al. -TheoryInput: NNPDF3.1 NLO, alphas(MZ)=0.118, R=0.6 -PDFset: NNPDF31_qed_nlo_as_0118 -Warnings: Uses average HThat as central scale. -******************************************************************************** -1.000619e+00 0.000000 -1.000764e+00 0.000000 -1.000915e+00 0.000000 -1.001263e+00 0.000000 -1.001861e+00 0.000000 -1.002835e+00 0.000000 -1.004266e+00 0.000000 -1.006300e+00 0.000000 -1.009071e+00 0.000000 -1.012545e+00 0.000000 -1.017246e+00 0.000000 -1.023141e+00 0.000000 -1.030349e+00 0.000000 -1.038763e+00 0.000000 -1.047986e+00 0.000000 -1.059158e+00 0.000000 -1.070989e+00 0.000000 -1.083602e+00 0.000000 -1.097749e+00 0.000000 -1.112286e+00 0.000000 -1.134011e+00 0.000000 -9.992300e-01 0.000000 -9.990582e-01 0.000000 -9.988828e-01 0.000000 -9.988061e-01 0.000000 -9.988139e-01 0.000000 -9.989582e-01 0.000000 -9.992958e-01 0.000000 -9.998633e-01 0.000000 -1.000745e+00 0.000000 -1.001953e+00 0.000000 -1.003534e+00 0.000000 -1.005534e+00 0.000000 -1.007930e+00 0.000000 -1.010602e+00 0.000000 -1.013616e+00 0.000000 -1.016496e+00 0.000000 -1.019547e+00 0.000000 -1.023043e+00 0.000000 -1.025785e+00 0.000000 -1.027843e+00 0.000000 -1.030979e+00 0.000000 -9.987786e-01 0.000000 -9.986883e-01 0.000000 -9.986606e-01 0.000000 -9.986450e-01 0.000000 -9.987129e-01 0.000000 -9.988521e-01 0.000000 -9.990701e-01 0.000000 -9.993587e-01 0.000000 -9.997290e-01 0.000000 -1.000133e+00 0.000000 -1.000549e+00 0.000000 -1.000912e+00 0.000000 -1.001109e+00 0.000000 -1.001169e+00 0.000000 -1.001025e+00 0.000000 -1.000688e+00 0.000000 -9.991107e-01 0.000000 -9.978250e-01 0.000000 -9.953674e-01 0.000000 -9.995234e-01 0.000000 -9.997070e-01 0.000000 -9.999587e-01 0.000000 -1.000245e+00 0.000000 -1.000572e+00 0.000000 -1.000938e+00 0.000000 -1.001256e+00 0.000000 -1.001547e+00 0.000000 -1.001756e+00 0.000000 -1.001812e+00 0.000000 -1.001669e+00 0.000000 -1.001185e+00 0.000000 -1.000371e+00 0.000000 -9.992824e-01 0.000000 -9.975426e-01 0.000000 -9.954928e-01 0.000000 -9.898100e-01 0.000000 -1.001961e+00 0.000000 -1.002611e+00 0.000000 -1.003259e+00 0.000000 -1.004039e+00 0.000000 -1.004822e+00 0.000000 -1.004643e+00 0.000000 -1.002793e+00 0.000000 -9.972979e-01 0.000000 -1.006008e+00 0.000000 -1.007158e+00 0.000000 -1.007061e+00 0.000000 -1.000554e+00 0.000000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_CMSDY2D11.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_CMSDY2D11.dat deleted file mode 100644 index 9e7f13071d..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_CMSDY2D11.dat +++ /dev/null @@ -1,141 +0,0 @@ -******************************************************************************************* -SetName: CMSDY2D11 -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: 2014 -CodesUsed: FEWZ -TheoryInput: NNPDF2.3 NLO, alphas(MZ)=0.119 -PDFset: NNPDF23_nlo_as_0119 -Warnings: Only pure EWK, no photon-initiated effects -******************************************************************************************** -1.0044495382 0.00000 -1.0058859346 0.00000 -1.0026354913 0.00000 -1.0035861696 0.00000 -1.0037412421 0.00000 -1.0016990621 0.00000 -1.0043856644 0.00000 -1.0018574573 0.00000 -1.0060170136 0.00000 -1.0045258321 0.00000 -1.0025859659 0.00000 -1.0035310734 0.00000 -1.0044792037 0.00000 -1.0011485177 0.00000 -1.0050192769 0.00000 -1.0008821583 0.00000 -1.0018872197 0.00000 -1.0044375243 0.00000 -1.0008981058 0.00000 -1.007739525 0.00000 -1.0076176563 0.00000 -1.0064595932 0.00000 -0.997382199 0.00000 -1.0445644835 0.00000 -1.0312302839 0.00000 -1.0301313823 0.00000 -1.0272720107 0.00000 -1.0258546169 0.00000 -1.029782858 0.00000 -1.029101578 0.00000 -1.0274844782 0.00000 -1.0280269948 0.00000 -1.02829097 0.00000 -1.0296156775 0.00000 -1.0256677629 0.00000 -1.0270991749 0.00000 -1.0362104398 0.00000 -1.0240023135 0.00000 -1.0299583673 0.00000 -1.029109589 0.00000 -1.0377569367 0.00000 -1.0279164653 0.00000 -1.0306299603 0.00000 -1.0372501514 0.00000 -1.0335857115 0.00000 -1.0365573992 0.00000 -1.0428797111 0.00000 -1.0619111709 0.00000 -1.0391056137 0.00000 -1.0431969553 0.00000 -1.0372168285 0.00000 -1.0434492616 0.00000 -1.0379396024 0.00000 -1.0341114817 0.00000 -1.0440172994 0.00000 -1.0395725014 0.00000 -1.0436935625 0.00000 -1.0390984811 0.00000 -1.0370185592 0.00000 -1.040373947 0.00000 -1.042792306 0.00000 -1.0448688449 0.00000 -1.0403532442 0.00000 -1.0425304266 0.00000 -1.0362297496 0.00000 -1.040066778 0.00000 -1.0416504476 0.00000 -1.0399719495 0.00000 -1.0458358298 0.00000 -1.0347107438 0.00000 -1.0472878999 0.00000 -1.0060362173 0.00000 -1.0106115126 0.00000 -1.0209305119 0.00000 -1.0163390832 0.00000 -1.0127834582 0.00000 -1.0156551464 0.00000 -1.0177408226 0.00000 -1.0160556267 0.00000 -1.0207431451 0.00000 -1.0092763118 0.00000 -1.0175231545 0.00000 -1.0227353261 0.00000 -1.0089373292 0.00000 -1.0140472295 0.00000 -1.0219572829 0.00000 -1.0153735832 0.00000 -1.0208199635 0.00000 -1.0233292707 0.00000 -1.0118279879 0.00000 -1.0183591117 0.00000 -1.0136763472 0.00000 -1.024894361 0.00000 -1.0033684051 0.00000 -1.0189700151 0.00000 -1.0008658009 0.00000 -0.993 0.00000 -0.995 0.00000 -0.992 0.00000 -0.999 0.00000 -0.995 0.00000 -0.997 0.00000 -0.997 0.00000 -0.997 0.00000 -0.998 0.00000 -0.993 0.00000 -0.996 0.00000 -0.995 0.00000 -0.997 0.00000 -0.998 0.00000 -0.999 0.00000 -0.998 0.00000 -0.994 0.00000 -0.997 0.00000 -0.991 0.00000 -0.997 0.00000 -0.995 0.00000 -0.998 0.00000 -0.992 0.00000 -0.970 0.00000 -1.001 0.00000 -0.999 0.00000 -1.000 0.00000 -1.000 0.00000 -0.998 0.00000 -0.997 0.00000 -1.000 0.00000 -1.002 0.00000 -1.001 0.00000 -0.998 0.00000 -1.011 0.00000 -0.989 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_CMSDY2D12.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_CMSDY2D12.dat deleted file mode 100644 index 1283819e39..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_CMSDY2D12.dat +++ /dev/null @@ -1,141 +0,0 @@ -******************************************************************************** -SetName: CMSDY2D12-BIN1 -Author: Alberto Guffanti -Date: 2016-02-02 -CodesUsed: FEWZ 3.1b2 -TheoryInput: NLO QCD + EW1 (Pure EW, ISR, ISRxFSR) -PDFset: NNPDF30_nlo_as_0118 -Warnings: Data are corrected for FSR -******************************************************************************** -1.00232803986 0.00000 -1.00228407664 0.00000 -1.00171871244 0.00000 -1.00244839799 0.00000 -1.00158304624 0.00000 -1.00200237804 0.00000 -1.0025920182 0.00000 -1.00028583486 0.00000 -1.00463216967 0.00000 -1.00064213518 0.00000 -1.00233921209 0.00000 -1.00319263131 0.00000 -1.00189259829 0.00000 -1.00317338101 0.00000 -1.00207642524 0.00000 -1.00239609588 0.00000 -1.00269725501 0.00000 -1.00173790704 0.00000 -1.00227964844 0.00000 -1.00168634363 0.00000 -1.00525069511 0.00000 -1.00156589492 0.00000 -1.00413057288 0.00000 -1.00230546115 0.00000 -1.00943374072 0.00000 -1.01513628044 0.00000 -1.01403401891 0.00000 -1.01133470261 0.00000 -1.01327597646 0.00000 -1.00970267914 0.00000 -1.01496980082 0.00000 -1.01448070037 0.00000 -1.01484324878 0.00000 -1.01519466644 0.00000 -1.00930582516 0.00000 -1.01299289882 0.00000 -1.01281449447 0.00000 -1.01215772757 0.00000 -1.0099290806 0.00000 -1.01549618465 0.00000 -1.01092469426 0.00000 -1.015016868 0.00000 -1.01605268856 0.00000 -1.01467735361 0.00000 -1.01431843189 0.00000 -1.01692143138 0.00000 -1.00376824296 0.00000 -1.00759191437 0.00000 -1.03331832687 0.00000 -1.03951181599 0.00000 -1.03813930087 0.00000 -1.03587964935 0.00000 -1.03948370689 0.00000 -1.03750935322 0.00000 -1.04139619751 0.00000 -1.03697162525 0.00000 -1.03582541349 0.00000 -1.0363889202 0.00000 -1.038691854 0.00000 -1.04049921341 0.00000 -1.03781737647 0.00000 -1.037843947 0.00000 -1.03845303972 0.00000 -1.04201679923 0.00000 -1.04180218109 0.00000 -1.03987160463 0.00000 -1.04765920018 0.00000 -1.04604268064 0.00000 -1.04559043058 0.00000 -1.04646999606 0.00000 -1.05623045095 0.00000 -1.00062889861 0.00000 -1.00176626685 0.00000 -0.996996340372 0.00000 -0.998661664683 0.00000 -0.994343481937 0.00000 -1.00075368142 0.00000 -0.995105859387 0.00000 -0.995261544599 0.00000 -1.00342002192 0.00000 -0.994757079587 0.00000 -1.00266980746 0.00000 -0.993430879613 0.00000 -0.99349954698 0.00000 -0.998664137988 0.00000 -0.998342236017 0.00000 -0.999577352986 0.00000 -0.991511215107 0.00000 -0.994405227045 0.00000 -0.999100799669 0.00000 -0.987996531877 0.00000 -0.994135442931 0.00000 -0.996504458175 0.00000 -0.993189335771 0.00000 -0.99305658735 0.00000 -1.00620534515 0.00000 -0.995645636977 0.00000 -0.992812184034 0.00000 -0.99777947237 0.00000 -0.993434147123 0.00000 -0.99791952446 0.00000 -0.997719666461 0.00000 -0.997356689187 0.00000 -0.994971601603 0.00000 -0.992611926837 0.00000 -1.00029432107 0.00000 -0.996568516414 0.00000 -0.998202838396 0.00000 -0.997025103053 0.00000 -0.999947834328 0.00000 -0.998921489106 0.00000 -0.999075640963 0.00000 -0.998649514553 0.00000 -0.999402089645 0.00000 -0.994721237987 0.00000 -1.00515846977 0.00000 -0.998063150805 0.00000 -0.990978964725 0.00000 -1.01512269244 0.00000 -1.03034001833 0.00000 -0.99360822395 0.00000 -0.999724176574 0.00000 -0.997891802675 0.00000 -0.999475971813 0.00000 -1.00073007469 0.00000 -1.00424395378 0.00000 -1.00399495956 0.00000 -0.999467058847 0.00000 -1.00322780238 0.00000 -1.01784257633 0.00000 -0.997863632625 0.00000 -0.986571796523 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_CMSJETS11_NEW_SCALE.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_CMSJETS11_NEW_SCALE.dat deleted file mode 100644 index 2cf1be5a6c..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_CMSJETS11_NEW_SCALE.dat +++ /dev/null @@ -1,142 +0,0 @@ -******************************************************************************** -SetName: CMSJETS11_NEW_SCALE -Author: Emanuele R. Nocera (enocera@nikhef.nl) -Date: November 2019 -CodesUsed: Numbers provided by A. Huss et al. -TheoryInput: NNPDF3.1 NLO, alphas(MZ)=0.118, R=0.7 -PDFset: NNPDF31_qed_nlo_as_0118 -Warnings: Uses average HThat as central scale. -******************************************************************************** -9.997008e-01 0.00000 -9.997119e-01 0.00000 -9.997484e-01 0.00000 -9.998813e-01 0.00000 -1.000049e+00 0.00000 -1.000400e+00 0.00000 -1.000876e+00 0.00000 -1.001579e+00 0.00000 -1.002540e+00 0.00000 -1.003825e+00 0.00000 -1.005542e+00 0.00000 -1.007571e+00 0.00000 -1.010217e+00 0.00000 -1.013386e+00 0.00000 -1.017131e+00 0.00000 -1.021675e+00 0.00000 -1.026878e+00 0.00000 -1.032741e+00 0.00000 -1.039574e+00 0.00000 -1.047120e+00 0.00000 -1.055276e+00 0.00000 -1.064206e+00 0.00000 -1.074093e+00 0.00000 -1.085101e+00 0.00000 -1.095369e+00 0.00000 -1.107566e+00 0.00000 -1.119244e+00 0.00000 -1.132032e+00 0.00000 -1.143937e+00 0.00000 -1.159747e+00 0.00000 -1.173461e+00 0.00000 -1.196265e+00 0.00000 -1.237531e+00 0.00000 -9.997219e-01 0.00000 -9.997086e-01 0.00000 -9.997664e-01 0.00000 -9.998862e-01 0.00000 -1.000003e+00 0.00000 -1.000302e+00 0.00000 -1.000670e+00 0.00000 -1.001211e+00 0.00000 -1.002024e+00 0.00000 -1.003068e+00 0.00000 -1.004418e+00 0.00000 -1.005972e+00 0.00000 -1.007956e+00 0.00000 -1.010369e+00 0.00000 -1.013157e+00 0.00000 -1.016387e+00 0.00000 -1.020042e+00 0.00000 -1.024244e+00 0.00000 -1.028517e+00 0.00000 -1.033636e+00 0.00000 -1.038869e+00 0.00000 -1.044663e+00 0.00000 -1.050971e+00 0.00000 -1.057094e+00 0.00000 -1.063251e+00 0.00000 -1.070547e+00 0.00000 -1.079432e+00 0.00000 -1.085215e+00 0.00000 -1.093651e+00 0.00000 -1.109592e+00 0.00000 -9.997261e-01 0.00000 -9.996772e-01 0.00000 -9.997160e-01 0.00000 -9.997005e-01 0.00000 -9.997933e-01 0.00000 -9.998300e-01 0.00000 -1.000144e+00 0.00000 -1.000229e+00 0.00000 -1.000683e+00 0.00000 -1.001122e+00 0.00000 -1.001763e+00 0.00000 -1.002566e+00 0.00000 -1.003445e+00 0.00000 -1.004541e+00 0.00000 -1.005820e+00 0.00000 -1.007185e+00 0.00000 -1.008768e+00 0.00000 -1.010479e+00 0.00000 -1.012445e+00 0.00000 -1.014708e+00 0.00000 -1.016787e+00 0.00000 -1.019161e+00 0.00000 -1.021691e+00 0.00000 -1.024493e+00 0.00000 -1.027219e+00 0.00000 -1.030542e+00 0.00000 -1.035154e+00 0.00000 -9.997056e-01 0.00000 -9.996020e-01 0.00000 -9.994928e-01 0.00000 -9.993153e-01 0.00000 -9.991192e-01 0.00000 -9.989054e-01 0.00000 -9.987567e-01 0.00000 -9.984727e-01 0.00000 -9.982143e-01 0.00000 -9.980525e-01 0.00000 -9.979938e-01 0.00000 -9.977540e-01 0.00000 -9.977669e-01 0.00000 -9.976315e-01 0.00000 -9.976921e-01 0.00000 -9.978112e-01 0.00000 -9.978740e-01 0.00000 -9.980697e-01 0.00000 -9.981878e-01 0.00000 -9.983028e-01 0.00000 -9.987334e-01 0.00000 -9.986309e-01 0.00000 -9.984124e-01 0.00000 -1.001031e+00 0.00000 -9.994206e-01 0.00000 -9.993002e-01 0.00000 -9.988060e-01 0.00000 -9.984636e-01 0.00000 -9.978397e-01 0.00000 -9.973566e-01 0.00000 -9.967643e-01 0.00000 -9.961085e-01 0.00000 -9.955539e-01 0.00000 -9.949816e-01 0.00000 -9.941593e-01 0.00000 -9.935483e-01 0.00000 -9.927509e-01 0.00000 -9.920196e-01 0.00000 -9.910673e-01 0.00000 -9.899422e-01 0.00000 -9.889131e-01 0.00000 -9.882471e-01 0.00000 -9.895932e-01 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_CMS_1JET_8TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_CMS_1JET_8TEV.dat deleted file mode 100644 index c49f153177..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_CMS_1JET_8TEV.dat +++ /dev/null @@ -1,248 +0,0 @@ -******************************************************************************** -SetName: CMS_1JET_8TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: Numbers provided by A. Huss et al. -TheoryInput: NNPDF3.1 NLO, alphas(MZ)=0.118, R=0.7 -PDFset: NNPDF31_qed_nlo_as_0118 -Warnings: Uses average HThat as central scale. -******************************************************************************** -1.000150e+00 0.00000 -1.000229e+00 0.00000 -1.000392e+00 0.00000 -1.000796e+00 0.00000 -1.001690e+00 0.00000 -1.000629e+00 0.00000 -9.998208e-01 0.00000 -9.997737e-01 0.00000 -9.997300e-01 0.00000 -9.996798e-01 0.00000 -9.996201e-01 0.00000 -9.995477e-01 0.00000 -9.994520e-01 0.00000 -9.993444e-01 0.00000 -9.992443e-01 0.00000 -9.991910e-01 0.00000 -9.991503e-01 0.00000 -9.991829e-01 0.00000 -9.993368e-01 0.00000 -9.996017e-01 0.00000 -1.000065e+00 0.00000 -1.000741e+00 0.00000 -1.001627e+00 0.00000 -1.002928e+00 0.00000 -1.004490e+00 0.00000 -1.006672e+00 0.00000 -1.009092e+00 0.00000 -1.011967e+00 0.00000 -1.015876e+00 0.00000 -1.020456e+00 0.00000 -1.025060e+00 0.00000 -1.031023e+00 0.00000 -1.037810e+00 0.00000 -1.043967e+00 0.00000 -1.051910e+00 0.00000 -1.060243e+00 0.00000 -1.072041e+00 0.00000 -1.079240e+00 0.00000 -1.091250e+00 0.00000 -1.102722e+00 0.00000 -1.112440e+00 0.00000 -1.126188e+00 0.00000 -1.139242e+00 0.00000 -1.155501e+00 0.00000 -1.189973e+00 0.00000 -1.247603e+00 0.00000 -1.000164e+00 0.00000 -1.000226e+00 0.00000 -1.000423e+00 0.00000 -1.000805e+00 0.00000 -1.001763e+00 0.00000 -1.000637e+00 0.00000 -9.998204e-01 0.00000 -9.997745e-01 0.00000 -9.997366e-01 0.00000 -9.996908e-01 0.00000 -9.996408e-01 0.00000 -9.995562e-01 0.00000 -9.994600e-01 0.00000 -9.993669e-01 0.00000 -9.992566e-01 0.00000 -9.991622e-01 0.00000 -9.991406e-01 0.00000 -9.991099e-01 0.00000 -9.991928e-01 0.00000 -9.993612e-01 0.00000 -9.997440e-01 0.00000 -1.000203e+00 0.00000 -1.001000e+00 0.00000 -1.001852e+00 0.00000 -1.003184e+00 0.00000 -1.004538e+00 0.00000 -1.006509e+00 0.00000 -1.008759e+00 0.00000 -1.011404e+00 0.00000 -1.014526e+00 0.00000 -1.017747e+00 0.00000 -1.021504e+00 0.00000 -1.025998e+00 0.00000 -1.030999e+00 0.00000 -1.035467e+00 0.00000 -1.040858e+00 0.00000 -1.046521e+00 0.00000 -1.053109e+00 0.00000 -1.058216e+00 0.00000 -1.066466e+00 0.00000 -1.072616e+00 0.00000 -1.081932e+00 0.00000 -1.084169e+00 0.00000 -1.099933e+00 0.00000 -1.119136e+00 0.00000 -1.168411e+00 0.00000 -1.000167e+00 0.00000 -1.000249e+00 0.00000 -1.000443e+00 0.00000 -1.000887e+00 0.00000 -1.001861e+00 0.00000 -1.000697e+00 0.00000 -9.998306e-01 0.00000 -9.997812e-01 0.00000 -9.997470e-01 0.00000 -9.997157e-01 0.00000 -9.996548e-01 0.00000 -9.995858e-01 0.00000 -9.994676e-01 0.00000 -9.993562e-01 0.00000 -9.992266e-01 0.00000 -9.990914e-01 0.00000 -9.989901e-01 0.00000 -9.988535e-01 0.00000 -9.987649e-01 0.00000 -9.987497e-01 0.00000 -9.987594e-01 0.00000 -9.989393e-01 0.00000 -9.991488e-01 0.00000 -9.994535e-01 0.00000 -1.000011e+00 0.00000 -1.000622e+00 0.00000 -1.001197e+00 0.00000 -1.002272e+00 0.00000 -1.003103e+00 0.00000 -1.004898e+00 0.00000 -1.005426e+00 0.00000 -1.007466e+00 0.00000 -1.009048e+00 0.00000 -1.010572e+00 0.00000 -1.012934e+00 0.00000 -1.014575e+00 0.00000 -1.016857e+00 0.00000 -1.019263e+00 0.00000 -1.022177e+00 0.00000 -1.024535e+00 0.00000 -1.029671e+00 0.00000 -1.028456e+00 0.00000 -1.035281e+00 0.00000 -1.038188e+00 0.00000 -1.089352e+00 0.00000 -1.000175e+00 0.00000 -1.000295e+00 0.00000 -1.000519e+00 0.00000 -1.000958e+00 0.00000 -1.002098e+00 0.00000 -1.000793e+00 0.00000 -9.998360e-01 0.00000 -9.997803e-01 0.00000 -9.997504e-01 0.00000 -9.997036e-01 0.00000 -9.996683e-01 0.00000 -9.995636e-01 0.00000 -9.994328e-01 0.00000 -9.992583e-01 0.00000 -9.990141e-01 0.00000 -9.987904e-01 0.00000 -9.984660e-01 0.00000 -9.981732e-01 0.00000 -9.977705e-01 0.00000 -9.974255e-01 0.00000 -9.970045e-01 0.00000 -9.966493e-01 0.00000 -9.963770e-01 0.00000 -9.959055e-01 0.00000 -9.954721e-01 0.00000 -9.954077e-01 0.00000 -9.949191e-01 0.00000 -9.948921e-01 0.00000 -9.944684e-01 0.00000 -9.947340e-01 0.00000 -9.946007e-01 0.00000 -9.940787e-01 0.00000 -9.945995e-01 0.00000 -9.936749e-01 0.00000 -9.935904e-01 0.00000 -9.938771e-01 0.00000 -9.916436e-01 0.00000 -9.946460e-01 0.00000 -9.926725e-01 0.00000 -1.007882e+00 0.00000 -1.031483e+00 0.00000 -1.000187e+00 0.00000 -1.000285e+00 0.00000 -1.000559e+00 0.00000 -1.001114e+00 0.00000 -1.002333e+00 0.00000 -1.000916e+00 0.00000 -9.998331e-01 0.00000 -9.997942e-01 0.00000 -9.997532e-01 0.00000 -9.997026e-01 0.00000 -9.995838e-01 0.00000 -9.994607e-01 0.00000 -9.992366e-01 0.00000 -9.989534e-01 0.00000 -9.986191e-01 0.00000 -9.980604e-01 0.00000 -9.975407e-01 0.00000 -9.969209e-01 0.00000 -9.962806e-01 0.00000 -9.955764e-01 0.00000 -9.947119e-01 0.00000 -9.939993e-01 0.00000 -9.932135e-01 0.00000 -9.923146e-01 0.00000 -9.914021e-01 0.00000 -9.904366e-01 0.00000 -9.895100e-01 0.00000 -9.887104e-01 0.00000 -9.872274e-01 0.00000 -9.860751e-01 0.00000 -9.850028e-01 0.00000 -9.837455e-01 0.00000 -9.860977e-01 0.00000 -9.893781e-01 0.00000 -1.000141e+00 0.00000 -1.000345e+00 0.00000 -1.000561e+00 0.00000 -1.001234e+00 0.00000 -1.002787e+00 0.00000 -1.000986e+00 0.00000 -9.998463e-01 0.00000 -9.997254e-01 0.00000 -9.996912e-01 0.00000 -9.994729e-01 0.00000 -9.993617e-01 0.00000 -9.991650e-01 0.00000 -9.986725e-01 0.00000 -9.982826e-01 0.00000 -9.976921e-01 0.00000 -9.970633e-01 0.00000 -9.964152e-01 0.00000 -9.956841e-01 0.00000 -9.947381e-01 0.00000 -9.937953e-01 0.00000 -9.929128e-01 0.00000 -9.917377e-01 0.00000 -9.905470e-01 0.00000 -9.890586e-01 0.00000 -9.874103e-01 0.00000 -9.866620e-01 0.00000 -9.852347e-01 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_CMS_2JET_3D_8TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_CMS_2JET_3D_8TEV.dat deleted file mode 100644 index 0a40de714b..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_CMS_2JET_3D_8TEV.dat +++ /dev/null @@ -1,131 +0,0 @@ -******************************************************************************** -SetName: CMS_2JET_3D_8TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: Numbers provided by A. Huss et al. -TheoryInput: NNPDF3.1 NLO, alphas(MZ)=0.118, R=0.7 -PDFset: NNPDF31_qed_nlo_as_0118 -Warnings: Uses average HThat as central scale. -******************************************************************************** -9.998325e-01 0.00000 -9.998008e-01 0.00000 -9.998044e-01 0.00000 -9.998297e-01 0.00000 -9.999259e-01 0.00000 -1.000104e+00 0.00000 -1.000436e+00 0.00000 -1.000908e+00 0.00000 -1.001569e+00 0.00000 -1.002444e+00 0.00000 -1.003584e+00 0.00000 -1.005035e+00 0.00000 -1.006834e+00 0.00000 -1.009016e+00 0.00000 -1.011497e+00 0.00000 -1.014662e+00 0.00000 -1.018191e+00 0.00000 -1.022320e+00 0.00000 -1.026918e+00 0.00000 -1.032310e+00 0.00000 -1.038232e+00 0.00000 -1.044820e+00 0.00000 -1.052139e+00 0.00000 -1.059867e+00 0.00000 -1.068678e+00 0.00000 -1.077990e+00 0.00000 -1.087817e+00 0.00000 -1.098590e+00 0.00000 -1.109812e+00 0.00000 -1.122641e+00 0.00000 -1.140055e+00 0.00000 -9.988287e-01 0.00000 -9.987565e-01 0.00000 -9.986586e-01 0.00000 -9.985668e-01 0.00000 -9.984851e-01 0.00000 -9.984159e-01 0.00000 -9.983463e-01 0.00000 -9.983406e-01 0.00000 -9.983131e-01 0.00000 -9.983535e-01 0.00000 -9.984375e-01 0.00000 -9.984928e-01 0.00000 -9.987005e-01 0.00000 -9.989181e-01 0.00000 -9.989992e-01 0.00000 -9.994011e-01 0.00000 -9.995887e-01 0.00000 -9.997903e-01 0.00000 -9.997568e-01 0.00000 -9.999707e-01 0.00000 -9.999970e-01 0.00000 -1.000607e+00 0.00000 -1.000522e+00 0.00000 -9.982999e-01 0.00000 -9.989262e-01 0.00000 -9.987163e-01 0.00000 -1.001075e+00 0.00000 -1.001661e+00 0.00000 -1.002215e+00 0.00000 -1.002621e+00 0.00000 -1.002960e+00 0.00000 -1.003085e+00 0.00000 -1.002967e+00 0.00000 -1.002650e+00 0.00000 -1.002121e+00 0.00000 -1.000998e+00 0.00000 -9.996786e-01 0.00000 -9.978634e-01 0.00000 -9.951084e-01 0.00000 -9.924049e-01 0.00000 -9.997954e-01 0.00000 -9.995991e-01 0.00000 -9.993519e-01 0.00000 -9.991214e-01 0.00000 -9.988732e-01 0.00000 -9.986311e-01 0.00000 -9.984452e-01 0.00000 -9.982779e-01 0.00000 -9.982007e-01 0.00000 -9.983439e-01 0.00000 -9.984035e-01 0.00000 -9.986552e-01 0.00000 -9.993256e-01 0.00000 -1.000012e+00 0.00000 -1.001142e+00 0.00000 -1.002392e+00 0.00000 -1.004352e+00 0.00000 -1.006125e+00 0.00000 -1.008612e+00 0.00000 -1.012548e+00 0.00000 -1.015150e+00 0.00000 -1.019633e+00 0.00000 -1.025425e+00 0.00000 -9.982150e-01 0.00000 -9.978841e-01 0.00000 -9.974544e-01 0.00000 -9.970308e-01 0.00000 -9.965137e-01 0.00000 -9.959726e-01 0.00000 -9.953600e-01 0.00000 -9.948518e-01 0.00000 -9.942253e-01 0.00000 -9.935852e-01 0.00000 -9.931026e-01 0.00000 -9.924226e-01 0.00000 -9.919636e-01 0.00000 -9.909994e-01 0.00000 -9.909762e-01 0.00000 -9.903711e-01 0.00000 -9.903189e-01 0.00000 -1.000058e+00 0.00000 -9.995756e-01 0.00000 -9.992567e-01 0.00000 -9.986567e-01 0.00000 -9.982382e-01 0.00000 -9.972756e-01 0.00000 -9.968965e-01 0.00000 -9.957454e-01 0.00000 -9.955210e-01 0.00000 -9.946427e-01 0.00000 -9.945303e-01 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_CMS_2JET_7TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_CMS_2JET_7TEV.dat deleted file mode 100644 index e90bbab431..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_CMS_2JET_7TEV.dat +++ /dev/null @@ -1,63 +0,0 @@ -******************************************************************************** -SetName: CMS_2JET_7TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: Numbers provided by A. Huss et al. -TheoryInput: NNPDF3.1 NLO, alphas(MZ)=0.118, R=0.7 -PDFset: NNPDF31_qed_nlo_as_0118 -Warnings: Uses average HThat as central scale. -******************************************************************************** -1.000661e+00 0.00000 -1.001166e+00 0.00000 -1.002506e+00 0.00000 -1.005582e+00 0.00000 -1.011676e+00 0.00000 -1.021976e+00 0.00000 -1.037273e+00 0.00000 -1.057720e+00 0.00000 -1.081967e+00 0.00000 -1.108607e+00 0.00000 -1.136315e+00 0.00000 -1.162604e+00 0.00000 -1.190301e+00 0.00000 -1.000160e+00 0.00000 -1.000512e+00 0.00000 -1.001606e+00 0.00000 -1.004082e+00 0.00000 -1.008495e+00 0.00000 -1.015200e+00 0.00000 -1.023997e+00 0.00000 -1.033958e+00 0.00000 -1.044002e+00 0.00000 -1.052330e+00 0.00000 -1.058103e+00 0.00000 -1.063838e+00 0.00000 -9.994349e-01 0.00000 -9.995999e-01 0.00000 -1.000226e+00 0.00000 -1.001433e+00 0.00000 -1.003129e+00 0.00000 -1.005088e+00 0.00000 -1.006761e+00 0.00000 -1.007440e+00 0.00000 -1.006615e+00 0.00000 -1.003337e+00 0.00000 -9.954802e-01 0.00000 -9.991320e-01 0.00000 -9.993304e-01 0.00000 -9.998034e-01 0.00000 -1.000488e+00 0.00000 -1.001178e+00 0.00000 -1.001531e+00 0.00000 -1.001151e+00 0.00000 -9.996582e-01 0.00000 -9.965957e-01 0.00000 -9.903512e-01 0.00000 -1.000436e+00 0.00000 -1.001453e+00 0.00000 -1.002549e+00 0.00000 -1.003404e+00 0.00000 -1.003676e+00 0.00000 -1.002985e+00 0.00000 -1.000451e+00 0.00000 -9.946092e-01 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_LHCBWZMU7TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_LHCBWZMU7TEV.dat deleted file mode 100644 index 19852d4b37..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_LHCBWZMU7TEV.dat +++ /dev/null @@ -1,42 +0,0 @@ -******************************************************************************** -SetName: LHCBWZMU7TEV-Z -Author: Alberto Guffanti -Date: 2016-06-07 -CodesUsed: FEWZ 3.1b2 -TheoryInput: -PDFset: NNPDF30_nlo_as_0118 -Warnings: -******************************************************************************** -0.9970102305810419 0.00000 -0.9771313865261753 0.00000 -0.9936674381337398 0.00000 -1.0022155818878282 0.00000 -0.9963064472492442 0.00000 -0.9973970655858867 0.00000 -0.9950279775719384 0.00000 -0.9955126210844967 0.00000 -1.0025600573772968 0.00000 -1.0018194487910905 0.00000 -1.000578122577286 0.00000 -0.9979296055636984 0.00000 -0.9941347547923047 0.00000 -1.0081108810073764 0.00000 -1.0035999486392504 0.00000 -1.0046571530318102 0.00000 -0.9930173893125102 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_LHCBWZMU8TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_LHCBWZMU8TEV.dat deleted file mode 100644 index 95e2455f0c..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_LHCBWZMU8TEV.dat +++ /dev/null @@ -1,43 +0,0 @@ -******************************************************************************** -SetName: LHCBWZMU8TEV-Z -Author: Alberto Guffanti -Date: 2016-06-07 -CodesUsed: FEWZ 3.1b2 -TheoryInput: -PDFset: NNPDF30_nlo_as_0118 -Warnings: -******************************************************************************** -1.0137547730410903 0.00000 -1.0010820125599054 0.00000 -0.9958693692790854 0.00000 -1.009891037057123 0.00000 -0.993047730185237 0.00000 -0.9921474414750169 0.00000 -1.003200266887564 0.00000 -1.000598700276283 0.00000 -0.9954113518828676 0.00000 -1.0004683757618096 0.00000 -0.9983509630603634 0.00000 -1.007640162997718 0.00000 -0.9971975685669943 0.00000 -1.0018224300747764 0.00000 -0.981167080804408 0.00000 -1.009674842200968 0.00000 -1.010476742868943 0.00000 -1.009837212271281 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_LHCBZ940PB.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_LHCBZ940PB.dat deleted file mode 100644 index 96712611ec..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_LHCBZ940PB.dat +++ /dev/null @@ -1,18 +0,0 @@ -******************************************************************************************* -SetName: LHCBZ940PB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: 2014 -CodesUsed: FEWZ -TheoryInput: NNPDF2.3 NLO, alphas(MZ)=0.119 -PDFset: NNPDF23_nlo_as_0119 -Warnings: Only pure EWK, no photon-initiated effects -******************************************************************************************** -0.9883665496 0.00000 -0.9957657855 0.00000 -1.0307326783 0.00000 -0.9926813471 0.00000 -0.9937090244 0.00000 -0.9968969098 0.00000 -0.9939320617 0.00000 -1.0005519171 0.00000 -0.9990327513 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_EWK_LHCBZEE2FB.dat b/nnpdfcpp/data/NNLOCFAC/CF_EWK_LHCBZEE2FB.dat deleted file mode 100644 index 2161b1f017..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_EWK_LHCBZEE2FB.dat +++ /dev/null @@ -1,26 +0,0 @@ -******************************************************************************************* -SetName: LHCBZEE2FB -Author: Alberto Guffanti -Date: 25/11/2015 -CodesUsed: FEWZ 3.1b2 -TheoryInput: input cards in external/FEWZ_3.1.b2/InputCards -PDFset: NNPDF30_nlo_as_0118 -Warnings: No photon initiated processes, NLO QCD, ISR, ISRxFSR, EW (EW flag 1) -******************************************************************************************** -1.0198 0.00000 -1.0112 0.00000 -0.9982 0.00000 -1.0046 0.00000 -0.9925 0.00000 -0.9939 0.00000 -1.0051 0.00000 -1.0012 0.00000 -0.9917 0.00000 -1.0017 0.00000 -0.9940 0.00000 -1.0086 0.00000 -0.9956 0.00000 -1.0063 0.00000 -0.9837 0.00000 -1.0134 0.00000 -1.0007 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_MAS_NTVNBDMNFe.dat b/nnpdfcpp/data/NNLOCFAC/CF_MAS_NTVNBDMNFe.dat deleted file mode 100644 index cd47fe2b42..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_MAS_NTVNBDMNFe.dat +++ /dev/null @@ -1,54 +0,0 @@ -******************************************************************************** -SetName: NTVNBDMNFe -Author: Emanuele R. Nocera -Date: June 2020 -CodesUsed: Jun Gao private code + APFEL -TheoryInput: NNPDF3.1 alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** - 0.0000 0.0000 - 0.0000 0.0000 - 0.8888 0.0000 - 0.9130 0.0000 - 0.9164 0.0000 - 0.0000 0.0000 - 0.8669 0.0000 - 0.8587 0.0000 - 0.8973 0.0000 - 0.9081 0.0000 - 0.0000 0.0000 - 0.8526 0.0000 - 0.8406 0.0000 - 0.8836 0.0000 - 0.8967 0.0000 - 0.0000 0.0000 - 0.9256 0.0000 - 0.9072 0.0000 - 0.9469 0.0000 - 0.9394 0.0000 - 0.0000 0.0000 - 0.9096 0.0000 - 0.9005 0.0000 - 0.9237 0.0000 - 0.9307 0.0000 - 0.0000 0.0000 - 0.8814 0.0000 - 0.8774 0.0000 - 0.9041 0.0000 - 0.9138 0.0000 - 0.0000 0.0000 - 0.9522 0.0000 - 0.9409 0.0000 - 0.9600 0.0000 - 0.9568 0.0000 - 0.9028 0.0000 - 0.9222 0.0000 - 0.9163 0.0000 - 0.9349 0.0000 - 0.9413 0.0000 - 0.8805 0.0000 - 0.8977 0.0000 - 0.8919 0.0000 - 0.9126 0.0000 - 0.9230 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_MAS_NTVNUDMNFe.dat b/nnpdfcpp/data/NNLOCFAC/CF_MAS_NTVNUDMNFe.dat deleted file mode 100644 index 35e5f90308..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_MAS_NTVNUDMNFe.dat +++ /dev/null @@ -1,55 +0,0 @@ -******************************************************************************** -SetName: NTVNUDMNFe -Author: Emanuele R. Nocera -Date: June 2020 -CodesUsed: Jun Gao private code + APFEL -TheoryInput: NNPDF3.1 alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** - 0.0000 0.0000 - 0.0000 0.0000 - 0.8997 0.0000 - 0.9512 0.0000 - 0.9494 0.0000 - 0.0000 0.0000 - 0.8531 0.0000 - 0.8976 0.0000 - 0.9408 0.0000 - 0.9502 0.0000 - 0.0000 0.0000 - 0.8508 0.0000 - 0.8890 0.0000 - 0.9303 0.0000 - 0.9531 0.0000 - 0.0000 0.0000 - 0.9009 0.0000 - 0.9211 0.0000 - 0.9517 0.0000 - 0.9640 0.0000 - 0.9100 0.0000 - 0.9051 0.0000 - 0.9162 0.0000 - 0.9434 0.0000 - 0.9590 0.0000 - 0.8857 0.0000 - 0.8873 0.0000 - 0.9071 0.0000 - 0.9337 0.0000 - 0.9538 0.0000 - 0.0000 0.0000 - 0.9297 0.0000 - 0.9311 0.0000 - 0.9532 0.0000 - 0.9606 0.0000 - 0.9112 0.0000 - 0.9212 0.0000 - 0.9267 0.0000 - 0.9435 0.0000 - 0.9585 0.0000 - 0.8878 0.0000 - 0.8991 0.0000 - 0.9151 0.0000 - 0.9366 0.0000 - 0.9568 0.0000 - diff --git a/nnpdfcpp/data/NNLOCFAC/CF_MMHT_CMSDY2D12.dat b/nnpdfcpp/data/NNLOCFAC/CF_MMHT_CMSDY2D12.dat deleted file mode 100644 index 0e1be86fe5..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_MMHT_CMSDY2D12.dat +++ /dev/null @@ -1,141 +0,0 @@ -******************************************************************************************* -SetName: CMSDY2D12 -Author: L. Harland-Lang -Date: January 2017 -CodesUsed: FEWZ 3.1.b2 + smoothing -TheoryInput: -PDFset: MMHT2014nnlo68cl -Warnings: -******************************************************************************************** -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.00000000 0.00000 -1.115477318 0.00000 -1.107538773 0.00000 -1.105682966 0.00000 -1.107883954 0.00000 -1.112451647 0.00000 -1.117984629 0.00000 -1.123352678 0.00000 -1.127695807 0.00000 -1.130430241 0.00000 -1.131254772 0.00000 -1.130153872 0.00000 -1.127397038 0.00000 -1.123537023 0.00000 -1.119412893 0.00000 -1.116167555 0.00000 -1.115929936 0.00000 -1.104934846 0.00000 -1.121640364 0.00000 -1.109007284 0.00000 -1.106448053 0.00000 -1.112150997 0.00000 -1.122959788 0.00000 -1.133038673 0.00000 -1.133654891 0.00000 -0.988032903 0.00000 -0.983003987 0.00000 -0.980772618 0.00000 -0.980393323 0.00000 -0.98109719 0.00000 -0.982265404 0.00000 -0.983418839 0.00000 -0.984215793 0.00000 -0.984452522 0.00000 -0.984063452 0.00000 -0.983119971 0.00000 -0.981828807 0.00000 -0.980533091 0.00000 -0.979721474 0.00000 -0.980053888 0.00000 -0.981580908 0.00000 -0.987261944 0.00000 -0.992558928 0.00000 -0.997373576 0.00000 -1.0017504 0.00000 -1.005892602 0.00000 -1.010157309 0.00000 -1.01503423 0.00000 -1.021117769 0.00000 -0.988537461 0.00000 -0.992412214 0.00000 -0.99446056 0.00000 -0.995044538 0.00000 -0.994580486 0.00000 -0.993521246 0.00000 -0.992355 0.00000 -0.991614724 0.00000 -0.991891286 0.00000 -0.993841728 0.00000 -0.998181658 0.00000 -1.005647749 0.00000 -1.00680716 0.00000 -1.00899908 0.00000 -1.010889039 0.00000 -1.012785492 0.00000 -1.014871612 0.00000 -1.017208453 0.00000 -1.019739023 0.00000 -1.022292852 0.00000 -1.024590227 0.00000 -1.026244856 0.00000 -1.026763382 0.00000 -1.025539748 0.00000 -0.995354251 0.00000 -1.002383322 0.00000 -1.005676281 0.00000 -1.006083733 0.00000 -1.004568564 0.00000 -1.002224748 0.00000 -1.000282323 0.00000 -1.00010071 0.00000 -1.003153831 0.00000 -1.011011896 0.00000 -1.015010185 0.00000 -1.015300548 0.00000 -1.012947114 0.00000 -1.010504282 0.00000 -1.009984463 0.00000 -1.012913814 0.00000 -1.015185069 0.00000 -1.019371943 0.00000 -1.02458715 0.00000 -1.029323773 0.00000 -1.031460727 0.00000 -1.028259586 0.00000 -1.016353036 0.00000 -0.991726387 0.00000 -1.008011053 0.00000 -1.012092575 0.00000 -1.013816199 0.00000 -1.014897602 0.00000 -1.015991665 0.00000 -1.016709088 0.00000 -1.01563162 0.00000 -1.00889037 0.00000 -1.024379725 0.00000 -1.02981077 0.00000 -1.02009129 0.00000 -1.007713935 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASPHT12.dat b/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASPHT12.dat deleted file mode 100644 index 6129913441..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASPHT12.dat +++ /dev/null @@ -1,61 +0,0 @@ -******************************************************************************** -SetName: ATLASPHT12 -Author: Emanuele R. Nocera (enocera@nikhef.nl) -Date: February 2019 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Unity of measure conversion -******************************************************************************** -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 -0.000001 0.00000 - - - diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASWZTOT13TEV81PB.dat b/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASWZTOT13TEV81PB.dat deleted file mode 100644 index 4c9ea6ebd8..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASWZTOT13TEV81PB.dat +++ /dev/null @@ -1,12 +0,0 @@ -******************************************************************************************* -SetName: ATLASWZTOT13TEV81PB -Author: Alberto Guffanti -Date: June 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for total cross-section APPLgrids -******************************************************************************************** -9.8 0.00000 -9.8 0.00000 -9.8 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASZPT7TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASZPT7TEV.dat deleted file mode 100644 index 154696954b..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASZPT7TEV.dat +++ /dev/null @@ -1,87 +0,0 @@ -******************************************************************************************* -SetName: ATLASZPT7TEV_TOT -Author: Maria Ubiali -Date: June 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for total cross-section APPLgrids -******************************************************************************************** -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASZPT7TEV_PTZ.dat b/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASZPT7TEV_PTZ.dat deleted file mode 100644 index 154696954b..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASZPT7TEV_PTZ.dat +++ /dev/null @@ -1,87 +0,0 @@ -******************************************************************************************* -SetName: ATLASZPT7TEV_TOT -Author: Maria Ubiali -Date: June 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for total cross-section APPLgrids -******************************************************************************************** -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 -0.05 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASZPT7TEV_TOT.dat b/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASZPT7TEV_TOT.dat deleted file mode 100644 index e4b0a5bbf6..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASZPT7TEV_TOT.dat +++ /dev/null @@ -1,88 +0,0 @@ -******************************************************************************************* -SetName: ATLASZPT7TEV_TOT -Author: Maria Ubiali -Date: June 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for total cross-section APPLgrids -******************************************************************************************** -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 - 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASZPT8TEVMDIST.dat b/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASZPT8TEVMDIST.dat deleted file mode 100644 index b3e93350bc..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASZPT8TEVMDIST.dat +++ /dev/null @@ -1,73 +0,0 @@ -******************************************************************************************* -SetName: ATLASZPT8TEVMDIST -Author: Maria Ubiali -Date: June 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for APPLgrids not needed if we use UNNORMALISED DISTS -******************************************************************************************** -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASZPT8TEVYDIST.dat b/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASZPT8TEVYDIST.dat deleted file mode 100644 index f0df7a350d..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NRM_ATLASZPT8TEVYDIST.dat +++ /dev/null @@ -1,129 +0,0 @@ -******************************************************************************************* -SetName: ATLASZPT8TEVYDIST -Author: Maria Ubiali -Date: June 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for APPLgrids: rapidity bin size -******************************************************************************************** -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NRM_CMSZDIFF12.dat b/nnpdfcpp/data/NNLOCFAC/CF_NRM_CMSZDIFF12.dat deleted file mode 100644 index 5f80c1b125..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NRM_CMSZDIFF12.dat +++ /dev/null @@ -1,59 +0,0 @@ -******************************************************************************************* -SetName: CMSZDIFF12 -Author: Maria Ubiali -Date: June 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for total cross-section APPLgrids -******************************************************************************************** -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 -2.5 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NRM_LHCBWZMU7TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_NRM_LHCBWZMU7TEV.dat deleted file mode 100644 index b173c7e9bc..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NRM_LHCBWZMU7TEV.dat +++ /dev/null @@ -1,42 +0,0 @@ -******************************************************************************************* -SetName: LHCBWZMU7TEV -Author: Nathan Hartland nathan.hartland@physics.ox.ac.uk -Date: 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for APPLgrid -******************************************************************************************** -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.500 0.00000 -0.500 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.500 0.00000 -0.500 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NRM_LHCBWZMU7TEV_PI.dat b/nnpdfcpp/data/NNLOCFAC/CF_NRM_LHCBWZMU7TEV_PI.dat deleted file mode 100644 index b173c7e9bc..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NRM_LHCBWZMU7TEV_PI.dat +++ /dev/null @@ -1,42 +0,0 @@ -******************************************************************************************* -SetName: LHCBWZMU7TEV -Author: Nathan Hartland nathan.hartland@physics.ox.ac.uk -Date: 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for APPLgrid -******************************************************************************************** -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.500 0.00000 -0.500 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.500 0.00000 -0.500 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NRM_LHCBWZMU8TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_NRM_LHCBWZMU8TEV.dat deleted file mode 100644 index b05577c1e8..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NRM_LHCBWZMU8TEV.dat +++ /dev/null @@ -1,43 +0,0 @@ -******************************************************************************************* -SetName: LHCBWZMU8TEV -Author: Nathan Hartland nathan.hartland@physics.ox.ac.uk -Date: 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for APPLgrid -******************************************************************************************** -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.500 0.00000 -0.500 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.500 0.00000 -0.500 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NRM_LHCBWZMU8TEV_PI.dat b/nnpdfcpp/data/NNLOCFAC/CF_NRM_LHCBWZMU8TEV_PI.dat deleted file mode 100644 index b05577c1e8..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NRM_LHCBWZMU8TEV_PI.dat +++ /dev/null @@ -1,43 +0,0 @@ -******************************************************************************************* -SetName: LHCBWZMU8TEV -Author: Nathan Hartland nathan.hartland@physics.ox.ac.uk -Date: 2016 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Normalisation corrections for APPLgrid -******************************************************************************************** -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.125 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.500 0.00000 -0.500 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.250 0.00000 -0.500 0.00000 -0.500 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NUCI_CHORUSNBPb.dat b/nnpdfcpp/data/NNLOCFAC/CF_NUCI_CHORUSNBPb.dat deleted file mode 100644 index 7e7be4eebe..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NUCI_CHORUSNBPb.dat +++ /dev/null @@ -1,617 +0,0 @@ -******************************************************************************** -SetName: CHORUSNBPb_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.944878 0.00000 -0.925866 0.00000 -0.902828 0.00000 -0.000000 0.00000 -0.944491 0.00000 -0.937222 0.00000 -0.926841 0.00000 -0.912972 0.00000 -0.932401 0.00000 -0.939636 0.00000 -0.944758 0.00000 -0.950005 0.00000 -0.956799 0.00000 -0.935616 0.00000 -0.951374 0.00000 -0.970436 0.00000 -0.997284 0.00000 -1.038680 0.00000 -0.956538 0.00000 -0.982714 0.00000 -1.021170 0.00000 -1.082860 0.00000 -1.001280 0.00000 -1.042570 0.00000 -1.103830 0.00000 -1.203720 0.00000 -1.103350 0.00000 -1.169070 0.00000 -1.261280 0.00000 -1.281470 0.00000 -1.381890 0.00000 -1.514820 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.910125 0.00000 -0.889347 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.959284 0.00000 -0.946144 0.00000 -0.930367 0.00000 -0.911218 0.00000 -0.000000 0.00000 -0.955330 0.00000 -0.951537 0.00000 -0.945990 0.00000 -0.938372 0.00000 -0.928481 0.00000 -0.935877 0.00000 -0.946375 0.00000 -0.953138 0.00000 -0.959500 0.00000 -0.967503 0.00000 -0.978705 0.00000 -0.933447 0.00000 -0.949989 0.00000 -0.966496 0.00000 -0.987351 0.00000 -1.017500 0.00000 -1.064100 0.00000 -0.944520 0.00000 -0.965850 0.00000 -0.993829 0.00000 -1.034560 0.00000 -1.099320 0.00000 -1.210760 0.00000 -0.977019 0.00000 -1.008710 0.00000 -1.050520 0.00000 -1.112250 0.00000 -1.211990 0.00000 -1.064930 0.00000 -1.117760 0.00000 -1.181500 0.00000 -1.271680 0.00000 -1.412480 0.00000 -1.224170 0.00000 -1.309030 0.00000 -1.404390 0.00000 -1.532160 0.00000 -1.722210 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.802962 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.929205 0.00000 -0.913429 0.00000 -0.894309 0.00000 -0.872721 0.00000 -0.000000 0.00000 -0.969796 0.00000 -0.959835 0.00000 -0.948559 0.00000 -0.934731 0.00000 -0.917930 0.00000 -0.898856 0.00000 -0.960341 0.00000 -0.958984 0.00000 -0.956049 0.00000 -0.951780 0.00000 -0.946046 0.00000 -0.938674 0.00000 -0.930066 0.00000 -0.945000 0.00000 -0.954021 0.00000 -0.960644 0.00000 -0.968116 0.00000 -0.977959 0.00000 -0.991939 0.00000 -1.011370 0.00000 -0.942460 0.00000 -0.958487 0.00000 -0.975154 0.00000 -0.997006 0.00000 -1.029070 0.00000 -1.078730 0.00000 -1.155090 0.00000 -0.950004 0.00000 -0.972226 0.00000 -1.001010 0.00000 -1.042850 0.00000 -1.109280 0.00000 -1.222760 0.00000 -0.982226 0.00000 -1.014220 0.00000 -1.056390 0.00000 -1.118450 0.00000 -1.218240 0.00000 -1.394310 0.00000 -1.076080 0.00000 -1.127060 0.00000 -1.189790 0.00000 -1.278970 0.00000 -1.419760 0.00000 -1.651330 0.00000 -1.245690 0.00000 -1.325860 0.00000 -1.418260 0.00000 -1.544840 0.00000 -1.727890 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.846325 0.00000 -0.830022 0.00000 -0.811031 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.943119 0.00000 -0.931248 0.00000 -0.916299 0.00000 -0.898361 0.00000 -0.878450 0.00000 -0.000000 0.00000 -0.969616 0.00000 -0.961078 0.00000 -0.950994 0.00000 -0.938477 0.00000 -0.923283 0.00000 -0.906190 0.00000 -0.962742 0.00000 -0.961604 0.00000 -0.959366 0.00000 -0.956122 0.00000 -0.951737 0.00000 -0.946159 0.00000 -0.939766 0.00000 -0.950752 0.00000 -0.958785 0.00000 -0.965643 0.00000 -0.973860 0.00000 -0.985075 0.00000 -1.001050 0.00000 -1.023000 0.00000 -0.948607 0.00000 -0.963911 0.00000 -0.980728 0.00000 -1.003300 0.00000 -1.036720 0.00000 -1.088360 0.00000 -1.167270 0.00000 -0.954266 0.00000 -0.976818 0.00000 -1.005980 0.00000 -1.048530 0.00000 -1.115960 0.00000 -1.232350 0.00000 -1.436460 0.00000 -0.986347 0.00000 -1.018550 0.00000 -1.060940 0.00000 -1.123220 0.00000 -1.224370 0.00000 -1.397880 0.00000 -1.083990 0.00000 -1.133840 0.00000 -1.195960 0.00000 -1.285970 0.00000 -1.423760 0.00000 -1.652120 0.00000 -1.260480 0.00000 -1.337540 0.00000 -1.429580 0.00000 -1.552230 0.00000 -1.732420 0.00000 -2.006060 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.866005 0.00000 -0.853514 0.00000 -0.837791 0.00000 -0.820087 0.00000 -0.000000 0.00000 -0.953673 0.00000 -0.945165 0.00000 -0.933975 0.00000 -0.919937 0.00000 -0.903332 0.00000 -0.885206 0.00000 -0.977355 0.00000 -0.970325 0.00000 -0.963138 0.00000 -0.954244 0.00000 -0.943091 0.00000 -0.929574 0.00000 -0.914496 0.00000 -0.965157 0.00000 -0.964570 0.00000 -0.963153 0.00000 -0.961011 0.00000 -0.958106 0.00000 -0.954447 0.00000 -0.950381 0.00000 -0.956144 0.00000 -0.963446 0.00000 -0.970697 0.00000 -0.979877 0.00000 -0.992619 0.00000 -1.010690 0.00000 -1.035260 0.00000 -0.954583 0.00000 -0.969226 0.00000 -0.986194 0.00000 -1.009630 0.00000 -1.044480 0.00000 -1.099780 0.00000 -1.181900 0.00000 -0.959014 0.00000 -0.981634 0.00000 -1.011150 0.00000 -1.054260 0.00000 -1.123530 0.00000 -1.239930 0.00000 -1.444070 0.00000 -0.991238 0.00000 -1.023570 0.00000 -1.066130 0.00000 -1.129530 0.00000 -1.229610 0.00000 -1.402280 0.00000 -1.713890 0.00000 -1.092560 0.00000 -1.141370 0.00000 -1.204070 0.00000 -1.292030 0.00000 -1.428790 0.00000 -1.654210 0.00000 -1.275930 0.00000 -1.351470 0.00000 -1.439620 0.00000 -1.560500 0.00000 -1.737960 0.00000 -2.006170 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.881486 0.00000 -0.872751 0.00000 -0.860407 0.00000 -0.845442 0.00000 -0.829052 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.955584 0.00000 -0.947558 0.00000 -0.936952 0.00000 -0.923834 0.00000 -0.908532 0.00000 -0.892098 0.00000 -0.000000 0.00000 -0.977151 0.00000 -0.971824 0.00000 -0.965670 0.00000 -0.957807 0.00000 -0.947861 0.00000 -0.935880 0.00000 -0.922660 0.00000 -0.965879 0.00000 -0.967493 0.00000 -0.967477 0.00000 -0.966859 0.00000 -0.965763 0.00000 -0.964220 0.00000 -0.962323 0.00000 -0.960360 0.00000 -0.948179 0.00000 -0.960395 0.00000 -0.967491 0.00000 -0.975207 0.00000 -0.985314 0.00000 -0.999448 0.00000 -1.020550 0.00000 -1.047870 0.00000 -0.941448 0.00000 -0.959513 0.00000 -0.973603 0.00000 -0.990868 0.00000 -1.015040 0.00000 -1.051950 0.00000 -1.107940 0.00000 -1.192290 0.00000 -0.941791 0.00000 -0.963396 0.00000 -0.985922 0.00000 -1.015610 0.00000 -1.059800 0.00000 -1.129280 0.00000 -1.246530 0.00000 -1.450380 0.00000 -0.966169 0.00000 -0.996173 0.00000 -1.028520 0.00000 -1.071850 0.00000 -1.134570 0.00000 -1.234800 0.00000 -1.406860 0.00000 -1.714470 0.00000 -1.051430 0.00000 -1.100680 0.00000 -1.149640 0.00000 -1.210540 0.00000 -1.298170 0.00000 -1.434240 0.00000 -1.657490 0.00000 -2.026190 0.00000 -1.209510 0.00000 -1.289930 0.00000 -1.362420 0.00000 -1.449120 0.00000 -1.568590 0.00000 -1.743930 0.00000 -2.007840 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.737731 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.891243 0.00000 -0.886591 0.00000 -0.877641 0.00000 -0.865589 0.00000 -0.851317 0.00000 -0.000000 0.00000 -0.962472 0.00000 -0.957232 0.00000 -0.949553 0.00000 -0.939477 0.00000 -0.927100 0.00000 -0.912737 0.00000 -0.000000 0.00000 -0.977683 0.00000 -0.973305 0.00000 -0.967822 0.00000 -0.960653 0.00000 -0.951592 0.00000 -0.940680 0.00000 -0.967591 0.00000 -0.969251 0.00000 -0.969698 0.00000 -0.969655 0.00000 -0.969302 0.00000 -0.968742 0.00000 -0.968608 0.00000 -0.952734 0.00000 -0.963183 0.00000 -0.970218 0.00000 -0.978345 0.00000 -0.989133 0.00000 -1.004930 0.00000 -1.026570 0.00000 -0.946303 0.00000 -0.962634 0.00000 -0.976471 0.00000 -0.993964 0.00000 -1.019150 0.00000 -1.056400 0.00000 -1.113680 0.00000 -0.945212 0.00000 -0.966447 0.00000 -0.988854 0.00000 -1.019000 0.00000 -1.063150 0.00000 -1.133110 0.00000 -1.250950 0.00000 -0.970024 0.00000 -0.999943 0.00000 -1.032840 0.00000 -1.075480 0.00000 -1.138360 0.00000 -1.238730 0.00000 -1.410480 0.00000 -1.059100 0.00000 -1.106640 0.00000 -1.154780 0.00000 -1.215460 0.00000 -1.302940 0.00000 -1.438660 0.00000 -1.660620 0.00000 -1.223860 0.00000 -1.301090 0.00000 -1.370360 0.00000 -1.456140 0.00000 -1.574800 0.00000 -1.748820 0.00000 -2.009960 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.757137 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.895607 0.00000 -0.890478 0.00000 -0.881538 0.00000 -0.869813 0.00000 -0.000000 0.00000 -0.963693 0.00000 -0.958678 0.00000 -0.951293 0.00000 -0.941658 0.00000 -0.929840 0.00000 -0.983380 0.00000 -0.978421 0.00000 -0.974654 0.00000 -0.969642 0.00000 -0.963018 0.00000 -0.954604 0.00000 -0.968817 0.00000 -0.970682 0.00000 -0.971475 0.00000 -0.971862 0.00000 -0.972073 0.00000 -0.972592 0.00000 -0.955753 0.00000 -0.965170 0.00000 -0.972255 0.00000 -0.980696 0.00000 -0.992409 0.00000 -1.008480 0.00000 -0.949678 0.00000 -0.964804 0.00000 -0.978521 0.00000 -0.996481 0.00000 -1.021780 0.00000 -1.059710 0.00000 -0.947900 0.00000 -0.968705 0.00000 -0.991242 0.00000 -1.021220 0.00000 -1.065600 0.00000 -1.135960 0.00000 -0.973189 0.00000 -1.002940 0.00000 -1.035650 0.00000 -1.078340 0.00000 -1.141350 0.00000 -1.241880 0.00000 -1.064970 0.00000 -1.112280 0.00000 -1.158860 0.00000 -1.219410 0.00000 -1.306840 0.00000 -1.442380 0.00000 -1.234540 0.00000 -1.308320 0.00000 -1.376510 0.00000 -1.461700 0.00000 -1.579810 0.00000 -1.752970 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.000000 0.00000 -0.901951 0.00000 -0.901821 0.00000 -0.896305 0.00000 -0.000000 0.00000 -0.965761 0.00000 -0.961118 0.00000 -0.954246 0.00000 -0.982705 0.00000 -0.979944 0.00000 -0.976928 0.00000 -0.972562 0.00000 -0.970614 0.00000 -0.972891 0.00000 -0.974167 0.00000 -0.975169 0.00000 -0.959530 0.00000 -0.967882 0.00000 -0.975132 0.00000 -0.984243 0.00000 -0.953980 0.00000 -0.967659 0.00000 -0.981443 0.00000 -0.999537 0.00000 -0.951840 0.00000 -0.971846 0.00000 -0.994170 0.00000 -1.024290 0.00000 -0.978128 0.00000 -1.007990 0.00000 -1.039880 0.00000 -1.082660 0.00000 -1.073610 0.00000 -1.118940 0.00000 -1.165060 0.00000 -1.225490 0.00000 -1.249690 0.00000 -1.318900 0.00000 -1.385690 0.00000 -1.470150 0.00000 - diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NUCI_CHORUSNUPb.dat b/nnpdfcpp/data/NNLOCFAC/CF_NUCI_CHORUSNUPb.dat deleted file mode 100644 index 82bb6639f2..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NUCI_CHORUSNUPb.dat +++ /dev/null @@ -1,616 +0,0 @@ -******************************************************************************** -SetName: CHORUSNUPb_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01798 0.00000 -1.02156 0.00000 -1.02464 0.00000 -0.00000 0.00000 -1.01047 0.00000 -1.01361 0.00000 -1.01658 0.00000 -1.01903 0.00000 -0.98552 0.00000 -0.99022 0.00000 -0.99353 0.00000 -0.99620 0.00000 -0.99826 0.00000 -0.95688 0.00000 -0.96185 0.00000 -0.96532 0.00000 -0.96806 0.00000 -0.97016 0.00000 -0.90253 0.00000 -0.90816 0.00000 -0.91334 0.00000 -0.91780 0.00000 -0.83538 0.00000 -0.84357 0.00000 -0.85264 0.00000 -0.86096 0.00000 -0.80058 0.00000 -0.81504 0.00000 -0.82889 0.00000 -0.79579 0.00000 -0.82239 0.00000 -0.84490 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.99852 0.00000 -1.00263 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01150 0.00000 -1.01608 0.00000 -1.02018 0.00000 -1.02344 0.00000 -0.00000 0.00000 -1.00240 0.00000 -1.00585 0.00000 -1.00950 0.00000 -1.01280 0.00000 -1.01544 0.00000 -0.97763 0.00000 -0.98258 0.00000 -0.98598 0.00000 -0.98902 0.00000 -0.99167 0.00000 -0.99380 0.00000 -0.94937 0.00000 -0.95473 0.00000 -0.95818 0.00000 -0.96115 0.00000 -0.96374 0.00000 -0.96584 0.00000 -0.89454 0.00000 -0.89996 0.00000 -0.90544 0.00000 -0.91052 0.00000 -0.91497 0.00000 -0.91861 0.00000 -0.82270 0.00000 -0.83019 0.00000 -0.84057 0.00000 -0.85068 0.00000 -0.85956 0.00000 -0.78038 0.00000 -0.79521 0.00000 -0.81126 0.00000 -0.82625 0.00000 -0.83927 0.00000 -0.76628 0.00000 -0.79669 0.00000 -0.82280 0.00000 -0.84530 0.00000 -0.86460 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.94763 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.99526 0.00000 -1.00034 0.00000 -1.00395 0.00000 -1.00624 0.00000 -0.00000 0.00000 -1.00542 0.00000 -1.01060 0.00000 -1.01560 0.00000 -1.01978 0.00000 -1.02300 0.00000 -1.02521 0.00000 -0.99664 0.00000 -0.99932 0.00000 -1.00330 0.00000 -1.00726 0.00000 -1.01067 0.00000 -1.01338 0.00000 -1.01526 0.00000 -0.97629 0.00000 -0.97975 0.00000 -0.98294 0.00000 -0.98602 0.00000 -0.98875 0.00000 -0.99095 0.00000 -0.99250 0.00000 -0.94860 0.00000 -0.95218 0.00000 -0.95519 0.00000 -0.95811 0.00000 -0.96075 0.00000 -0.96292 0.00000 -0.96449 0.00000 -0.89249 0.00000 -0.89784 0.00000 -0.90325 0.00000 -0.90837 0.00000 -0.91290 0.00000 -0.91661 0.00000 -0.81784 0.00000 -0.82777 0.00000 -0.83911 0.00000 -0.84967 0.00000 -0.85880 0.00000 -0.86605 0.00000 -0.77574 0.00000 -0.79224 0.00000 -0.80935 0.00000 -0.82508 0.00000 -0.83868 0.00000 -0.84952 0.00000 -0.76704 0.00000 -0.79677 0.00000 -0.82294 0.00000 -0.84608 0.00000 -0.86502 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.94152 0.00000 -0.94652 0.00000 -0.94956 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.99064 0.00000 -0.99691 0.00000 -1.00154 0.00000 -1.00483 0.00000 -1.00691 0.00000 -0.00000 0.00000 -1.00475 0.00000 -1.01044 0.00000 -1.01549 0.00000 -1.01962 0.00000 -1.02278 0.00000 -1.02493 0.00000 -0.99394 0.00000 -0.99742 0.00000 -1.00175 0.00000 -1.00580 0.00000 -1.00926 0.00000 -1.01198 0.00000 -1.01388 0.00000 -0.97452 0.00000 -0.97750 0.00000 -0.98074 0.00000 -0.98391 0.00000 -0.98671 0.00000 -0.98896 0.00000 -0.99055 0.00000 -0.94712 0.00000 -0.94988 0.00000 -0.95283 0.00000 -0.95581 0.00000 -0.95855 0.00000 -0.96081 0.00000 -0.96245 0.00000 -0.89085 0.00000 -0.89605 0.00000 -0.90148 0.00000 -0.90669 0.00000 -0.91131 0.00000 -0.91477 0.00000 -0.91763 0.00000 -0.81508 0.00000 -0.82637 0.00000 -0.83819 0.00000 -0.84899 0.00000 -0.85812 0.00000 -0.86565 0.00000 -0.77269 0.00000 -0.79048 0.00000 -0.80832 0.00000 -0.82456 0.00000 -0.83831 0.00000 -0.84935 0.00000 -0.76717 0.00000 -0.79675 0.00000 -0.82353 0.00000 -0.84637 0.00000 -0.86549 0.00000 -0.88072 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.93901 0.00000 -0.94516 0.00000 -0.94922 0.00000 -0.95164 0.00000 -0.00000 0.00000 -0.98521 0.00000 -0.99292 0.00000 -0.99859 0.00000 -1.00280 0.00000 -1.00581 0.00000 -1.00772 0.00000 -0.99852 0.00000 -1.00461 0.00000 -1.01054 0.00000 -1.01552 0.00000 -1.01954 0.00000 -1.02259 0.00000 -1.02468 0.00000 -0.99146 0.00000 -0.99568 0.00000 -1.00025 0.00000 -1.00437 0.00000 -1.00782 0.00000 -1.01053 0.00000 -1.01242 0.00000 -0.97210 0.00000 -0.97501 0.00000 -0.97838 0.00000 -0.98164 0.00000 -0.98451 0.00000 -0.98682 0.00000 -0.98846 0.00000 -0.94470 0.00000 -0.94711 0.00000 -0.95014 0.00000 -0.95327 0.00000 -0.95614 0.00000 -0.95812 0.00000 -0.95988 0.00000 -0.88870 0.00000 -0.89381 0.00000 -0.89937 0.00000 -0.90473 0.00000 -0.90918 0.00000 -0.91316 0.00000 -0.91610 0.00000 -0.81270 0.00000 -0.82501 0.00000 -0.83723 0.00000 -0.84811 0.00000 -0.85759 0.00000 -0.86521 0.00000 -0.87082 0.00000 -0.76984 0.00000 -0.78892 0.00000 -0.80753 0.00000 -0.82408 0.00000 -0.83811 0.00000 -0.84933 0.00000 -0.76705 0.00000 -0.79720 0.00000 -0.82376 0.00000 -0.84686 0.00000 -0.86622 0.00000 -0.88164 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.93566 0.00000 -0.94321 0.00000 -0.94835 0.00000 -0.95178 0.00000 -0.95378 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.98798 0.00000 -0.99493 0.00000 -1.00008 0.00000 -1.00397 0.00000 -1.00682 0.00000 -1.00865 0.00000 -0.00000 0.00000 -0.99815 0.00000 -1.00496 0.00000 -1.01082 0.00000 -1.01565 0.00000 -1.01953 0.00000 -1.02248 0.00000 -1.02451 0.00000 -0.98804 0.00000 -0.98960 0.00000 -0.99436 0.00000 -0.99901 0.00000 -1.00311 0.00000 -1.00654 0.00000 -1.00922 0.00000 -1.01111 0.00000 -0.96793 0.00000 -0.96962 0.00000 -0.97269 0.00000 -0.97619 0.00000 -0.97954 0.00000 -0.98247 0.00000 -0.98451 0.00000 -0.98623 0.00000 -0.94068 0.00000 -0.94193 0.00000 -0.94434 0.00000 -0.94755 0.00000 -0.95085 0.00000 -0.95350 0.00000 -0.95604 0.00000 -0.95788 0.00000 -0.88304 0.00000 -0.88627 0.00000 -0.89148 0.00000 -0.89725 0.00000 -0.90251 0.00000 -0.90751 0.00000 -0.91160 0.00000 -0.91462 0.00000 -0.80186 0.00000 -0.81082 0.00000 -0.82381 0.00000 -0.83616 0.00000 -0.84746 0.00000 -0.85706 0.00000 -0.86476 0.00000 -0.87042 0.00000 -0.75142 0.00000 -0.76763 0.00000 -0.78786 0.00000 -0.80696 0.00000 -0.82385 0.00000 -0.83810 0.00000 -0.84948 0.00000 -0.85783 0.00000 -0.73404 0.00000 -0.76695 0.00000 -0.79733 0.00000 -0.82422 0.00000 -0.84759 0.00000 -0.86719 0.00000 -0.88280 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.85430 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.92941 0.00000 -0.93946 0.00000 -0.94608 0.00000 -0.95067 0.00000 -0.95375 0.00000 -0.00000 0.00000 -0.98054 0.00000 -0.98986 0.00000 -0.99631 0.00000 -1.00118 0.00000 -1.00494 0.00000 -1.00767 0.00000 -0.00000 0.00000 -0.99843 0.00000 -1.00534 0.00000 -1.01107 0.00000 -1.01576 0.00000 -1.01953 0.00000 -1.02241 0.00000 -0.98564 0.00000 -0.98855 0.00000 -0.99351 0.00000 -0.99817 0.00000 -1.00223 0.00000 -1.00562 0.00000 -1.00805 0.00000 -0.96646 0.00000 -0.96779 0.00000 -0.97103 0.00000 -0.97462 0.00000 -0.97803 0.00000 -0.98071 0.00000 -0.98314 0.00000 -0.93937 0.00000 -0.93970 0.00000 -0.94225 0.00000 -0.94564 0.00000 -0.94873 0.00000 -0.95191 0.00000 -0.95452 0.00000 -0.88130 0.00000 -0.88428 0.00000 -0.88967 0.00000 -0.89529 0.00000 -0.90113 0.00000 -0.90625 0.00000 -0.91043 0.00000 -0.79887 0.00000 -0.80957 0.00000 -0.82268 0.00000 -0.83553 0.00000 -0.84696 0.00000 -0.85665 0.00000 -0.86442 0.00000 -0.74822 0.00000 -0.76637 0.00000 -0.78725 0.00000 -0.80669 0.00000 -0.82378 0.00000 -0.83818 0.00000 -0.84967 0.00000 -0.73405 0.00000 -0.76726 0.00000 -0.79758 0.00000 -0.82473 0.00000 -0.84831 0.00000 -0.86807 0.00000 -0.88381 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.85213 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.93324 0.00000 -0.94223 0.00000 -0.94829 0.00000 -0.95254 0.00000 -0.00000 0.00000 -0.98257 0.00000 -0.99126 0.00000 -0.99737 0.00000 -1.00209 0.00000 -1.00572 0.00000 -0.99161 0.00000 -0.99883 0.00000 -1.00570 0.00000 -1.01129 0.00000 -1.01586 0.00000 -1.01954 0.00000 -0.98409 0.00000 -0.98786 0.00000 -0.99290 0.00000 -0.99753 0.00000 -1.00156 0.00000 -1.00470 0.00000 -0.96502 0.00000 -0.96639 0.00000 -0.96976 0.00000 -0.97341 0.00000 -0.97656 0.00000 -0.97961 0.00000 -0.93785 0.00000 -0.93789 0.00000 -0.94062 0.00000 -0.94376 0.00000 -0.94740 0.00000 -0.95066 0.00000 -0.87972 0.00000 -0.88262 0.00000 -0.88776 0.00000 -0.89407 0.00000 -0.90003 0.00000 -0.90525 0.00000 -0.79696 0.00000 -0.80863 0.00000 -0.82205 0.00000 -0.83503 0.00000 -0.84655 0.00000 -0.85632 0.00000 -0.74603 0.00000 -0.76553 0.00000 -0.78688 0.00000 -0.80655 0.00000 -0.82380 0.00000 -0.83831 0.00000 -0.73393 0.00000 -0.76730 0.00000 -0.79789 0.00000 -0.82525 0.00000 -0.84900 0.00000 -0.86888 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.92558 0.00000 -0.93843 0.00000 -0.94622 0.00000 -0.00000 0.00000 -0.98540 0.00000 -0.99326 0.00000 -0.99902 0.00000 -0.99129 0.00000 -0.99960 0.00000 -1.00624 0.00000 -1.01160 0.00000 -0.98231 0.00000 -0.98698 0.00000 -0.99204 0.00000 -0.99660 0.00000 -0.96265 0.00000 -0.96435 0.00000 -0.96787 0.00000 -0.97133 0.00000 -0.93502 0.00000 -0.93512 0.00000 -0.93775 0.00000 -0.94163 0.00000 -0.87702 0.00000 -0.88003 0.00000 -0.88564 0.00000 -0.89220 0.00000 -0.79454 0.00000 -0.80694 0.00000 -0.82106 0.00000 -0.83424 0.00000 -0.74332 0.00000 -0.76456 0.00000 -0.78648 0.00000 -0.80646 0.00000 -0.73369 0.00000 -0.76755 0.00000 -0.79857 0.00000 -0.82624 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NUCI_DYE605.dat b/nnpdfcpp/data/NNLOCFAC/CF_NUCI_DYE605.dat deleted file mode 100644 index 0636103888..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NUCI_DYE605.dat +++ /dev/null @@ -1,128 +0,0 @@ -******************************************************************************** -SetName: DYE605_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -1.02516 0.00000 -1.03735 0.00000 -1.05080 0.00000 -1.06537 0.00000 -1.08208 0.00000 -1.10033 0.00000 -1.12037 0.00000 -1.14199 0.00000 -1.16618 0.00000 -1.19291 0.00000 -1.48633 0.00000 -1.53430 0.00000 -1.58518 0.00000 -1.69394 0.00000 -1.93774 0.00000 -2.34739 0.00000 -2.86905 0.00000 -1.02039 0.00000 -1.03169 0.00000 -1.04463 0.00000 -1.05885 0.00000 -1.07521 0.00000 -1.09326 0.00000 -1.11384 0.00000 -1.13596 0.00000 -1.16107 0.00000 -1.18941 0.00000 -1.52016 0.00000 -1.57510 0.00000 -1.63875 0.00000 -1.77110 0.00000 -2.08294 0.00000 -2.64350 0.00000 -3.38002 0.00000 -3.91444 0.00000 -1.02093 0.00000 -1.03191 0.00000 -1.04458 0.00000 -1.05866 0.00000 -1.07474 0.00000 -1.09270 0.00000 -1.11361 0.00000 -1.13554 0.00000 -1.16099 0.00000 -1.18996 0.00000 -1.53351 0.00000 -1.59223 0.00000 -1.66125 0.00000 -1.80491 0.00000 -2.15155 0.00000 -2.80895 0.00000 -3.75998 0.00000 -4.52929 0.00000 -1.02738 0.00000 -1.03874 0.00000 -1.05173 0.00000 -1.06600 0.00000 -1.08240 0.00000 -1.10046 0.00000 -1.12107 0.00000 -1.14328 0.00000 -1.16840 0.00000 -1.19675 0.00000 -1.53202 0.00000 -1.58889 0.00000 -1.65507 0.00000 -1.79417 0.00000 -2.13238 0.00000 -2.79281 0.00000 -3.83659 0.00000 -4.84716 0.00000 -1.03899 0.00000 -1.05136 0.00000 -1.06501 0.00000 -1.07984 0.00000 -1.09680 0.00000 -1.11533 0.00000 -1.13576 0.00000 -1.15787 0.00000 -1.18262 0.00000 -1.21000 0.00000 -1.52229 0.00000 -1.57538 0.00000 -1.63297 0.00000 -1.75861 0.00000 -2.05852 0.00000 -2.63891 0.00000 -3.59482 0.00000 -4.65591 0.00000 -1.05418 0.00000 -1.06754 0.00000 -1.08207 0.00000 -1.09780 0.00000 -1.11509 0.00000 -1.13388 0.00000 -1.15475 0.00000 -1.17608 0.00000 -1.20030 0.00000 -1.22640 0.00000 -1.51100 0.00000 -1.55804 0.00000 -1.60968 0.00000 -1.71746 0.00000 -1.97439 0.00000 -2.46396 0.00000 -3.25020 0.00000 -4.06964 0.00000 -1.17358 0.00000 -1.19552 0.00000 -1.21817 0.00000 -1.24325 0.00000 -1.50455 0.00000 -1.54896 0.00000 -1.59131 0.00000 -1.68797 0.00000 -1.90819 0.00000 -2.31425 0.00000 -2.90654 0.00000 -3.43485 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NUCI_EMCF2C.dat b/nnpdfcpp/data/NNLOCFAC/CF_NUCI_EMCF2C.dat deleted file mode 100644 index 1673b220c5..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NUCI_EMCF2C.dat +++ /dev/null @@ -1,30 +0,0 @@ -******************************************************************************** -SetName: EMCF2C_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.77041 0.00000 -0.00000 0.00000 -2.93464 0.00000 -1.40915 0.00000 --2.5422 0.00000 -1.59855 0.00000 -1.24851 0.00000 -0.69964 0.00000 -1.01968 0.00000 -1.07151 0.00000 -0.21282 0.00000 -0.50069 0.00000 -0.66773 0.00000 -0.05176 0.00000 -0.16189 0.00000 -0.24895 0.00000 -0.01126 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NUCI_NTVNBDMNFe.dat b/nnpdfcpp/data/NNLOCFAC/CF_NUCI_NTVNBDMNFe.dat deleted file mode 100644 index 8b63f518cd..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NUCI_NTVNBDMNFe.dat +++ /dev/null @@ -1,54 +0,0 @@ -******************************************************************************** -SetName: NTVNBDMNFe_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -1.08447 0.00000 -1.10474 0.00000 -1.00141 0.00000 -0.00000 0.00000 -0.95314 0.00000 -1.03941 0.00000 -1.11040 0.00000 -1.16431 0.00000 -0.00000 0.00000 -0.92603 0.00000 -1.01702 0.00000 -1.11188 0.00000 -1.24951 0.00000 -0.00000 0.00000 -0.96207 0.00000 -1.04574 0.00000 -1.09871 0.00000 -1.06599 0.00000 -0.00000 0.00000 -0.93073 0.00000 -1.02115 0.00000 -1.10861 0.00000 -1.18929 0.00000 -0.00000 0.00000 -0.91481 0.00000 -1.00840 0.00000 -1.11318 0.00000 -1.25942 0.00000 -0.00000 0.00000 -0.94820 0.00000 -1.03360 0.00000 -1.09892 0.00000 -1.09178 0.00000 -0.83160 0.00000 -0.92835 0.00000 -1.01844 0.00000 -1.11166 0.00000 -1.19936 0.00000 -0.82021 0.00000 -0.91675 0.00000 -1.00966 0.00000 -1.11763 0.00000 -1.26349 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NUCI_NTVNUDMNFe.dat b/nnpdfcpp/data/NNLOCFAC/CF_NUCI_NTVNUDMNFe.dat deleted file mode 100644 index 19700b0639..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NUCI_NTVNUDMNFe.dat +++ /dev/null @@ -1,54 +0,0 @@ -******************************************************************************** -SetName: NTVNUDMNFe_sh_ite -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.81577 0.00000 -0.74612 0.00000 -0.73276 0.00000 -0.00000 0.00000 -0.86404 0.00000 -0.84077 0.00000 -0.78843 0.00000 -0.79038 0.00000 -0.00000 0.00000 -0.85626 0.00000 -0.84308 0.00000 -0.80512 0.00000 -0.82069 0.00000 -0.00000 0.00000 -0.88681 0.00000 -0.85878 0.00000 -0.78680 0.00000 -0.75078 0.00000 -0.82719 0.00000 -0.88204 0.00000 -0.86924 0.00000 -0.81698 0.00000 -0.79878 0.00000 -0.81497 0.00000 -0.87265 0.00000 -0.86766 0.00000 -0.82870 0.00000 -0.82563 0.00000 -0.00000 0.00000 -0.89568 0.00000 -0.87323 0.00000 -0.80210 0.00000 -0.75655 0.00000 -0.83195 0.00000 -0.88890 0.00000 -0.87941 0.00000 -0.82764 0.00000 -0.80169 0.00000 -0.82104 0.00000 -0.87973 0.00000 -0.87696 0.00000 -0.83760 0.00000 -0.82746 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NUC_CHORUSNBPb.dat b/nnpdfcpp/data/NNLOCFAC/CF_NUC_CHORUSNBPb.dat deleted file mode 100644 index 4b0796b9b3..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NUC_CHORUSNBPb.dat +++ /dev/null @@ -1,616 +0,0 @@ -******************************************************************************** -SetName: CHORUSNBPb_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.948603 0.00000 -0.930946 0.00000 -0.906397 0.00000 -0.00000 0.00000 -0.940013 0.00000 -0.927882 0.00000 -0.91504 0.00000 -0.902543 0.00000 -0.944419 0.00000 -0.926325 0.00000 -0.926899 0.00000 -0.93689 0.00000 -0.943616 0.00000 -0.934657 0.00000 -0.952562 0.00000 -0.95968 0.00000 -0.962898 0.00000 -0.972215 0.00000 -0.972763 0.00000 -0.992554 0.00000 -1.02007 0.00000 -1.07074 0.00000 -1.0088 0.00000 -1.05907 0.00000 -1.1272 0.00000 -1.2416 0.00000 -1.14645 0.00000 -1.22708 0.00000 -1.35309 0.00000 -1.31384 0.00000 -1.44284 0.00000 -1.65241 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.901478 0.00000 -0.873831 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.963084 0.00000 -0.948769 0.00000 -0.930071 0.00000 -0.907916 0.00000 -0.00000 0.00000 -0.951165 0.00000 -0.9433 0.00000 -0.938884 0.00000 -0.932703 0.00000 -0.924053 0.00000 -0.949953 0.00000 -0.936863 0.00000 -0.945344 0.00000 -0.955994 0.00000 -0.957876 0.00000 -0.959381 0.00000 -0.933576 0.00000 -0.951518 0.00000 -0.953544 0.00000 -0.956097 0.00000 -0.967115 0.00000 -0.992014 0.00000 -0.961888 0.00000 -0.976691 0.00000 -0.995913 0.00000 -1.03259 0.00000 -1.0942 0.00000 -1.20291 0.00000 -0.982795 0.00000 -1.02486 0.00000 -1.07292 0.00000 -1.14573 0.00000 -1.26437 0.00000 -1.09732 0.00000 -1.1594 0.00000 -1.24685 0.00000 -1.38448 0.00000 -1.61957 0.00000 -1.2465 0.00000 -1.34723 0.00000 -1.49801 0.00000 -1.71891 0.00000 -2.06806 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.821824 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.923045 0.00000 -0.901677 0.00000 -0.877688 0.00000 -0.853135 0.00000 -0.00000 0.00000 -0.973311 0.00000 -0.962043 0.00000 -0.947647 0.00000 -0.93121 0.00000 -0.912929 0.00000 -0.893392 0.00000 -0.956276 0.00000 -0.951953 0.00000 -0.950497 0.00000 -0.948006 0.00000 -0.943232 0.00000 -0.936052 0.00000 -0.92712 0.00000 -0.946263 0.00000 -0.948202 0.00000 -0.959966 0.00000 -0.962055 0.00000 -0.964243 0.00000 -0.966056 0.00000 -0.973163 0.00000 -0.944994 0.00000 -0.951055 0.00000 -0.951785 0.00000 -0.962017 0.00000 -0.983126 0.00000 -1.01528 0.00000 -1.06147 0.00000 -0.966127 0.00000 -0.978025 0.00000 -1.00356 0.00000 -1.04475 0.00000 -1.11183 0.00000 -1.22082 0.00000 -0.99539 0.00000 -1.03348 0.00000 -1.08412 0.00000 -1.15789 0.00000 -1.27756 0.00000 -1.49464 0.00000 -1.10839 0.00000 -1.17242 0.00000 -1.26502 0.00000 -1.40505 0.00000 -1.64401 0.00000 -2.10069 0.00000 -1.26406 0.00000 -1.37946 0.00000 -1.52822 0.00000 -1.73125 0.00000 -2.06154 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.862212 0.00000 -0.851577 0.00000 -0.840614 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.940469 0.00000 -0.923333 0.00000 -0.904106 0.00000 -0.883917 0.00000 -0.863261 0.00000 -0.00000 0.00000 -0.97254 0.00000 -0.960905 0.00000 -0.948244 0.00000 -0.934608 0.00000 -0.919184 0.00000 -0.901688 0.00000 -0.958641 0.00000 -0.955919 0.00000 -0.956091 0.00000 -0.954071 0.00000 -0.949983 0.00000 -0.943943 0.00000 -0.936535 0.00000 -0.94405 0.00000 -0.960233 0.00000 -0.963204 0.00000 -0.965276 0.00000 -0.967912 0.00000 -0.974618 0.00000 -0.984277 0.00000 -0.950519 0.00000 -0.949 0.00000 -0.955283 0.00000 -0.971976 0.00000 -0.995313 0.00000 -1.02938 0.00000 -1.08075 0.00000 -0.965673 0.00000 -0.98175 0.00000 -1.01033 0.00000 -1.054 0.00000 -1.11836 0.00000 -1.22968 0.00000 -1.41971 0.00000 -1.00219 0.00000 -1.04113 0.00000 -1.09189 0.00000 -1.16566 0.00000 -1.28655 0.00000 -1.4998 0.00000 -1.11569 0.00000 -1.18487 0.00000 -1.27808 0.00000 -1.41952 0.00000 -1.65589 0.00000 -2.11045 0.00000 -1.28416 0.00000 -1.40273 0.00000 -1.53865 0.00000 -1.7337 0.00000 -2.04939 0.00000 -2.60565 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.882894 0.00000 -0.877882 0.00000 -0.871204 0.00000 -0.852478 0.00000 -0.00000 0.00000 -0.954223 0.00000 -0.940573 0.00000 -0.926367 0.00000 -0.911239 0.00000 -0.894247 0.00000 -0.875331 0.00000 -0.980798 0.00000 -0.971013 0.00000 -0.961147 0.00000 -0.951594 0.00000 -0.940353 0.00000 -0.926214 0.00000 -0.910522 0.00000 -0.959091 0.00000 -0.96148 0.00000 -0.961702 0.00000 -0.959926 0.00000 -0.956522 0.00000 -0.951791 0.00000 -0.946144 0.00000 -0.954158 0.00000 -0.963818 0.00000 -0.965801 0.00000 -0.968904 0.00000 -0.975033 0.00000 -0.984084 0.00000 -0.996852 0.00000 -0.948329 0.00000 -0.950597 0.00000 -0.964295 0.00000 -0.982006 0.00000 -1.00707 0.00000 -1.04656 0.00000 -1.10408 0.00000 -0.966408 0.00000 -0.987419 0.00000 -1.01806 0.00000 -1.05844 0.00000 -1.1241 0.00000 -1.23264 0.00000 -1.41998 0.00000 -1.00953 0.00000 -1.04922 0.00000 -1.09948 0.00000 -1.17383 0.00000 -1.29289 0.00000 -1.50537 0.00000 -1.91402 0.00000 -1.12745 0.00000 -1.19828 0.00000 -1.29204 0.00000 -1.43115 0.00000 -1.66737 0.00000 -2.11967 0.00000 -1.31046 0.00000 -1.41788 0.00000 -1.54463 0.00000 -1.73037 0.00000 -2.02917 0.00000 -2.55469 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.899099 0.00000 -0.899173 0.00000 -0.889885 0.00000 -0.872017 0.00000 -0.852214 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.953987 0.00000 -0.943529 0.00000 -0.93276 0.00000 -0.919749 0.00000 -0.902293 0.00000 -0.883913 0.00000 -0.00000 0.00000 -0.979523 0.00000 -0.970761 0.00000 -0.964082 0.00000 -0.956162 0.00000 -0.945688 0.00000 -0.933107 0.00000 -0.919327 0.00000 -0.962212 0.00000 -0.963546 0.00000 -0.966228 0.00000 -0.966215 0.00000 -0.964721 0.00000 -0.962164 0.00000 -0.958663 0.00000 -0.954738 0.00000 -0.950738 0.00000 -0.963279 0.00000 -0.965896 0.00000 -0.968667 0.00000 -0.974116 0.00000 -0.981974 0.00000 -0.993863 0.00000 -1.00912 0.00000 -0.944521 0.00000 -0.946732 0.00000 -0.957273 0.00000 -0.97184 0.00000 -0.990734 0.00000 -1.01912 0.00000 -1.05978 0.00000 -1.11764 0.00000 -0.958693 0.00000 -0.970202 0.00000 -0.993423 0.00000 -1.02093 0.00000 -1.0622 0.00000 -1.12666 0.00000 -1.2344 0.00000 -1.41856 0.00000 -0.979113 0.00000 -1.01747 0.00000 -1.05626 0.00000 -1.10637 0.00000 -1.17936 0.00000 -1.29886 0.00000 -1.51159 0.00000 -1.91639 0.00000 -1.07738 0.00000 -1.14034 0.00000 -1.21103 0.00000 -1.30209 0.00000 -1.44117 0.00000 -1.6771 0.00000 -2.1256 0.00000 -3.0956 0.00000 -1.21955 0.00000 -1.33094 0.00000 -1.42534 0.00000 -1.54566 0.00000 -1.72345 0.00000 -2.01635 0.00000 -2.52653 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.698014 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.907598 0.00000 -0.911093 0.00000 -0.905125 0.00000 -0.889193 0.00000 -0.870739 0.00000 -0.00000 0.00000 -0.964504 0.00000 -0.955289 0.00000 -0.947961 0.00000 -0.938272 0.00000 -0.923896 0.00000 -0.907453 0.00000 -0.00000 0.00000 -0.978373 0.00000 -0.972197 0.00000 -0.966951 0.00000 -0.959422 0.00000 -0.949867 0.00000 -0.938389 0.00000 -0.96393 0.00000 -0.967054 0.00000 -0.969216 0.00000 -0.969107 0.00000 -0.967981 0.00000 -0.966069 0.00000 -0.964133 0.00000 -0.948545 0.00000 -0.964907 0.00000 -0.96698 0.00000 -0.971664 0.00000 -0.978067 0.00000 -0.987366 0.00000 -0.999869 0.00000 -0.948834 0.00000 -0.948686 0.00000 -0.962332 0.00000 -0.977009 0.00000 -0.997579 0.00000 -1.02553 0.00000 -1.06637 0.00000 -0.957804 0.00000 -0.973727 0.00000 -0.995599 0.00000 -1.02309 0.00000 -1.06359 0.00000 -1.12781 0.00000 -1.23534 0.00000 -0.985206 0.00000 -1.023 0.00000 -1.06133 0.00000 -1.11019 0.00000 -1.18356 0.00000 -1.30356 0.00000 -1.51639 0.00000 -1.08422 0.00000 -1.14965 0.00000 -1.21834 0.00000 -1.30903 0.00000 -1.44799 0.00000 -1.68345 0.00000 -2.12932 0.00000 -1.2368 0.00000 -1.3404 0.00000 -1.42879 0.00000 -1.54482 0.00000 -1.72254 0.00000 -2.01051 0.00000 -2.50592 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.722875 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.915655 0.00000 -0.917754 0.00000 -0.904364 0.00000 -0.887862 0.00000 -0.00000 0.00000 -0.964603 0.00000 -0.958092 0.00000 -0.952093 0.00000 -0.941033 0.00000 -0.927229 0.00000 -0.986733 0.00000 -0.978129 0.00000 -0.974179 0.00000 -0.9691 0.00000 -0.962134 0.00000 -0.953248 0.00000 -0.963456 0.00000 -0.969582 0.00000 -0.971253 0.00000 -0.971201 0.00000 -0.970381 0.00000 -0.969453 0.00000 -0.953859 0.00000 -0.965908 0.00000 -0.968886 0.00000 -0.974078 0.00000 -0.981273 0.00000 -0.99088 0.00000 -0.947562 0.00000 -0.952363 0.00000 -0.965711 0.00000 -0.981305 0.00000 -1.00136 0.00000 -1.02929 0.00000 -0.957689 0.00000 -0.976638 0.00000 -0.997121 0.00000 -1.02398 0.00000 -1.06439 0.00000 -1.12874 0.00000 -0.989618 0.00000 -1.0271 0.00000 -1.0643 0.00000 -1.11321 0.00000 -1.18692 0.00000 -1.30728 0.00000 -1.09104 0.00000 -1.15733 0.00000 -1.22371 0.00000 -1.31418 0.00000 -1.45297 0.00000 -1.68808 0.00000 -1.25167 0.00000 -1.34564 0.00000 -1.43012 0.00000 -1.54582 0.00000 -1.72242 0.00000 -2.00595 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.918866 0.00000 -0.928296 0.00000 -0.916925 0.00000 -0.00000 0.00000 -0.966479 0.00000 -0.963885 0.00000 -0.956083 0.00000 -0.98554 0.00000 -0.979571 0.00000 -0.977033 0.00000 -0.972522 0.00000 -0.966715 0.00000 -0.972761 0.00000 -0.973961 0.00000 -0.974148 0.00000 -0.963573 0.00000 -0.966972 0.00000 -0.971738 0.00000 -0.97765 0.00000 -0.945358 0.00000 -0.957698 0.00000 -0.970908 0.00000 -0.985988 0.00000 -0.959856 0.00000 -0.978901 0.00000 -0.998146 0.00000 -1.02497 0.00000 -0.997215 0.00000 -1.03278 0.00000 -1.06865 0.00000 -1.11785 0.00000 -1.1036 0.00000 -1.16602 0.00000 -1.23136 0.00000 -1.32141 0.00000 -1.2736 0.00000 -1.35132 0.00000 -1.43272 0.00000 -1.5488 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NUC_CHORUSNUPb.dat b/nnpdfcpp/data/NNLOCFAC/CF_NUC_CHORUSNUPb.dat deleted file mode 100644 index aa403964c4..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NUC_CHORUSNUPb.dat +++ /dev/null @@ -1,616 +0,0 @@ -******************************************************************************** -SetName: CHORUSNUPb_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.02838 0.00000 -1.03033 0.00000 -1.03279 0.00000 -0.00000 0.00000 -1.03094 0.00000 -1.03184 0.00000 -1.03158 0.00000 -1.03118 0.00000 -1.00044 0.00000 -1.00835 0.00000 -1.01308 0.00000 -1.01604 0.00000 -1.01822 0.00000 -0.96213 0.00000 -0.973142 0.00000 -0.979112 0.00000 -0.98364 0.00000 -0.987076 0.00000 -0.919647 0.00000 -0.924856 0.00000 -0.929542 0.00000 -0.934437 0.00000 -0.836432 0.00000 -0.845992 0.00000 -0.85657 0.00000 -0.865836 0.00000 -0.808031 0.00000 -0.82003 0.00000 -0.831081 0.00000 -0.796654 0.00000 -0.816634 0.00000 -0.835165 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.98308 0.00000 -0.987211 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.01935 0.00000 -1.02259 0.00000 -1.02632 0.00000 -1.02933 0.00000 -0.00000 0.00000 -1.02184 0.00000 -1.02108 0.00000 -1.02077 0.00000 -1.02208 0.00000 -1.02357 0.00000 -0.992044 0.00000 -1.00127 0.00000 -1.00593 0.00000 -1.00907 0.00000 -1.01176 0.00000 -1.01363 0.00000 -0.951931 0.00000 -0.966486 0.00000 -0.973041 0.00000 -0.977979 0.00000 -0.981902 0.00000 -0.984799 0.00000 -0.91183 0.00000 -0.916248 0.00000 -0.921599 0.00000 -0.927757 0.00000 -0.932555 0.00000 -0.936096 0.00000 -0.822432 0.00000 -0.831703 0.00000 -0.843831 0.00000 -0.85506 0.00000 -0.865155 0.00000 -0.787705 0.00000 -0.799531 0.00000 -0.812021 0.00000 -0.824501 0.00000 -0.835966 0.00000 -0.770364 0.00000 -0.7923 0.00000 -0.815004 0.00000 -0.836251 0.00000 -0.854533 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.986995 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.981209 0.00000 -0.987049 0.00000 -0.992511 0.00000 -0.99727 0.00000 -0.00000 0.00000 -1.01285 0.00000 -1.01612 0.00000 -1.02063 0.00000 -1.02449 0.00000 -1.02754 0.00000 -1.02964 0.00000 -1.01619 0.00000 -1.01459 0.00000 -1.01357 0.00000 -1.01541 0.00000 -1.0178 0.00000 -1.02003 0.00000 -1.02162 0.00000 -0.993196 0.00000 -0.999659 0.00000 -1.00296 0.00000 -1.006 0.00000 -1.00824 0.00000 -1.01 0.00000 -1.01115 0.00000 -0.958119 0.00000 -0.966603 0.00000 -0.972116 0.00000 -0.976484 0.00000 -0.97995 0.00000 -0.98273 0.00000 -0.984764 0.00000 -0.909392 0.00000 -0.913831 0.00000 -0.920413 0.00000 -0.925735 0.00000 -0.930035 0.00000 -0.93355 0.00000 -0.817879 0.00000 -0.83004 0.00000 -0.842738 0.00000 -0.854824 0.00000 -0.865057 0.00000 -0.87286 0.00000 -0.78154 0.00000 -0.793549 0.00000 -0.807575 0.00000 -0.821587 0.00000 -0.833839 0.00000 -0.843665 0.00000 -0.767094 0.00000 -0.790663 0.00000 -0.815248 0.00000 -0.836968 0.00000 -0.854941 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.976945 0.00000 -0.986491 0.00000 -0.995806 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.977715 0.00000 -0.984796 0.00000 -0.991736 0.00000 -0.997977 0.00000 -1.0033 0.00000 -0.00000 0.00000 -1.01017 0.00000 -1.01487 0.00000 -1.01947 0.00000 -1.02339 0.00000 -1.02646 0.00000 -1.02856 0.00000 -1.01201 0.00000 -1.00861 0.00000 -1.00959 0.00000 -1.0124 0.00000 -1.01541 0.00000 -1.01789 0.00000 -1.01967 0.00000 -0.99365 0.00000 -0.997398 0.00000 -1.0006 0.00000 -1.00319 0.00000 -1.00545 0.00000 -1.00728 0.00000 -1.00853 0.00000 -0.959272 0.00000 -0.965968 0.00000 -0.970945 0.00000 -0.974891 0.00000 -0.978313 0.00000 -0.981097 0.00000 -0.98313 0.00000 -0.906873 0.00000 -0.912805 0.00000 -0.918716 0.00000 -0.923637 0.00000 -0.928007 0.00000 -0.930973 0.00000 -0.933616 0.00000 -0.815614 0.00000 -0.828925 0.00000 -0.8425 0.00000 -0.854636 0.00000 -0.864457 0.00000 -0.872555 0.00000 -0.776453 0.00000 -0.789687 0.00000 -0.80526 0.00000 -0.819924 0.00000 -0.83249 0.00000 -0.842611 0.00000 -0.764402 0.00000 -0.790774 0.00000 -0.815604 0.00000 -0.837121 0.00000 -0.855398 0.00000 -0.870111 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.972563 0.00000 -0.985988 0.00000 -0.997503 0.00000 -0.998716 0.00000 -0.00000 0.00000 -0.9734 0.00000 -0.982117 0.00000 -0.991044 0.00000 -0.998986 0.00000 -1.00553 0.00000 -1.01008 0.00000 -1.00472 0.00000 -1.00857 0.00000 -1.0138 0.00000 -1.01849 0.00000 -1.02243 0.00000 -1.02544 0.00000 -1.0275 0.00000 -1.0052 0.00000 -1.00337 0.00000 -1.00627 0.00000 -1.00993 0.00000 -1.01323 0.00000 -1.01593 0.00000 -1.01786 0.00000 -0.991967 0.00000 -0.994746 0.00000 -0.997386 0.00000 -0.999981 0.00000 -1.00237 0.00000 -1.00432 0.00000 -1.00569 0.00000 -0.959287 0.00000 -0.964771 0.00000 -0.969029 0.00000 -0.972948 0.00000 -0.976386 0.00000 -0.978827 0.00000 -0.980916 0.00000 -0.904595 0.00000 -0.910954 0.00000 -0.916103 0.00000 -0.921067 0.00000 -0.924979 0.00000 -0.928707 0.00000 -0.931452 0.00000 -0.814002 0.00000 -0.82831 0.00000 -0.842165 0.00000 -0.853883 0.00000 -0.86403 0.00000 -0.872122 0.00000 -0.87805 0.00000 -0.770855 0.00000 -0.786438 0.00000 -0.803187 0.00000 -0.818364 0.00000 -0.831367 0.00000 -0.84181 0.00000 -0.763018 0.00000 -0.790725 0.00000 -0.81551 0.00000 -0.83747 0.00000 -0.856123 0.00000 -0.871132 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.967827 0.00000 -0.984573 0.00000 -0.992481 0.00000 -0.993466 0.00000 -0.992835 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.97785 0.00000 -0.988856 0.00000 -0.998594 0.00000 -1.00643 0.00000 -1.01111 0.00000 -1.01447 0.00000 -0.00000 0.00000 -1.00218 0.00000 -1.00774 0.00000 -1.01312 0.00000 -1.01782 0.00000 -1.02167 0.00000 -1.02465 0.00000 -1.02671 0.00000 -1.00663 0.00000 -0.998529 0.00000 -1.00007 0.00000 -1.00406 0.00000 -1.00805 0.00000 -1.01157 0.00000 -1.01443 0.00000 -1.01645 0.00000 -0.984912 0.00000 -0.989338 0.00000 -0.991618 0.00000 -0.994188 0.00000 -0.996944 0.00000 -0.999489 0.00000 -1.0014 0.00000 -1.00304 0.00000 -0.95004 0.00000 -0.95847 0.00000 -0.962857 0.00000 -0.966997 0.00000 -0.970923 0.00000 -0.974075 0.00000 -0.976979 0.00000 -0.979115 0.00000 -0.899756 0.00000 -0.903136 0.00000 -0.908087 0.00000 -0.913286 0.00000 -0.917916 0.00000 -0.922604 0.00000 -0.926594 0.00000 -0.929499 0.00000 -0.800693 0.00000 -0.812613 0.00000 -0.827876 0.00000 -0.841259 0.00000 -0.853326 0.00000 -0.863501 0.00000 -0.87161 0.00000 -0.877541 0.00000 -0.757015 0.00000 -0.766428 0.00000 -0.784133 0.00000 -0.801594 0.00000 -0.817308 0.00000 -0.830662 0.00000 -0.841344 0.00000 -0.849171 0.00000 -0.736534 0.00000 -0.762484 0.00000 -0.790279 0.00000 -0.815634 0.00000 -0.83806 0.00000 -0.857078 0.00000 -0.872381 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.849317 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.959335 0.00000 -0.977964 0.00000 -0.987695 0.00000 -0.989031 0.00000 -0.988939 0.00000 -0.00000 0.00000 -0.970086 0.00000 -0.982788 0.00000 -0.994939 0.00000 -1.00429 0.00000 -1.01004 0.00000 -1.01435 0.00000 -0.00000 0.00000 -1.00149 0.00000 -1.00735 0.00000 -1.01278 0.00000 -1.0174 0.00000 -1.0212 0.00000 -1.02416 0.00000 -1.00279 0.00000 -0.995179 0.00000 -0.99835 0.00000 -1.00275 0.00000 -1.00693 0.00000 -1.01056 0.00000 -1.01328 0.00000 -0.985573 0.00000 -0.987228 0.00000 -0.989104 0.00000 -0.991841 0.00000 -0.994753 0.00000 -0.997304 0.00000 -0.999706 0.00000 -0.951354 0.00000 -0.957319 0.00000 -0.961209 0.00000 -0.965363 0.00000 -0.969015 0.00000 -0.972618 0.00000 -0.975576 0.00000 -0.897181 0.00000 -0.901171 0.00000 -0.905756 0.00000 -0.910523 0.00000 -0.915955 0.00000 -0.920948 0.00000 -0.925023 0.00000 -0.798269 0.00000 -0.812114 0.00000 -0.826923 0.00000 -0.840728 0.00000 -0.852844 0.00000 -0.863045 0.00000 -0.871173 0.00000 -0.751954 0.00000 -0.764078 0.00000 -0.782712 0.00000 -0.800709 0.00000 -0.81675 0.00000 -0.830314 0.00000 -0.84115 0.00000 -0.733599 0.00000 -0.762114 0.00000 -0.790104 0.00000 -0.815904 0.00000 -0.838672 0.00000 -0.857969 0.00000 -0.873496 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.84513 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.965983 0.00000 -0.982997 0.00000 -0.985103 0.00000 -0.985579 0.00000 -0.00000 0.00000 -0.973236 0.00000 -0.987711 0.00000 -0.999925 0.00000 -1.00728 0.00000 -1.01264 0.00000 -0.997874 0.00000 -1.00113 0.00000 -1.00719 0.00000 -1.01257 0.00000 -1.01714 0.00000 -1.02092 0.00000 -0.998517 0.00000 -0.993212 0.00000 -0.99726 0.00000 -1.00191 0.00000 -1.0062 0.00000 -1.00969 0.00000 -0.984686 0.00000 -0.985199 0.00000 -0.98714 0.00000 -0.990035 0.00000 -0.992939 0.00000 -0.995954 0.00000 -0.951587 0.00000 -0.956012 0.00000 -0.959831 0.00000 -0.963661 0.00000 -0.967787 0.00000 -0.971451 0.00000 -0.895423 0.00000 -0.899119 0.00000 -0.903105 0.00000 -0.908787 0.00000 -0.914518 0.00000 -0.919606 0.00000 -0.797024 0.00000 -0.811749 0.00000 -0.82643 0.00000 -0.840263 0.00000 -0.85241 0.00000 -0.862642 0.00000 -0.747996 0.00000 -0.762445 0.00000 -0.78179 0.00000 -0.800175 0.00000 -0.816433 0.00000 -0.830148 0.00000 -0.731915 0.00000 -0.761626 0.00000 -0.790079 0.00000 -0.816239 0.00000 -0.839288 0.00000 -0.858812 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.953675 0.00000 -0.977494 0.00000 -0.979753 0.00000 -0.00000 0.00000 -0.979951 0.00000 -0.995915 0.00000 -1.00498 0.00000 -0.995011 0.00000 -1.00091 0.00000 -1.00706 0.00000 -1.01235 0.00000 -0.991423 0.00000 -0.99119 0.00000 -0.996018 0.00000 -1.00088 0.00000 -0.982189 0.00000 -0.981977 0.00000 -0.984239 0.00000 -0.987319 0.00000 -0.95089 0.00000 -0.953763 0.00000 -0.957241 0.00000 -0.961653 0.00000 -0.893641 0.00000 -0.895765 0.00000 -0.900134 0.00000 -0.906308 0.00000 -0.795172 0.00000 -0.810361 0.00000 -0.825561 0.00000 -0.839464 0.00000 -0.74286 0.00000 -0.760475 0.00000 -0.780743 0.00000 -0.799577 0.00000 -0.731237 0.00000 -0.76108 0.00000 -0.790272 0.00000 -0.816965 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NUC_DYE605.dat b/nnpdfcpp/data/NNLOCFAC/CF_NUC_DYE605.dat deleted file mode 100644 index a3037b27fa..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NUC_DYE605.dat +++ /dev/null @@ -1,128 +0,0 @@ -******************************************************************************** -SetName: DYE605_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -1.02293 0.00000 -1.03286 0.00000 -1.04371 0.00000 -1.05545 0.00000 -1.06898 0.00000 -1.08373 0.00000 -1.10003 0.00000 -1.11775 0.00000 -1.13744 0.00000 -1.15883 0.00000 -1.38028 0.00000 -1.41644 0.00000 -1.45272 0.00000 -1.52719 0.00000 -1.67598 0.00000 -1.97483 0.00000 -2.48278 0.00000 -1.02010 0.00000 -1.02801 0.00000 -1.03714 0.00000 -1.04735 0.00000 -1.05910 0.00000 -1.07208 0.00000 -1.08687 0.00000 -1.10291 0.00000 -1.12125 0.00000 -1.14193 0.00000 -1.38355 0.00000 -1.42306 0.00000 -1.46837 0.00000 -1.56574 0.00000 -1.79414 0.00000 -2.12856 0.00000 -2.75998 0.00000 -3.55510 0.00000 -1.01976 0.00000 -1.02712 0.00000 -1.03556 0.00000 -1.04485 0.00000 -1.05570 0.00000 -1.06782 0.00000 -1.08199 0.00000 -1.09732 0.00000 -1.11511 0.00000 -1.13533 0.00000 -1.39028 0.00000 -1.43413 0.00000 -1.48461 0.00000 -1.58610 0.00000 -1.82602 0.00000 -2.34917 0.00000 -3.00599 0.00000 -3.79645 0.00000 -1.02367 0.00000 -1.03132 0.00000 -1.04007 0.00000 -1.04985 0.00000 -1.06109 0.00000 -1.07356 0.00000 -1.08785 0.00000 -1.10361 0.00000 -1.12169 0.00000 -1.14217 0.00000 -1.39406 0.00000 -1.43592 0.00000 -1.48454 0.00000 -1.59176 0.00000 -1.87141 0.00000 -2.39061 0.00000 -3.18658 0.00000 -4.02960 0.00000 -1.03093 0.00000 -1.04001 0.00000 -1.05008 0.00000 -1.06120 0.00000 -1.07406 0.00000 -1.08818 0.00000 -1.10421 0.00000 -1.12190 0.00000 -1.14173 0.00000 -1.16347 0.00000 -1.40902 0.00000 -1.45430 0.00000 -1.50443 0.00000 -1.61469 0.00000 -1.86113 0.00000 -2.31942 0.00000 -3.12548 0.00000 -5.10798 0.00000 -1.04136 0.00000 -1.05209 0.00000 -1.06444 0.00000 -1.07814 0.00000 -1.09335 0.00000 -1.10979 0.00000 -1.12799 0.00000 -1.14608 0.00000 -1.16623 0.00000 -1.18749 0.00000 -1.43827 0.00000 -1.47815 0.00000 -1.52119 0.00000 -1.60779 0.00000 -1.82729 0.00000 -2.26414 0.00000 -3.30619 0.00000 -4.20667 0.00000 -1.14876 0.00000 -1.16866 0.00000 -1.18987 0.00000 -1.21406 0.00000 -1.45171 0.00000 -1.49288 0.00000 -1.53310 0.00000 -1.62798 0.00000 -1.82995 0.00000 -2.32404 0.00000 -2.98542 0.00000 -3.62274 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NUC_EMCF2C.dat b/nnpdfcpp/data/NNLOCFAC/CF_NUC_EMCF2C.dat deleted file mode 100644 index d7680b7c08..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NUC_EMCF2C.dat +++ /dev/null @@ -1,30 +0,0 @@ -******************************************************************************** -SetName: EMCF2C_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.88921 0.00000 -0.00000 0.00000 -1.84017 0.00000 -1.30236 0.00000 -1.86217 0.00000 -1.04350 0.00000 -1.02180 0.00000 -0.62768 0.00000 -1.39470 0.00000 -1.31401 0.00000 -0.16979 0.00000 -0.42162 0.00000 -0.58695 0.00000 -0.05925 0.00000 -0.18152 0.00000 -0.27436 0.00000 -0.01025 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NUC_NTVNBDMNFe.dat b/nnpdfcpp/data/NNLOCFAC/CF_NUC_NTVNBDMNFe.dat deleted file mode 100644 index 05dfa9805c..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NUC_NTVNBDMNFe.dat +++ /dev/null @@ -1,54 +0,0 @@ -******************************************************************************** -SetName: NTVNBDMNFe_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -1.10217 0.00000 -0.99194 0.00000 -0.92420 0.00000 -0.00000 0.00000 -1.12618 0.00000 -1.10481 0.00000 -1.06434 0.00000 -1.09188 0.00000 -0.00000 0.00000 -1.05880 0.00000 -1.09516 0.00000 -1.07749 0.00000 -1.17869 0.00000 -0.00000 0.00000 -1.08749 0.00000 -1.12661 0.00000 -1.03533 0.00000 -1.02689 0.00000 -0.00000 0.00000 -0.96006 0.00000 -1.09141 0.00000 -1.06015 0.00000 -1.14515 0.00000 -0.00000 0.00000 -0.92438 0.00000 -1.06550 0.00000 -1.07511 0.00000 -1.20531 0.00000 -0.00000 0.00000 -0.97154 0.00000 -1.11192 0.00000 -1.03798 0.00000 -1.06714 0.00000 -0.84109 0.00000 -0.92139 0.00000 -1.07643 0.00000 -1.06776 0.00000 -1.16110 0.00000 -0.84592 0.00000 -0.90156 0.00000 -1.06451 0.00000 -1.08126 0.00000 -1.21415 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_NUC_NTVNUDMNFe.dat b/nnpdfcpp/data/NNLOCFAC/CF_NUC_NTVNUDMNFe.dat deleted file mode 100644 index 52f5b257de..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_NUC_NTVNUDMNFe.dat +++ /dev/null @@ -1,54 +0,0 @@ -******************************************************************************** -SetName: NTVNUDMNFe_sh -Author: Emanuele R. Nocera -Date: 2020 -CodesUsed: Validphys -TheoryInput: NNPDF4.0 + nNNPDF2.0 -PDFset: nNNPDF2.0 -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.77090 0.00000 -0.75204 0.00000 -0.86524 0.00000 -0.00000 0.00000 -0.92943 0.00000 -0.79226 0.00000 -0.79349 0.00000 -0.94421 0.00000 -0.00000 0.00000 -0.95545 0.00000 -0.80233 0.00000 -0.81206 0.00000 -0.98544 0.00000 -0.00000 0.00000 -0.95406 0.00000 -0.80805 0.00000 -0.78659 0.00000 -0.88914 0.00000 -0.74807 0.00000 -0.98024 0.00000 -0.83222 0.00000 -0.82163 0.00000 -0.94843 0.00000 -0.75022 0.00000 -0.98578 0.00000 -0.83866 0.00000 -0.83591 0.00000 -0.98177 0.00000 -0.00000 0.00000 -0.97656 0.00000 -0.82890 0.00000 -0.80286 0.00000 -0.89285 0.00000 -0.77362 0.00000 -0.99155 0.00000 -0.84827 0.00000 -0.83300 0.00000 -0.94692 0.00000 -0.77159 0.00000 -0.98236 0.00000 -0.85286 0.00000 -0.84586 0.00000 -0.97835 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCDEWK_ATLASDY2D8TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCDEWK_ATLASDY2D8TEV.dat deleted file mode 100644 index 7774b538f1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCDEWK_ATLASDY2D8TEV.dat +++ /dev/null @@ -1,57 +0,0 @@ -******************************************************************************************* -SetName: ATLASDY2D8TEV -Author: xFitter from Francesco Giuli -Date: May 2017 -CodesUsed: FEWZ, this code incorporates NNLO QCD and NLO EWK corrections -TheoryInput: NNPDF3.0 NNLO, alphas(MZ)=0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: Contains the combined QCDxEWK corrections. -******************************************************************************************** -0.985407027 0.0008868663 -0.9857720991 0.0012815037 -0.9884611457 0.0012849995 -0.9879078843 0.0012842802 -0.9929610269 0.0012908493 -0.9856188074 0.0012813044 -0.9879614767 0.0012843499 -0.9971910112 0.0013960674 -1.0075151004 0.0015112727 -1.0134545622 0.0016215273 -1.0124210672 0.0020248421 -1.0184798421 0.0032591355 -1.0019571878 0.0008015658 -1.0022166578 0.0011024383 -1.0025759706 0.0011028336 -1.001288992 0.0011014179 -1.0056040825 0.0011061645 -1.0035761218 0.0012042913 -1.0064165156 0.0012076998 -1.0123155324 0.0012147786 -1.0208779357 0.0012250535 -1.0231606759 0.0014324249 -1.0251246327 0.0018452243 -1.0250896057 0.0030752688 -1.0089774469 0.0007062842 -1.0062645113 0.0010062645 -1.0099629695 0.001009963 -1.0101055267 0.0011111161 -1.0105224123 0.0011115747 -1.0146500271 0.00101465 -1.0196886695 0.0010196887 -1.0113960114 0.0011125356 -1.0291382517 0.0012349659 -1.0254967731 0.0013331458 -1.0346465837 0.0018623639 -1.0312938651 0.0030938816 -1.0085572823 0.0003025672 -1.010627214 0.0004042509 -1.0135648041 0.0004054259 -1.0171797925 0.0005085899 -1.0220700152 0.000613242 -1.0326211152 0.0014456696 -1.0055172414 0.0002011034 -1.0066225166 0.0003019868 -1.0032217648 0.0003009665 -1.0096210427 0.0004038484 -1.0233880346 0.0007163716 -1.0213252395 0.0022469155 \ No newline at end of file diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCDEWK_ATLASDY2D8TEV_PI.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCDEWK_ATLASDY2D8TEV_PI.dat deleted file mode 100644 index d175f42280..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCDEWK_ATLASDY2D8TEV_PI.dat +++ /dev/null @@ -1,57 +0,0 @@ -******************************************************************************************* -SetName: ATLASDY2D8TEV_PI -Author: Nathan Hartland -Date: May 2017 -CodesUsed: None -TheoryInput: None -PDFset: None -Warnings: Dummy C-factors -******************************************************************************************** -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 -1.0 0 \ No newline at end of file diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS1JET11.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS1JET11.dat deleted file mode 100644 index d9b55b3137..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS1JET11.dat +++ /dev/null @@ -1,149 +0,0 @@ -******************************************************************************************* -SetName: ATLAS1JET11 -Author: J. Curry, N. Glover, J. Pires -Date: March 2017 -CodesUsed: Private pp->jj code -TheoryInput: NNPDF3.0 NNLO, alphas(MZ)=0.118, R=0.6 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: Uses average pt as central scale, errors quoted are MC statistical uncertainties. -******************************************************************************************** -9.618090E-01 4.011770E-03 -9.578620E-01 3.953720E-03 -9.649250E-01 4.329370E-03 -9.670370E-01 4.161400E-03 -9.605180E-01 4.105260E-03 -9.710980E-01 4.301840E-03 -9.745430E-01 4.308180E-03 -9.746740E-01 4.564520E-03 -9.804710E-01 4.488400E-03 -9.762350E-01 4.569990E-03 -9.804000E-01 4.876720E-03 -9.851340E-01 4.912330E-03 -9.866520E-01 4.910980E-03 -9.878810E-01 4.947880E-03 -9.873040E-01 5.061210E-03 -9.923360E-01 5.193680E-03 -9.952990E-01 5.420080E-03 -9.896220E-01 5.495780E-03 -9.956420E-01 5.465330E-03 -9.980980E-01 5.965300E-03 -1.000870E+00 6.167030E-03 -1.000690E+00 6.544100E-03 -1.010940E+00 7.076790E-03 -1.020940E+00 7.295720E-03 -1.023200E+00 8.165660E-03 -1.035940E+00 1.010180E-02 -1.019800E+00 1.093240E-02 -1.034320E+00 8.578970E-03 -1.042420E+00 6.973830E-03 -1.065520E+00 6.863710E-03 -1.087220E+00 5.929240E-03 -9.497920E-01 4.321770E-03 -9.649890E-01 4.302580E-03 -9.665990E-01 4.592950E-03 -9.637460E-01 4.491810E-03 -9.688400E-01 4.375740E-03 -9.680730E-01 4.608810E-03 -9.753700E-01 4.548710E-03 -9.732140E-01 4.798200E-03 -9.771700E-01 4.808010E-03 -9.868400E-01 4.797220E-03 -9.816200E-01 5.105870E-03 -9.773390E-01 5.167130E-03 -9.872970E-01 5.159930E-03 -9.886760E-01 5.204360E-03 -9.924410E-01 5.460390E-03 -9.824600E-01 5.680090E-03 -9.960800E-01 5.971140E-03 -9.879670E-01 5.998180E-03 -1.001050E+00 6.290450E-03 -9.866840E-01 6.428390E-03 -1.010440E+00 6.837530E-03 -1.000800E+00 7.831680E-03 -1.007410E+00 7.962530E-03 -1.005940E+00 9.085460E-03 -1.016220E+00 1.013640E-02 -1.014210E+00 1.109600E-02 -1.020070E+00 7.231710E-03 -1.041330E+00 8.494000E-03 -1.056170E+00 6.818350E-03 -9.547930E-01 4.533940E-03 -9.651890E-01 4.488020E-03 -9.751720E-01 4.795580E-03 -9.699980E-01 4.667780E-03 -9.686780E-01 4.533780E-03 -9.658220E-01 4.782100E-03 -9.857440E-01 4.800440E-03 -9.714430E-01 5.058900E-03 -9.813470E-01 5.044540E-03 -9.838800E-01 5.103660E-03 -9.804880E-01 5.486290E-03 -9.836910E-01 5.679160E-03 -9.826400E-01 5.577880E-03 -9.906190E-01 5.726290E-03 -9.836060E-01 5.860720E-03 -9.889930E-01 6.156340E-03 -9.874300E-01 6.577780E-03 -9.881950E-01 6.890890E-03 -9.847570E-01 7.274080E-03 -9.926840E-01 8.299030E-03 -9.896600E-01 8.649960E-03 -9.896110E-01 9.451120E-03 -1.009860E+00 1.126750E-02 -1.000390E+00 1.243670E-02 -1.004970E+00 9.287420E-03 -1.020140E+00 9.031050E-03 -9.589990E-01 4.924230E-03 -9.562610E-01 4.817750E-03 -9.660880E-01 5.160470E-03 -9.590130E-01 5.030780E-03 -9.680000E-01 4.968680E-03 -9.747630E-01 5.281710E-03 -9.748600E-01 5.299310E-03 -9.730460E-01 5.679830E-03 -9.734550E-01 5.947510E-03 -9.723850E-01 6.056970E-03 -9.739290E-01 6.597970E-03 -9.757130E-01 6.889690E-03 -9.742370E-01 6.885540E-03 -9.797390E-01 7.392260E-03 -9.828570E-01 8.157450E-03 -9.781730E-01 9.078030E-03 -9.819810E-01 9.412450E-03 -9.752670E-01 1.207660E-02 -9.697190E-01 1.262280E-02 -9.708240E-01 1.481820E-02 -9.917940E-01 1.668480E-02 -9.880970E-01 1.285600E-02 -1.013630E+00 1.921140E-02 -9.562720E-01 5.563180E-03 -9.559610E-01 5.494600E-03 -9.614180E-01 5.888630E-03 -9.675850E-01 6.112960E-03 -9.628830E-01 5.988560E-03 -9.589270E-01 6.831590E-03 -9.621070E-01 6.889090E-03 -9.791680E-01 7.481880E-03 -9.565890E-01 8.393600E-03 -9.685840E-01 8.772810E-03 -9.705100E-01 1.035000E-02 -9.417430E-01 1.128480E-02 -9.641650E-01 1.347100E-02 -9.379140E-01 1.461010E-02 -9.457560E-01 1.760620E-02 -9.500790E-01 2.173250E-02 -9.599240E-01 2.726160E-02 -9.499720E-01 2.757790E-02 -1.019050E+00 3.796460E-02 -9.381290E-01 7.115450E-03 -9.423670E-01 7.198700E-03 -9.608040E-01 8.186510E-03 -9.265390E-01 8.366690E-03 -9.490620E-01 9.261000E-03 -9.397050E-01 1.077320E-02 -9.369260E-01 1.212630E-02 -9.315500E-01 1.477460E-02 -9.217920E-01 1.871280E-02 -9.119350E-01 2.296890E-02 -9.068350E-01 2.193610E-02 -9.116110E-01 3.433390E-02 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS1JET11_NEW_SCALE.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS1JET11_NEW_SCALE.dat deleted file mode 100644 index 7425d75066..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS1JET11_NEW_SCALE.dat +++ /dev/null @@ -1,149 +0,0 @@ -******************************************************************************** -SetName: ATLAS1JET11_NEW_SCALE -Author: J. Curry, N. Glover, J. Pires -Date: October 2019 -CodesUsed: Private pp->jj code -TheoryInput: NNPDF3.0 NNLO, alphas(MZ)=0.118, R=0.6 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: Uses average HThat as central scale. -******************************************************************************** -1.07146 0.01087 -1.06584 0.00970 -1.06160 0.00948 -1.05056 0.00872 -1.05091 0.00808 -1.05139 0.00802 -1.08383 0.00761 -1.06368 0.00786 -1.05850 0.00756 -1.05738 0.00709 -1.06239 0.00727 -1.06774 0.00704 -1.07936 0.00676 -1.06731 0.00652 -1.07658 0.00636 -1.06525 0.00615 -1.09119 0.00605 -1.07566 0.00591 -1.09936 0.00580 -1.08583 0.00565 -1.08350 0.00575 -1.11007 0.00615 -1.10607 0.00612 -1.10874 0.00599 -1.11034 0.00615 -1.11931 0.00615 -1.14734 0.00614 -1.13097 0.00597 -1.15285 0.00383 -1.17280 0.00477 -1.20359 0.00519 -1.06655 0.01209 -1.05189 0.01056 -1.06959 0.01043 -1.03866 0.00966 -1.04873 0.00869 -1.07353 0.00870 -1.05902 0.00831 -1.06610 0.00848 -1.05927 0.00807 -1.06758 0.00757 -1.07515 0.00752 -1.06144 0.00738 -1.06804 0.00716 -1.06579 0.00697 -1.08553 0.00682 -1.08452 0.00666 -1.07825 0.00652 -1.08491 0.00632 -1.09268 0.00629 -1.09545 0.00622 -1.08288 0.00631 -1.10931 0.00672 -1.09560 0.00687 -1.10092 0.00784 -1.11275 0.00711 -1.12913 0.00741 -1.11914 0.00547 -1.15592 0.00530 -1.16746 0.00608 -1.05670 0.01263 -1.05595 0.01119 -1.05673 0.01059 -1.05471 0.00977 -1.05482 0.00897 -1.04800 0.00908 -1.07548 0.00857 -1.05610 0.00891 -1.05595 0.00821 -1.08544 0.00775 -1.07679 0.00783 -1.07232 0.00775 -1.08006 0.00747 -1.07141 0.00737 -1.08021 0.00735 -1.07524 0.00717 -1.07005 0.00848 -1.08113 0.00719 -1.09453 0.00747 -1.07929 0.00905 -1.08607 0.00801 -1.09924 0.00868 -1.10673 0.00888 -1.10361 0.00943 -1.09696 0.00825 -1.12299 0.00678 -1.06641 0.01265 -1.05250 0.01170 -1.07795 0.01159 -1.04982 0.01052 -1.05414 0.00965 -1.06599 0.00966 -1.06560 0.00916 -1.07654 0.00943 -1.06808 0.00905 -1.07020 0.00865 -1.06485 0.00910 -1.08797 0.00891 -1.06611 0.00898 -1.06534 0.00903 -1.08624 0.00937 -1.06442 0.00975 -1.07179 0.01022 -1.07479 0.01078 -1.09566 0.01188 -1.07697 0.01239 -1.10221 0.01385 -1.09716 0.01095 -1.13415 0.02173 -1.05170 0.01386 -1.07356 0.01253 -1.05855 0.01261 -1.06346 0.01188 -1.06259 0.01098 -1.08183 0.01132 -1.07478 0.01116 -1.04523 0.01208 -1.07528 0.01207 -1.05362 0.01197 -1.07520 0.01309 -1.06460 0.01352 -1.05690 0.01406 -1.06281 0.01548 -1.07891 0.01670 -1.09215 0.01823 -1.04102 0.02723 -1.08645 0.02554 -1.11671 0.04104 -1.10052 0.01615 -1.03369 0.01540 -1.06664 0.01613 -1.04176 0.01576 -1.05157 0.01893 -1.03393 0.01728 -1.05520 0.01746 -1.09551 0.01963 -1.04136 0.02209 -1.08622 0.02304 -1.08942 0.02153 -1.08039 0.04130 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS1JET11_SF.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS1JET11_SF.dat deleted file mode 100644 index d9b55b3137..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS1JET11_SF.dat +++ /dev/null @@ -1,149 +0,0 @@ -******************************************************************************************* -SetName: ATLAS1JET11 -Author: J. Curry, N. Glover, J. Pires -Date: March 2017 -CodesUsed: Private pp->jj code -TheoryInput: NNPDF3.0 NNLO, alphas(MZ)=0.118, R=0.6 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: Uses average pt as central scale, errors quoted are MC statistical uncertainties. -******************************************************************************************** -9.618090E-01 4.011770E-03 -9.578620E-01 3.953720E-03 -9.649250E-01 4.329370E-03 -9.670370E-01 4.161400E-03 -9.605180E-01 4.105260E-03 -9.710980E-01 4.301840E-03 -9.745430E-01 4.308180E-03 -9.746740E-01 4.564520E-03 -9.804710E-01 4.488400E-03 -9.762350E-01 4.569990E-03 -9.804000E-01 4.876720E-03 -9.851340E-01 4.912330E-03 -9.866520E-01 4.910980E-03 -9.878810E-01 4.947880E-03 -9.873040E-01 5.061210E-03 -9.923360E-01 5.193680E-03 -9.952990E-01 5.420080E-03 -9.896220E-01 5.495780E-03 -9.956420E-01 5.465330E-03 -9.980980E-01 5.965300E-03 -1.000870E+00 6.167030E-03 -1.000690E+00 6.544100E-03 -1.010940E+00 7.076790E-03 -1.020940E+00 7.295720E-03 -1.023200E+00 8.165660E-03 -1.035940E+00 1.010180E-02 -1.019800E+00 1.093240E-02 -1.034320E+00 8.578970E-03 -1.042420E+00 6.973830E-03 -1.065520E+00 6.863710E-03 -1.087220E+00 5.929240E-03 -9.497920E-01 4.321770E-03 -9.649890E-01 4.302580E-03 -9.665990E-01 4.592950E-03 -9.637460E-01 4.491810E-03 -9.688400E-01 4.375740E-03 -9.680730E-01 4.608810E-03 -9.753700E-01 4.548710E-03 -9.732140E-01 4.798200E-03 -9.771700E-01 4.808010E-03 -9.868400E-01 4.797220E-03 -9.816200E-01 5.105870E-03 -9.773390E-01 5.167130E-03 -9.872970E-01 5.159930E-03 -9.886760E-01 5.204360E-03 -9.924410E-01 5.460390E-03 -9.824600E-01 5.680090E-03 -9.960800E-01 5.971140E-03 -9.879670E-01 5.998180E-03 -1.001050E+00 6.290450E-03 -9.866840E-01 6.428390E-03 -1.010440E+00 6.837530E-03 -1.000800E+00 7.831680E-03 -1.007410E+00 7.962530E-03 -1.005940E+00 9.085460E-03 -1.016220E+00 1.013640E-02 -1.014210E+00 1.109600E-02 -1.020070E+00 7.231710E-03 -1.041330E+00 8.494000E-03 -1.056170E+00 6.818350E-03 -9.547930E-01 4.533940E-03 -9.651890E-01 4.488020E-03 -9.751720E-01 4.795580E-03 -9.699980E-01 4.667780E-03 -9.686780E-01 4.533780E-03 -9.658220E-01 4.782100E-03 -9.857440E-01 4.800440E-03 -9.714430E-01 5.058900E-03 -9.813470E-01 5.044540E-03 -9.838800E-01 5.103660E-03 -9.804880E-01 5.486290E-03 -9.836910E-01 5.679160E-03 -9.826400E-01 5.577880E-03 -9.906190E-01 5.726290E-03 -9.836060E-01 5.860720E-03 -9.889930E-01 6.156340E-03 -9.874300E-01 6.577780E-03 -9.881950E-01 6.890890E-03 -9.847570E-01 7.274080E-03 -9.926840E-01 8.299030E-03 -9.896600E-01 8.649960E-03 -9.896110E-01 9.451120E-03 -1.009860E+00 1.126750E-02 -1.000390E+00 1.243670E-02 -1.004970E+00 9.287420E-03 -1.020140E+00 9.031050E-03 -9.589990E-01 4.924230E-03 -9.562610E-01 4.817750E-03 -9.660880E-01 5.160470E-03 -9.590130E-01 5.030780E-03 -9.680000E-01 4.968680E-03 -9.747630E-01 5.281710E-03 -9.748600E-01 5.299310E-03 -9.730460E-01 5.679830E-03 -9.734550E-01 5.947510E-03 -9.723850E-01 6.056970E-03 -9.739290E-01 6.597970E-03 -9.757130E-01 6.889690E-03 -9.742370E-01 6.885540E-03 -9.797390E-01 7.392260E-03 -9.828570E-01 8.157450E-03 -9.781730E-01 9.078030E-03 -9.819810E-01 9.412450E-03 -9.752670E-01 1.207660E-02 -9.697190E-01 1.262280E-02 -9.708240E-01 1.481820E-02 -9.917940E-01 1.668480E-02 -9.880970E-01 1.285600E-02 -1.013630E+00 1.921140E-02 -9.562720E-01 5.563180E-03 -9.559610E-01 5.494600E-03 -9.614180E-01 5.888630E-03 -9.675850E-01 6.112960E-03 -9.628830E-01 5.988560E-03 -9.589270E-01 6.831590E-03 -9.621070E-01 6.889090E-03 -9.791680E-01 7.481880E-03 -9.565890E-01 8.393600E-03 -9.685840E-01 8.772810E-03 -9.705100E-01 1.035000E-02 -9.417430E-01 1.128480E-02 -9.641650E-01 1.347100E-02 -9.379140E-01 1.461010E-02 -9.457560E-01 1.760620E-02 -9.500790E-01 2.173250E-02 -9.599240E-01 2.726160E-02 -9.499720E-01 2.757790E-02 -1.019050E+00 3.796460E-02 -9.381290E-01 7.115450E-03 -9.423670E-01 7.198700E-03 -9.608040E-01 8.186510E-03 -9.265390E-01 8.366690E-03 -9.490620E-01 9.261000E-03 -9.397050E-01 1.077320E-02 -9.369260E-01 1.212630E-02 -9.315500E-01 1.477460E-02 -9.217920E-01 1.871280E-02 -9.119350E-01 2.296890E-02 -9.068350E-01 2.193610E-02 -9.116110E-01 3.433390E-02 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASLOMASSDY11.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASLOMASSDY11.dat deleted file mode 100644 index 33ed31039a..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASLOMASSDY11.dat +++ /dev/null @@ -1,17 +0,0 @@ -******************************************************************************************* -SetName: ATLASLOMASSDY11 -Author: Alberto Guffanti -Date: 19.11.2015 -CodesUsed: FEWZ 3.1b2 -TheoryInput: Input Cards in external/FEWZ31b2/bin/InputCards -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************************** -0.8868 0.00000 -0.8557 0.00000 -0.9284 0.00000 -0.9570 0.00000 -0.9719 0.00000 -0.9853 0.00000 -0.9980 0.00000 -0.9882 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASLOMASSDY11EXT.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASLOMASSDY11EXT.dat deleted file mode 100644 index 013604e361..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASLOMASSDY11EXT.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************************* -SetName: ATLASLOMASSDY11EXT -Author: Alberto Guffanti -Date: 24.11.2015 -CodesUsed: FEWZ 3.1b2 -TheoryInput: Input Cards in external/FEWZ31b2/bin/InputCards -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************************** -1.5966 0.00000 -0.8519 0.00000 -0.9492 0.00000 -0.9809 0.00000 -0.9877 0.00000 -0.9945 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASPHT12.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASPHT12.dat deleted file mode 100644 index d93aa9a6df..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASPHT12.dat +++ /dev/null @@ -1,58 +0,0 @@ -************************************************************************************************************ -SetName: ATLASPHT12 -Author: Ciaran Williams and John Campbell -Date: 2017 -CodesUsed: Private version of MCFM -TheoryInput: NNPDF3.0 NNLO, alphas(MZ)=0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -************************************************************************************************************* -1.021 0 -1.034 0 -1.033 0 -1.029 0 -1.027 0 -1.040 0 -1.039 0 -1.040 0 -1.045 0 -1.047 0 -1.049 0 -1.053 0 -1.060 0 -1.058 0 -1.063 0 -1.066 0 -1.071 0 -1.112 0 -1.031 0 -1.037 0 -1.043 0 -1.046 0 -1.052 0 -1.036 0 -1.048 0 -1.049 0 -1.055 0 -1.065 0 -1.060 0 -1.087 0 -1.063 0 -1.074 0 -1.073 0 -1.074 0 -1.073 0 -1.063 0 -1.058 0 -1.051 0 -1.058 0 -1.065 0 -1.077 0 -1.087 0 -1.079 0 -1.082 0 -1.090 0 -1.083 0 -1.104 0 -1.097 0 -1.123 0 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASPHT15.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASPHT15.dat deleted file mode 100644 index 04797ab4c5..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASPHT15.dat +++ /dev/null @@ -1,62 +0,0 @@ -************************************************************************************************************ -SetName: ATLASPHT15 -Author: Ciaran Williams and John Campbell -Date: 2017 -CodesUsed: Private version of MCFM -TheoryInput: NNPDF3.0 NNLO, alphas(MZ)=0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -************************************************************************************************************* -1.025 0 -1.028 0 -1.034 0 -1.029 0 -1.031 0 -1.034 0 -1.042 0 -1.043 0 -1.039 0 -1.041 0 -1.051 0 -1.042 0 -1.046 0 -1.052 0 -1.034 0 -1.032 0 -1.029 0 -1.041 0 -1.044 0 -1.045 0 -1.042 0 -1.048 0 -1.050 0 -1.058 0 -1.060 0 -1.059 0 -1.070 0 -1.052 0 -1.047 0 -1.052 0 -1.053 0 -1.054 0 -1.076 0 -1.058 0 -1.069 0 -1.078 0 -1.074 0 -1.087 0 -1.072 0 -1.083 0 -1.053 0 -1.081 0 -1.091 0 -1.087 0 -1.099 0 -1.114 0 -1.109 0 -1.119 0 -1.107 0 -1.119 0 -1.138 0 -1.117 0 -1.118 0 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASR04JETS2P76TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASR04JETS2P76TEV.dat deleted file mode 100644 index 6536a171f4..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASR04JETS2P76TEV.dat +++ /dev/null @@ -1,68 +0,0 @@ -************************************************************************************************************ -SetName: ATLASR04JETS2P76TEV -Author: Stefano Carrazza and Joao Pires, stefano.carrazza@mi.infn.it and Joao.Pires@mib.infn.it -Date: Early 2014 -CodesUsed: Private gg->jj code from JP, validated with threshold approximation code from Vogelsang -TheoryInput: NNPDF2.3 NNLO, alphas(MZ)=0.119 -> CONVERTED TO 0.118 -PDFset: NNPDF23_nnlo_as_0119 -Warnings: Uses pt_jet as central scale rather than pt_leading, to update once final pp -> jj code available -************************************************************************************************************* -1.9551 0.00000 -1.68499 0.00000 -1.50818 0.00000 -1.40512 0.00000 -1.32078 0.00000 -1.24581 0.00000 -1.19005 0.00000 -1.16118 0.00000 -1.13955 0.00000 -1.12668 0.00000 -1.12062 0.00000 -2.01756 0.00000 -1.74397 0.00000 -1.55685 0.00000 -1.44913 0.00000 -1.36376 0.00000 -1.28873 0.00000 -1.22828 0.00000 -1.19952 0.00000 -1.18452 0.00000 -1.17591 0.00000 -1.16839 0.00000 -2.16026 0.00000 -1.87622 0.00000 -1.67763 0.00000 -1.55994 0.00000 -1.46633 0.00000 -1.38619 0.00000 -1.33518 0.00000 -1.31575 0.00000 -1.31035 0.00000 -1.30773 0.00000 -2.50059 0.00000 -2.18384 0.00000 -1.96042 0.00000 -1.82891 0.00000 -1.73843 0.00000 -1.67542 0.00000 -1.64247 0.00000 -1.62804 0.00000 -1.62081 0.00000 -1.62769 0.00000 -3.08262 0.00000 -2.75646 0.00000 -2.56839 0.00000 -2.52039 0.00000 -2.56084 0.00000 -2.69686 0.00000 -3.06712 0.00000 -3.93034 0.00000 -3.86932 0.00000 -3.76524 0.00000 -3.91846 0.00000 -4.25091 0.00000 -5.05345 0.00000 -8.02823 0.00000 -5.92927 0.00000 -7.07498 0.00000 -11.5384 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASR04JETS36PB.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASR04JETS36PB.dat deleted file mode 100644 index 970cea8889..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASR04JETS36PB.dat +++ /dev/null @@ -1,99 +0,0 @@ -******************************************************************************************* -SetName: ATLASR04JETS36PB -Author: Stefano Carrazza and Joao Pires, stefano.carrazza@mi.infn.it and Joao.Pires@mib.infn.it -Date: Early 2014 -CodesUsed: Private gg->jj code from JP, validated with threshold approximation code from Vogelsang -TheoryInput: NNPDF2.3 NNLO, alphas(MZ)=0.119 -> CONVERTED TO 0.118 -PDFset: NNPDF23_nnlo_as_0119 -Warnings: Uses pt_jet as central scale rather than pt_leading, to update once final pp -> jj code available -******************************************************************************************** -2.3271 0.00000 -1.98516 0.00000 -1.75034 0.00000 -1.60425 0.00000 -1.48658 0.00000 -1.38097 0.00000 -1.29675 0.00000 -1.24733 0.00000 -1.21193 0.00000 -1.18282 0.00000 -1.15497 0.00000 -1.1332 0.00000 -1.11932 0.00000 -1.10593 0.00000 -1.09963 0.00000 -1.09986 0.00000 -2.37978 0.00000 -2.03072 0.00000 -1.79244 0.00000 -1.64757 0.00000 -1.52346 0.00000 -1.41681 0.00000 -1.3271 0.00000 -1.27444 0.00000 -1.2427 0.00000 -1.21281 0.00000 -1.18537 0.00000 -1.16687 0.00000 -1.15291 0.00000 -1.14486 0.00000 -1.13946 0.00000 -1.1394 0.00000 -2.48241 0.00000 -2.13809 0.00000 -1.89105 0.00000 -1.7404 0.00000 -1.61521 0.00000 -1.50038 0.00000 -1.40562 0.00000 -1.35212 0.00000 -1.31647 0.00000 -1.29105 0.00000 -1.2669 0.00000 -1.25396 0.00000 -1.25218 0.00000 -1.25306 0.00000 -1.25966 0.00000 -1.27475 0.00000 -2.75109 0.00000 -2.38967 0.00000 -2.13283 0.00000 -1.96782 0.00000 -1.829 0.00000 -1.70495 0.00000 -1.60346 0.00000 -1.55519 0.00000 -1.52801 0.00000 -1.51364 0.00000 -1.50517 0.00000 -1.49903 0.00000 -1.49547 0.00000 -1.50356 0.00000 -1.53246 0.00000 -3.2046 0.00000 -2.83004 0.00000 -2.55328 0.00000 -2.375 0.00000 -2.24173 0.00000 -2.1567 0.00000 -2.13893 0.00000 -2.18077 0.00000 -2.25236 0.00000 -2.34536 0.00000 -2.56823 0.00000 -2.99759 0.00000 -3.70835 0.00000 -3.33732 0.00000 -3.09953 0.00000 -3.00449 0.00000 -3.01252 0.00000 -3.14369 0.00000 -3.47422 0.00000 -4.06973 0.00000 -5.26015 0.00000 -4.3848 0.00000 -4.24401 0.00000 -4.4128 0.00000 -4.791 0.00000 -5.55351 0.00000 -7.89858 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASR06JETS36PB.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASR06JETS36PB.dat deleted file mode 100644 index ba9b758ce2..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASR06JETS36PB.dat +++ /dev/null @@ -1,99 +0,0 @@ -******************************************************************************************* -SetName: ATLASR06JETS36PB -Author: Stefano Carrazza and Joao Pires, stefano.carrazza@mi.infn.it and Joao.Pires@mib.infn.it -Date: Early 2014 -CodesUsed: Private gg->jj code from JP, validated with threshold approximation code from Vogelsang -TheoryInput: NNPDF2.3 NNLO, alphas(MZ)=0.119 -> CONVERTED TO 0.118 -PDFset: NNPDF23_nnlo_as_0119 -Warnings: Uses pt_jet as central scale rather than pt_leading, to update once final pp -> jj code available -******************************************************************************************** -1.98765 0.00000 -1.72663 0.00000 -1.54919 0.00000 -1.4398 0.00000 -1.35284 0.00000 -1.27574 0.00000 -1.21547 0.00000 -1.18079 0.00000 -1.15602 0.00000 -1.13645 0.00000 -1.11914 0.00000 -1.10526 0.00000 -1.09838 0.00000 -1.09298 0.00000 -1.09232 0.00000 -1.09738 0.00000 -2.03349 0.00000 -1.76552 0.00000 -1.58481 0.00000 -1.47585 0.00000 -1.38333 0.00000 -1.30527 0.00000 -1.2404 0.00000 -1.20317 0.00000 -1.18185 0.00000 -1.16151 0.00000 -1.14421 0.00000 -1.133 0.00000 -1.12525 0.00000 -1.12391 0.00000 -1.12306 0.00000 -1.12685 0.00000 -2.12302 0.00000 -1.85712 0.00000 -1.66763 0.00000 -1.55385 0.00000 -1.46033 0.00000 -1.37517 0.00000 -1.3067 0.00000 -1.26902 0.00000 -1.24408 0.00000 -1.22752 0.00000 -1.21212 0.00000 -1.20488 0.00000 -1.20644 0.00000 -1.21047 0.00000 -1.21804 0.00000 -1.23303 0.00000 -2.35896 0.00000 -2.07422 0.00000 -1.87476 0.00000 -1.74806 0.00000 -1.64353 0.00000 -1.55118 0.00000 -1.47695 0.00000 -1.4438 0.00000 -1.42505 0.00000 -1.41675 0.00000 -1.41338 0.00000 -1.40947 0.00000 -1.40765 0.00000 -1.41522 0.00000 -1.43836 0.00000 -2.7638 0.00000 -2.46237 0.00000 -2.24498 0.00000 -2.10888 0.00000 -2.00965 0.00000 -1.95007 0.00000 -1.94385 0.00000 -1.98273 0.00000 -2.04388 0.00000 -2.11991 0.00000 -2.29965 0.00000 -2.63631 0.00000 -3.2306 0.00000 -2.93369 0.00000 -2.74923 0.00000 -2.68032 0.00000 -2.69468 0.00000 -2.80928 0.00000 -3.0815 0.00000 -3.55959 0.00000 -4.48618 0.00000 -3.88731 0.00000 -3.77915 0.00000 -3.92965 0.00000 -4.24501 0.00000 -4.87015 0.00000 -6.72189 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTPT.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTPT.dat deleted file mode 100644 index 4bda76d3af..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTPT.dat +++ /dev/null @@ -1,17 +0,0 @@ -******************************************************************************** -SetName: ATLASTOPDIFF8TEVTPT -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=sqrt(mt^2+pTt^2)/2, mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.10290 0.00000 -1.07677 0.00000 -1.06349 0.00000 -1.04887 0.00000 -1.03123 0.00000 -1.00981 0.00000 -0.98509 0.00000 -0.95357 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTPT_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTPT_DEN.dat deleted file mode 100644 index dd63517396..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTPT_DEN.dat +++ /dev/null @@ -1,17 +0,0 @@ -******************************************************************************** -SetName: ATLASTOPDIFF8TEVTPTNORM -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=sqrt(mt^2+pTt^2)/2, mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06868 0.00000 -1.06868 0.00000 -1.06868 0.00000 -1.06868 0.00000 -1.06868 0.00000 -1.06868 0.00000 -1.06868 0.00000 -1.06868 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTPT_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTPT_NUM.dat deleted file mode 100644 index 4bda76d3af..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTPT_NUM.dat +++ /dev/null @@ -1,17 +0,0 @@ -******************************************************************************** -SetName: ATLASTOPDIFF8TEVTPT -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=sqrt(mt^2+pTt^2)/2, mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.10290 0.00000 -1.07677 0.00000 -1.06349 0.00000 -1.04887 0.00000 -1.03123 0.00000 -1.00981 0.00000 -0.98509 0.00000 -0.95357 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTRAP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTRAP.dat deleted file mode 100644 index 57990210b0..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTRAP.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMSTOPDIFF8TEVTRAP -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.08566 0.00000 -1.07024 0.00000 -1.06401 0.00000 -1.06056 0.00000 -1.05897 0.00000 -1.05897 0.00000 -1.06056 0.00000 -1.06401 0.00000 -1.07024 0.00000 -1.08566 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTRAP_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTRAP_DEN.dat deleted file mode 100644 index 0ce6703223..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTRAP_DEN.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: ATLASTOPDIFF8TEVTRAPNORM -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTRAP_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTRAP_NUM.dat deleted file mode 100644 index 57990210b0..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTRAP_NUM.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMSTOPDIFF8TEVTRAP -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.08566 0.00000 -1.07024 0.00000 -1.06401 0.00000 -1.06056 0.00000 -1.05897 0.00000 -1.05897 0.00000 -1.06056 0.00000 -1.06401 0.00000 -1.07024 0.00000 -1.08566 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTM.dat deleted file mode 100644 index ed35c59d1a..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTM.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: ATLASTOPDIFF8TEVTTM -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07351 0.00000 -1.05135 0.00000 -1.06054 0.00000 -1.07278 0.00000 -1.08464 0.00000 -1.10038 0.00000 -1.11975 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTM_DEN.dat deleted file mode 100644 index 47ecbbd90b..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTM_DEN.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: ATLASTOPDIFF8TEVTTMNORM -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTM_NUM.dat deleted file mode 100644 index ed35c59d1a..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTM_NUM.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: ATLASTOPDIFF8TEVTTM -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07351 0.00000 -1.05135 0.00000 -1.06054 0.00000 -1.07278 0.00000 -1.08464 0.00000 -1.10038 0.00000 -1.11975 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTPT.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTPT.dat deleted file mode 100644 index edd317a4c0..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTPT.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: ATLASTOPDIFF8TEVTTPT -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.1706 0.00000 -0.864983 0.00000 -1.16169 0.00000 -1.264 0.00000 -1.28102 0.00000 -1.22307 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTPT_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTPT_DEN.dat deleted file mode 100644 index 0f983aad85..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTPT_DEN.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: ATLASTOPDIFF8TEVTTPTNORM -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTPT_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTPT_NUM.dat deleted file mode 100644 index edd317a4c0..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTPT_NUM.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: ATLASTOPDIFF8TEVTTPT -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.1706 0.00000 -0.864983 0.00000 -1.16169 0.00000 -1.264 0.00000 -1.28102 0.00000 -1.22307 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTRAP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTRAP.dat deleted file mode 100644 index 032a64d91c..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTRAP.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMSTOPDIFF8TEVTTRAP -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07209 0.00000 -1.06631 0.00000 -1.06544 0.00000 -1.06473 0.00000 -1.06466 0.00000 -1.06466 0.00000 -1.06473 0.00000 -1.06544 0.00000 -1.06631 0.00000 -1.07209 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTRAP_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTRAP_DEN.dat deleted file mode 100644 index 79eab444e9..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTRAP_DEN.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: ATLASTOPDIFF8TEVTTRAPNORM -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTRAP_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTRAP_NUM.dat deleted file mode 100644 index 032a64d91c..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTOPDIFF8TEVTTRAP_NUM.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMSTOPDIFF8TEVTTRAP -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07209 0.00000 -1.06631 0.00000 -1.06544 0.00000 -1.06473 0.00000 -1.06466 0.00000 -1.06466 0.00000 -1.06473 0.00000 -1.06544 0.00000 -1.06631 0.00000 -1.07209 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTTBARTOT.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTTBARTOT.dat deleted file mode 100644 index 5de8d68704..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTTBARTOT.dat +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************** -SetName: ATLASTTBARTOT -Author: Emanuele R. Nocera emanuele.nocera@physics.ox.ac.uk -Date: June 2016 -CodesUsed: top++ v2.0 -TheoryInput: NNPDF3.0 with alphas(MZ)=0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: NNLO theory (no NNLL effects) -******************************************************************************** -1.0660 0.0000 -1.0671 0.0000 -1.0703 0.0000 - diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTTBARTOT13TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTTBARTOT13TEV.dat deleted file mode 100644 index 0a0c5232f2..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTTBARTOT13TEV.dat +++ /dev/null @@ -1,10 +0,0 @@ -******************************************************************************** -SetName: ATLASTTBARTOT13TEV -Author: Emanuele R. Nocera emanuele.nocera@physics.ox.ac.uk -Date: June 2016 -CodesUsed: top++ v2.0 -TheoryInput: NNPDF3.0 with alphas(MZ)=0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: NNLO theory (no NNLL effects) -******************************************************************************** -1.0703 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTTBARTOT7TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTTBARTOT7TEV.dat deleted file mode 100644 index 3cf93dfa77..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTTBARTOT7TEV.dat +++ /dev/null @@ -1,10 +0,0 @@ -******************************************************************************** -SetName: ATLASTTBARTOT7TEV -Author: Emanuele R. Nocera emanuele.nocera@physics.ox.ac.uk -Date: June 2016 -CodesUsed: top++ v2.0 -TheoryInput: NNPDF3.0 with alphas(MZ)=0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: NNLO theory (no NNLL effects) -******************************************************************************** -1.0660 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTTBARTOT8TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTTBARTOT8TEV.dat deleted file mode 100644 index 0caa4a0cf5..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASTTBARTOT8TEV.dat +++ /dev/null @@ -1,10 +0,0 @@ -******************************************************************************** -SetName: ATLASTTBARTOT8TEV -Author: Emanuele R. Nocera emanuele.nocera@physics.ox.ac.uk -Date: June 2016 -CodesUsed: top++ v2.0 -TheoryInput: NNPDF3.0 with alphas(MZ)=0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: NNLO theory (no NNLL effects) -******************************************************************************** -1.0671 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASWZRAP11.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASWZRAP11.dat deleted file mode 100644 index c46ed9c7e7..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASWZRAP11.dat +++ /dev/null @@ -1,43 +0,0 @@ -******************************************************************************************* -SetName: ATLASWZRAP11 -Author: xFitter Collaboration -Date: ???? -CodesUsed: ???? -TheoryInput: ???? -PDFset: ???? -Warnings: Using zpeak_cc C-factors for Z -******************************************************************************************** -0.984870 0 -0.983888 0 -0.985439 0 -0.985881 0 -0.984754 0 -0.985435 0 -0.986196 0 -0.985478 0 -0.979735 0 -0.982400 0 -0.979655 0 -0.982317 0 -0.983038 0 -0.983778 0 -0.982944 0 -0.982630 0 -0.984439 0 -0.983721 0 -0.983517 0 -0.983288 0 -0.984228 0 -0.979626 0 -0.992769 0 -0.993673 0 -0.993451 0 -0.994567 0 -0.993317 0 -0.991376 0 -0.994142 0 -1.002054 0 -1.008910 0 -1.012833 0 -1.016386 0 -1.022258 0 \ No newline at end of file diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASWZRAP11CC.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASWZRAP11CC.dat deleted file mode 100644 index 48b6e4f911..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASWZRAP11CC.dat +++ /dev/null @@ -1,55 +0,0 @@ -******************************************************************************************* -SetName: ATLASWZRAP11CC -Author: xFitter Collaboration -Date: ???? -CodesUsed: ???? -TheoryInput: ???? -PDFset: ???? -Warnings: -******************************************************************************************** -0.984870 0 -0.983888 0 -0.985439 0 -0.985881 0 -0.984754 0 -0.985435 0 -0.986196 0 -0.985478 0 -0.979735 0 -0.982400 0 -0.979655 0 -0.982317 0 -0.983038 0 -0.983778 0 -0.982944 0 -0.982630 0 -0.984439 0 -0.983721 0 -0.983517 0 -0.983288 0 -0.984228 0 -0.979626 0 -1.039403 0 -1.037862 0 -1.039904 0 -1.039052 0 -1.026166 0 -1.024913 0 -0.992769 0 -0.993673 0 -0.993451 0 -0.994567 0 -0.993317 0 -0.991376 0 -0.994142 0 -1.002054 0 -1.008910 0 -1.012833 0 -1.016386 0 -1.022258 0 -0.994474 0 -0.998117 0 -0.998670 0 -1.008532 0 -1.017040 0 -1.023123 0 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASWZRAP11CF.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASWZRAP11CF.dat deleted file mode 100644 index a466b11d4b..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASWZRAP11CF.dat +++ /dev/null @@ -1,24 +0,0 @@ -******************************************************************************************* -SetName: ATLASWZRAP11CF -Author: xFitter Collaboration -Date: ???? -CodesUsed: ???? -TheoryInput: ???? -PDFset: ???? -Warnings: -******************************************************************************************** -1.011061 0 -0.967919 0 -0.967782 0 -0.972057 0 -0.981738 0 -0.987756 0 -0.988238 0 -0.973018 0 -0.947296 0 -0.964541 0 -0.976692 0 -0.983964 0 -0.991267 0 -0.975248 0 -0.970784 0 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASWZRAP36PB.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASWZRAP36PB.dat deleted file mode 100644 index b51218d476..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASWZRAP36PB.dat +++ /dev/null @@ -1,39 +0,0 @@ -******************************************************************************************* -SetName: ATLASWZRAP36PB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: Early 2012 -CodesUsed: FEWZ -TheoryInput: NNPDF2.1 NNLO alphas(MZ)=0.119 -> CONVERTED TO 0.118 -PDFset: NNPDF21_nnlo_as_0119 -Warnings: C-factors smeared to reduce stat fluctuations -******************************************************************************************** -0.983992 0.00000 -0.984831 0.00000 -0.98593 0.00000 -0.987169 0.00000 -0.988427 0.00000 -0.989854 0.00000 -0.99079 0.00000 -0.991192 0.00000 -0.991171 0.00000 -0.990478 0.00000 -0.988445 0.00000 -0.985458 0.00000 -0.985589 0.00000 -0.98658 0.00000 -0.98811 0.00000 -0.989855 0.00000 -0.991863 0.00000 -0.992977 0.00000 -0.993105 0.00000 -0.992105 0.00000 -0.989462 0.00000 -0.983289 0.00000 -0.992925 0.00000 -0.991195 0.00000 -0.991669 0.00000 -0.993118 0.00000 -0.994314 0.00000 -0.99403 0.00000 -0.991039 0.00000 -0.978788 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASWZTOT13TEV81PB.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASWZTOT13TEV81PB.dat deleted file mode 100644 index 9cfbfef2b2..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASWZTOT13TEV81PB.dat +++ /dev/null @@ -1,12 +0,0 @@ -******************************************************************************************* -SetName: ATLASWZTOT13TEV81PB -Author: Alberto Guffanti -Date: 04.07.2016 -CodesUsed: FEWZ 3.1b2 -TheoryInput: NNLO QCD -PDFset: CT14nnlo -Warnings: -******************************************************************************************** -0.995951 0.00000 -1.00228 0.00000 -0.99786 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASZHIGHMASS49FB.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASZHIGHMASS49FB.dat deleted file mode 100644 index 140faa9461..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASZHIGHMASS49FB.dat +++ /dev/null @@ -1,22 +0,0 @@ -******************************************************************************************* -SetName: ATLASZHIGHMASS49PB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: 2014 -CodesUsed: FEWZ -TheoryInput: NNPDF2.3 NLO, alphas(MZ)=0.119 -> CONVERTED TO 0.118 -PDFset: NNPDF23_nlo_as_0119 -Warnings: -******************************************************************************************** -1.00886 0.00000 -1.0128 0.00000 -1.01477 0.00000 -1.02758 0.00000 -1.03449 0.00000 -1.01676 0.00000 -1.00394 0.00000 -1 0.00000 -0.967442 0.00000 -0.955583 0.00000 -0.952598 0.00000 -0.918979 0.00000 -1.01087 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASZPT7TEV_PTZ.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASZPT7TEV_PTZ.dat deleted file mode 100644 index 6c69d083a8..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASZPT7TEV_PTZ.dat +++ /dev/null @@ -1,87 +0,0 @@ -******************************************************************************************* -SetName: ATLASZPT7TEV_ptZ -Author: Frank Petriello & Raja Boughezai -Date: final updated C factors sent on 10/12/2017 -CodesUsed: their own code -TheoryInput: NNPDF31, alphas(MZ)=0.118 -PDFset: -Warnings: -******************************************************************************************** -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1.048 0.00100 -1.054 0.00100 -1.061 0.00100 -1.060 0.00100 -1.065 0.00100 -1.063 0.00100 -1.063 0.00100 -1.064 0.00100 -1.065 0.00100 -1.062 0.00100 -1.066 0.00100 -1.077 0.00200 -1.080 0.00300 -1.057 0.00400 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1.056 0.00100 -1.060 0.00100 -1.065 0.00100 -1.062 0.00200 -1.061 0.00200 -1.070 0.00200 -1.068 0.00100 -1.065 0.00100 -1.067 0.00100 -1.074 0.00200 -1.078 0.00100 -1.070 0.00300 -1.105 0.00400 -1.105 0.00600 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1.057 0.00300 -1.066 0.00400 -1.073 0.00500 -1.052 0.00600 -1.069 0.00500 -1.060 0.00500 -1.076 0.00300 -1.072 0.00200 -1.079 0.00300 -1.082 0.00300 -1.084 0.00300 -1.085 0.00600 -1.077 0.01100 -1.103 0.02100 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASZPT7TEV_TOT.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASZPT7TEV_TOT.dat deleted file mode 100644 index 3b4d145b27..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASZPT7TEV_TOT.dat +++ /dev/null @@ -1,87 +0,0 @@ -******************************************************************************************* -SetName: ATLASZPT7TEV_TOT -Author: Frank Petriello & Raja Boughezai -Date: 2016 -CodesUsed: their own code -TheoryInput: CT14, alphas(MZ)=0.118 -PDFset: -Warnings: -******************************************************************************************** -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -0.996 0.00000 -0.996 0.00000 -0.996 0.00000 -0.996 0.00000 -0.996 0.00000 -0.996 0.00000 -0.996 0.00000 -0.996 0.00000 -0.996 0.00000 -0.996 0.00000 -0.996 0.00000 -0.996 0.00000 -0.996 0.00000 -0.996 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1.005 0.00000 -1.005 0.00000 -1.005 0.00000 -1.005 0.00000 -1.005 0.00000 -1.005 0.00000 -1.005 0.00000 -1.005 0.00000 -1.005 0.00000 -1.005 0.00000 -1.005 0.00000 -1.005 0.00000 -1.005 0.00000 -1.005 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1.033 0.00000 -1.033 0.00000 -1.033 0.00000 -1.033 0.00000 -1.033 0.00000 -1.033 0.00000 -1.033 0.00000 -1.033 0.00000 -1.033 0.00000 -1.033 0.00000 -1.033 0.00000 -1.033 0.00000 -1.033 0.00000 -1.033 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASZPT8TEVMDIST.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASZPT8TEVMDIST.dat deleted file mode 100644 index be4b1fbdc8..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASZPT8TEVMDIST.dat +++ /dev/null @@ -1,73 +0,0 @@ -******************************************************************************************* -SetName: ATLASZPT7TEV_ptZ -Author: Frank Petriello & Raja Boughezai -Date: 2016 -CodesUsed: their own code -TheoryInput: CT14, alphas(MZ)=0.118 -PDFset: -Warnings: -******************************************************************************************** -1.099 0.00200 -1.090 0.00100 -1.090 0.00100 -1.104 0.00100 -1.097 0.00100 -1.090 0.00100 -1.095 0.00100 -1.079 0.00100 -1.088 0.00100 -1.091 0.00100 -1.088 0.00100 -1.083 0.00200 -1.081 0.00100 -1.076 0.00100 -1.092 0.00100 -1.088 0.00200 -1.083 0.00200 -1.078 0.00200 -1.081 0.00200 -1.079 0.00200 -1.081 0.00200 -1.077 0.00100 -1.077 0.00200 -1.075 0.00200 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1.068 0.00500 -1.071 0.00400 -1.075 0.00400 -1.077 0.00400 -1.069 0.00400 -1.077 0.00500 -1.084 0.00400 -1.070 0.00500 -1.080 0.00500 -1.084 0.00500 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1. 0.00000 -1.040 0.00300 -1.049 0.00300 -1.054 0.00300 -1.065 0.00300 -1.056 0.00300 -1.064 0.00400 -1.057 0.00400 -1.064 0.00400 -1.068 0.00400 -1.072 0.00400 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASZPT8TEVYDIST.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASZPT8TEVYDIST.dat deleted file mode 100644 index 1cb043f904..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLASZPT8TEVYDIST.dat +++ /dev/null @@ -1,129 +0,0 @@ -******************************************************************************************* -SetName: ATLASZPT8TEV_ptZ -Author: Frank Petriello & Raja Boughezai -Date: 2016 -CodesUsed: their own code -TheoryInput: CT14, alphas(MZ)=0.118 -PDFset: -Warnings: -******************************************************************************************** -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0480000e+00 2.6200000e-03 -1.0570000e+00 2.6425000e-03 -1.0580000e+00 2.6450000e-03 -1.0610000e+00 2.6525000e-03 -1.0500000e+00 2.6250000e-03 -1.0560000e+00 2.6400000e-03 -1.0670000e+00 2.6675000e-03 -1.0670000e+00 2.6675000e-03 -1.0630000e+00 2.6575000e-03 -1.0640000e+00 2.6600000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0430000e+00 2.6075000e-03 -1.0500000e+00 2.6250000e-03 -1.0590000e+00 2.6475000e-03 -1.0670000e+00 2.6675000e-03 -1.0660000e+00 2.6650000e-03 -1.0730000e+00 2.6825000e-03 -1.0670000e+00 2.6675000e-03 -1.0720000e+00 2.6800000e-03 -1.0590000e+00 2.6475000e-03 -1.0850000e+00 2.7125000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0500000e+00 2.6250000e-03 -1.0570000e+00 2.6425000e-03 -1.0560000e+00 2.6400000e-03 -1.0670000e+00 2.6675000e-03 -1.0570000e+00 2.6425000e-03 -1.0590000e+00 2.6475000e-03 -1.0680000e+00 2.6700000e-03 -1.0690000e+00 2.6725000e-03 -1.0720000e+00 2.6800000e-03 -1.0860000e+00 2.7150000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0520000e+00 2.6300000e-03 -1.0620000e+00 2.6550000e-03 -1.0620000e+00 2.6550000e-03 -1.0570000e+00 2.6425000e-03 -1.0650000e+00 2.6625000e-03 -1.0660000e+00 2.6650000e-03 -1.0750000e+00 2.6875000e-03 -1.0790000e+00 2.6975000e-03 -1.0840000e+00 2.7100000e-03 -1.0880000e+00 2.7200000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0480000e+00 2.6200000e-03 -1.0660000e+00 2.6650000e-03 -1.0560000e+00 2.6400000e-03 -1.0660000e+00 2.6650000e-03 -1.0550000e+00 2.6375000e-03 -1.0780000e+00 2.6950000e-03 -1.0800000e+00 2.7000000e-03 -1.0840000e+00 2.7100000e-03 -1.0830000e+00 2.7075000e-03 -1.1100000e+00 2.7750000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0000000e+00 2.5000000e-03 -1.0610000e+00 2.6525000e-03 -1.0750000e+00 2.6875000e-03 -1.0930000e+00 2.7325000e-03 -1.0810000e+00 2.7025000e-03 -1.0950000e+00 2.7375000e-03 -1.0480000e+00 2.6200000e-03 -1.0850000e+00 2.7125000e-03 -1.0970000e+00 2.7425000e-03 -1.1300000e+00 2.8250000e-03 -1.0730000e+00 2.6825000e-03 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_1JET_8TEV_R04.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_1JET_8TEV_R04.dat deleted file mode 100644 index 43c09d0afd..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_1JET_8TEV_R04.dat +++ /dev/null @@ -1,181 +0,0 @@ -******************************************************************************** -SetName: ATLAS_1JET_8TEV_R04 -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: Sep 2019 -CodesUsed: K-factors provided by J. Pires et al. -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -0.98974 0.01525 -1.00127 0.01513 -1.00208 0.01406 -0.99042 0.01254 -0.99581 0.01181 -0.99077 0.01099 -1.00359 0.01016 -0.99814 0.01002 -0.99684 0.00958 -1.00675 0.00968 -0.99656 0.00946 -1.00279 0.00893 -1.00981 0.00881 -1.00983 0.00832 -1.00679 0.00827 -1.01780 0.00813 -1.02011 0.00790 -1.01795 0.00786 -1.02603 0.00747 -1.03728 0.00741 -1.03441 0.00734 -1.04492 0.00705 -1.03900 0.00687 -1.04380 0.00714 -1.05808 0.00708 -1.04206 0.00672 -1.05102 0.00682 -1.06481 0.00683 -1.06094 0.00676 -1.07153 0.00550 -1.07850 0.00380 -1.09177 0.00334 -1.11744 0.00339 -1.18128 0.00561 -1.00435 0.01645 -0.97921 0.01668 -0.97600 0.01519 -1.04518 0.01284 -0.94276 0.01592 -0.99994 0.01136 -1.01570 0.01084 -1.01046 0.01089 -0.99665 0.01316 -0.98724 0.01037 -0.99533 0.00951 -1.01873 0.00921 -0.99996 0.00901 -1.02079 0.00864 -1.00922 0.00842 -1.01591 0.00826 -1.02239 0.00807 -1.02719 0.00793 -1.03464 0.00773 -1.02649 0.00754 -1.02207 0.00733 -1.03292 0.00726 -1.04828 0.00720 -1.03663 0.00720 -1.04012 0.00737 -1.05096 0.00735 -1.05575 0.00737 -1.03865 0.00726 -1.05135 0.00730 -1.07938 0.00602 -1.07254 0.00452 -1.07794 0.00471 -1.09567 0.00551 -0.99182 0.01748 -0.98773 0.01640 -1.01133 0.01594 -0.99017 0.01369 -0.98511 0.01304 -1.00144 0.01176 -1.00213 0.01077 -0.99832 0.01083 -1.00797 0.00994 -0.99789 0.01022 -1.01983 0.00979 -1.01756 0.00924 -1.02564 0.00922 -1.02105 0.00888 -1.01028 0.00865 -1.02600 0.00841 -1.03064 0.00825 -1.02366 0.00805 -1.03570 0.00810 -1.03441 0.00825 -1.02898 0.00794 -1.03577 0.00804 -1.03057 0.00806 -1.04428 0.00821 -1.05021 0.00855 -1.03245 0.00843 -1.05010 0.00861 -1.04611 0.00896 -1.05741 0.00934 -1.05269 0.00822 -1.04247 0.00800 -1.07410 0.00854 -1.00578 0.01717 -0.99955 0.01714 -1.00297 0.01589 -0.99886 0.01392 -0.99790 0.01326 -1.00883 0.01196 -1.01400 0.01071 -0.99871 0.01109 -1.01053 0.01037 -1.01504 0.01042 -1.01536 0.01012 -1.01928 0.00966 -1.00786 0.00998 -1.02121 0.00952 -1.00591 0.00972 -1.02897 0.00989 -1.01031 0.00960 -1.03364 0.00956 -1.03611 0.00976 -1.00913 0.01014 -1.02165 0.01034 -1.02898 0.01096 -1.01797 0.01125 -1.02096 0.01243 -1.03337 0.01309 -1.02214 0.01774 -1.03178 0.01791 -1.03024 0.01769 -1.08752 0.02554 -1.06021 0.02148 -1.00765 0.01795 -1.00795 0.01783 -1.03395 0.01605 -0.99407 0.01455 -0.98001 0.01430 -1.00982 0.01320 -1.02363 0.01242 -1.01736 0.01242 -1.02891 0.01211 -1.02573 0.01227 -1.01944 0.01220 -1.02021 0.01196 -1.03345 0.01257 -1.00519 0.01294 -1.02734 0.01376 -0.99376 0.01694 -1.00378 0.01457 -0.97980 0.01676 -1.01392 0.01729 -0.98790 0.01860 -1.01671 0.02136 -1.05134 0.02437 -0.98872 0.03494 -1.00953 0.03702 -1.02016 0.01947 -0.98843 0.01914 -1.00771 0.01833 -0.98954 0.01629 -1.02758 0.01606 -0.99986 0.01546 -1.02675 0.01504 -1.01290 0.01652 -0.98409 0.01669 -0.96569 0.01799 -0.99126 0.01869 -0.98234 0.02020 -1.02144 0.02285 -1.04500 0.02741 -0.99924 0.02847 -1.00827 0.03786 -1.04425 0.03971 -0.98447 0.05337 - diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_1JET_8TEV_R06.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_1JET_8TEV_R06.dat deleted file mode 100644 index fa11973b7a..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_1JET_8TEV_R06.dat +++ /dev/null @@ -1,180 +0,0 @@ -******************************************************************************** -SetName: ATLAS_1JET_8TEV_R06 -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: Sep 2019 -CodesUsed: K-factors provided by J. Pires et al. -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.04512 0.01195 -1.04262 0.01156 -1.03023 0.01119 -1.03293 0.00964 -1.05975 0.00967 -1.05000 0.00877 -1.04660 0.00819 -1.06179 0.00851 -1.05278 0.00799 -1.06103 0.00805 -1.06665 0.00795 -1.07238 0.00780 -1.04667 0.00778 -1.06284 0.00714 -1.06025 0.00684 -1.07837 0.00664 -1.05700 0.00647 -1.07015 0.00639 -1.07666 0.00646 -1.07048 0.00623 -1.07591 0.00593 -1.09142 0.00589 -1.07979 0.00569 -1.09088 0.00556 -1.08785 0.00550 -1.09713 0.00505 -1.09264 0.00510 -1.09939 0.00541 -1.11195 0.00555 -1.10631 0.00448 -1.12265 0.00302 -1.13719 0.00265 -1.16090 0.00322 -1.24188 0.00460 -1.04113 0.01324 -1.04130 0.01299 -1.06254 0.01190 -1.03474 0.01078 -1.04596 0.01072 -1.05740 0.00965 -1.06231 0.00884 -1.05271 0.00915 -1.05392 0.00863 -1.05741 0.00878 -1.05867 0.00826 -1.06507 0.00783 -1.05568 0.00785 -1.05828 0.00737 -1.07540 0.00711 -1.06838 0.00705 -1.06153 0.00887 -1.06768 0.00651 -1.08704 0.00663 -1.07848 0.00641 -1.07364 0.00621 -1.08446 0.00612 -1.09117 0.00595 -1.07720 0.00592 -1.09351 0.00573 -1.09055 0.00551 -1.08857 0.00585 -1.09799 0.00598 -1.10411 0.00588 -1.09579 0.00504 -1.11975 0.00376 -1.12293 0.00351 -1.14296 0.00481 -1.03805 0.01372 -1.02623 0.01395 -1.06016 0.01254 -1.03051 0.01085 -1.06824 0.01071 -1.04732 0.00994 -1.06499 0.00907 -1.05390 0.00925 -1.06588 0.00878 -1.05824 0.00884 -1.07775 0.00850 -1.07039 0.01049 -1.05570 0.00802 -1.06809 0.00754 -1.07321 0.00727 -1.07695 0.00716 -1.06413 0.00689 -1.06745 0.00676 -1.08769 0.00668 -1.06778 0.00667 -1.08463 0.00651 -1.08309 0.00661 -1.07135 0.00664 -1.08035 0.00667 -1.07600 0.00692 -1.08068 0.00681 -1.09681 0.00712 -1.09761 0.00776 -1.10314 0.00797 -1.08910 0.00730 -1.10003 0.00625 -1.11382 0.00732 -1.03625 0.01400 -1.05877 0.01367 -1.04235 0.01260 -1.04685 0.01128 -1.06326 0.01116 -1.05275 0.01020 -1.06154 0.00954 -1.06266 0.00954 -1.04856 0.00916 -1.07450 0.00937 -1.06238 0.00865 -1.06223 0.00829 -1.06790 0.00861 -1.04353 0.00840 -1.08609 0.00815 -1.07161 0.00804 -1.06253 0.00797 -1.07474 0.00801 -1.06089 0.00827 -1.05665 0.00858 -1.06745 0.00888 -1.06813 0.00905 -1.05529 0.00963 -1.06819 0.01065 -1.06587 0.01186 -1.07346 0.01300 -1.08182 0.01418 -1.09771 0.01673 -1.07519 0.02261 -1.10140 0.01955 -1.04260 0.01458 -1.05274 0.01423 -1.06327 0.01357 -1.06741 0.01224 -1.04974 0.01219 -1.05586 0.01123 -1.07237 0.01067 -1.07112 0.01095 -1.05274 0.01042 -1.06105 0.01054 -1.05418 0.01066 -1.07064 0.01038 -1.04572 0.01063 -1.06359 0.01110 -1.05497 0.01163 -1.03235 0.01205 -1.05024 0.01274 -1.06184 0.01402 -1.06633 0.01496 -1.05100 0.01626 -1.03243 0.01904 -1.05909 0.02296 -1.07856 0.02731 -1.09143 0.03593 -1.08050 0.01627 -1.06656 0.01591 -1.05822 0.01511 -1.06912 0.01386 -1.05287 0.01425 -1.04843 0.01352 -1.06900 0.01321 -1.06975 0.01424 -1.04378 0.01424 -1.05821 0.01520 -1.07495 0.01584 -1.01913 0.01726 -1.05543 0.02095 -1.04641 0.02189 -1.05266 0.02582 -1.04736 0.02966 -1.07726 0.03598 -1.03894 0.04890 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_2JET_7TEV_R04.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_2JET_7TEV_R04.dat deleted file mode 100644 index 2a8053ba88..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_2JET_7TEV_R04.dat +++ /dev/null @@ -1,99 +0,0 @@ -******************************************************************************** -SetName: ATLAS_2JET_7TEV_R04 -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: Sep 2019 -CodesUsed: K-factors provided by J. Pires et al. -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -0.86512 0.02366 -0.89171 0.02154 -0.91083 0.01841 -0.95428 0.01960 -0.93402 0.01738 -0.92596 0.01715 -0.93879 0.01555 -0.95578 0.01543 -0.95840 0.01451 -0.97699 0.01423 -0.96172 0.01399 -0.96777 0.01285 -0.97142 0.01258 -0.97626 0.01268 -0.98867 0.01212 -0.99000 0.01044 -0.98750 0.01141 -1.04028 0.01586 -1.02564 0.01029 -1.01744 0.01019 -1.04526 0.00712 -0.94789 0.02022 -0.96408 0.01780 -0.91293 0.01715 -0.94956 0.01596 -0.95194 0.01449 -0.98272 0.01275 -0.95671 0.01257 -0.96614 0.01203 -0.98085 0.01259 -0.97344 0.01272 -0.97511 0.01267 -0.97803 0.01172 -0.98376 0.01193 -0.99393 0.01131 -0.97156 0.01114 -0.99471 0.01128 -1.01064 0.01114 -1.01374 0.01077 -1.01293 0.01118 -0.99155 0.01122 -1.01977 0.00849 -0.94647 0.01590 -0.97471 0.01461 -0.94412 0.01241 -0.98053 0.01550 -0.97801 0.01171 -0.98529 0.01199 -0.98031 0.01254 -1.00667 0.01196 -1.00669 0.01163 -0.98965 0.01063 -0.97759 0.01133 -1.00612 0.01208 -0.98935 0.01226 -1.01462 0.01119 -1.00754 0.01093 -1.01050 0.01216 -0.99924 0.01222 -1.01258 0.01346 -0.99773 0.01106 -1.01870 0.01159 -0.99579 0.01115 -1.02855 0.01079 -1.02482 0.01187 -1.03672 0.01129 -1.00934 0.01097 -1.02346 0.01094 -1.02834 0.01105 -1.03044 0.01146 -1.03852 0.01307 -1.03904 0.01689 -1.01115 0.01225 -1.04786 0.01332 -1.02161 0.01406 -1.02506 0.01452 -1.00356 0.01667 -1.00583 0.01367 -1.06963 0.01289 -1.05346 0.01202 -1.06520 0.01267 -1.06242 0.00874 -1.08997 0.00884 -1.06983 0.01038 -1.06069 0.01173 -1.00277 0.01651 -1.10314 0.01399 -1.09943 0.01462 -1.11103 0.02089 -1.05022 0.03138 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_2JET_7TEV_R06.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_2JET_7TEV_R06.dat deleted file mode 100644 index 88e861e2ab..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_2JET_7TEV_R06.dat +++ /dev/null @@ -1,100 +0,0 @@ -******************************************************************************** -SetName: ATLAS_2JET_7TEV_R06 -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: Sep 2019 -CodesUsed: K-factors provided by J. Pires et al. -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -0.97041 0.01481 -0.99029 0.01473 -0.98080 0.01229 -0.99827 0.01227 -0.99795 0.01185 -1.03900 0.01084 -0.99751 0.00980 -1.03451 0.01043 -1.01828 0.00951 -1.03783 0.00938 -1.02825 0.00888 -1.04880 0.00878 -1.04670 0.00787 -1.05865 0.00821 -1.05704 0.00909 -1.06937 0.00852 -1.07998 0.00931 -1.09967 0.00922 -1.11099 0.00958 -1.11461 0.01125 -1.13591 0.00886 -1.02171 0.01500 -0.98704 0.01280 -1.02036 0.01284 -1.02584 0.01187 -1.01212 0.01167 -1.03560 0.01015 -1.04417 0.01044 -1.03107 0.00967 -1.05794 0.01005 -1.04596 0.00944 -1.03847 0.00876 -1.05950 0.00806 -1.05544 0.00874 -1.07793 0.00938 -1.07583 0.00859 -1.05857 0.00930 -1.10593 0.00954 -1.06788 0.00999 -1.07733 0.01127 -1.09654 0.01221 -1.11720 0.00841 -1.03702 0.01434 -1.01353 0.02160 -1.05639 0.01362 -1.08216 0.01401 -1.04688 0.01258 -1.08745 0.01212 -1.07205 0.01208 -1.06451 0.01180 -1.08629 0.01077 -1.06528 0.01127 -1.08121 0.01158 -1.10218 0.01058 -1.10242 0.01148 -1.08599 0.01204 -1.10335 0.01209 -1.11553 0.01302 -1.10705 0.01362 -1.09803 0.01540 -1.10387 0.01294 -1.09206 0.01903 -1.12779 0.01730 -1.10475 0.01829 -1.11773 0.01776 -1.09340 0.01668 -1.11158 0.01646 -1.13043 0.01551 -1.12452 0.01573 -1.13140 0.01524 -1.09773 0.01616 -1.10495 0.01528 -1.11309 0.01665 -1.14432 0.01665 -1.13376 0.01545 -1.12545 0.01558 -1.14700 0.02557 -1.15089 0.02062 -1.13004 0.02351 -1.15981 0.02325 -1.13945 0.02213 -1.16425 0.01465 -1.16550 0.01463 -1.17551 0.01418 -1.19299 0.01270 -1.16696 0.01797 -1.19563 0.01919 -1.21992 0.01828 -1.16772 0.01732 -1.17434 0.02934 - diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_DY_2D_8TEV_LOWMASS.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_DY_2D_8TEV_LOWMASS.dat deleted file mode 100644 index 19d9f99c9f..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_DY_2D_8TEV_LOWMASS.dat +++ /dev/null @@ -1,95 +0,0 @@ -******************************************************************************** -SetName: ATLAS_DY_2D_9TEV_LOWMASS -Author: Emanuele R. Nocera enocera@ed.ac.uk -Date: May 2021 -CodesUsed: MCFM 9.0 -TheoryInput: NNPDF3.1 NNLO, alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -0.98981 0.00272 -0.99708 0.00269 -0.99738 0.00271 -0.99867 0.00287 -0.99886 0.00295 -0.99996 0.00291 -0.99991 0.00279 -0.99710 0.00276 -0.99687 0.00291 -0.99982 0.00339 -0.99843 0.00483 -0.99269 0.01230 -0.98241 0.00120 -0.98379 0.00119 -0.98182 0.00121 -0.98419 0.00125 -0.98224 0.00127 -0.98540 0.00123 -0.98463 0.00124 -0.99743 0.00132 -1.00825 0.00149 -1.01817 0.00190 -1.02533 0.00272 -1.03079 0.00699 -0.98374 0.00088 -0.98464 0.00085 -0.98481 0.00086 -0.98504 0.00086 -0.98498 0.00086 -0.99403 0.00085 -1.00037 0.00091 -1.01004 0.00100 -1.01606 0.00112 -1.02272 0.00137 -1.02969 0.00216 -1.02784 0.00527 -0.98474 0.00079 -0.98579 0.00079 -0.98561 0.00080 -0.98587 0.00081 -0.98655 0.00079 -0.99555 0.00080 -1.00273 0.00082 -1.00912 0.00091 -1.01585 0.00104 -1.02268 0.00129 -1.02650 0.00194 -1.03220 0.00505 -0.99141 0.00082 -0.99184 0.00082 -0.99221 0.00083 -0.99252 0.00081 -0.99733 0.00080 -1.00293 0.00082 -1.00777 0.00089 -1.01434 0.00098 -1.01884 0.00114 -1.02491 0.00144 -1.02638 0.00211 -1.02841 0.00513 -0.99789 0.00075 -0.99712 0.00075 -0.99833 0.00075 -1.00035 0.00076 -1.00369 0.00078 -1.00866 0.00079 -1.01259 0.00083 -1.01738 0.00093 -1.02111 0.00107 -1.02405 0.00133 -1.02728 0.00195 -1.02756 0.00467 -1.00254 0.00419 -1.01006 0.00430 -1.00736 0.00431 -1.01113 0.00433 -1.00556 0.00452 -1.01540 0.00470 -1.01564 0.00509 -1.02192 0.00595 -1.02479 0.00665 -1.02780 0.00824 -1.02941 0.01265 -1.04032 0.03417 - - diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT.dat deleted file mode 100644 index 106ed87265..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT.dat +++ /dev/null @@ -1,14 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9229 0.0000 -0.9875 0.0000 -0.8940 0.0000 -1.0529 0.0000 -1.0598 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM_DEN.dat deleted file mode 100644 index 10d9aaa499..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM_DEN.dat +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM.dat -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9732 0.0000 -0.9732 0.0000 -0.9732 0.0000 -0.9732 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM_NUM.dat deleted file mode 100644 index 62cc0d9e05..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM_NUM.dat +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9229 0.0000 -0.9875 0.0000 -0.8940 0.0000 -1.0529 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP.dat deleted file mode 100644 index 6a6be06b18..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP.dat +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9745 0.0000 -0.9743 0.0000 -0.9736 0.0000 -0.9714 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM_DEN.dat deleted file mode 100644 index fa781fca42..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM_DEN.dat +++ /dev/null @@ -1,12 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM.dat -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9732 0.0000 -0.9732 0.0000 -0.9732 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM_NUM.dat deleted file mode 100644 index 4d541d2721..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM_NUM.dat +++ /dev/null @@ -1,12 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9745 0.0000 -0.9743 0.0000 -0.9736 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT.dat deleted file mode 100644 index 7005d6fb1d..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT.dat +++ /dev/null @@ -1,14 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9277 0.0000 -0.9817 0.0000 -0.8934 0.0000 -1.0378 0.0000 -1.0476 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM_DEN.dat deleted file mode 100644 index 76412751ad..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM_DEN.dat +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM.dat -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9755 0.0000 -0.9755 0.0000 -0.9755 0.0000 -0.9755 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM_NUM.dat deleted file mode 100644 index f35e70eb61..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM_NUM.dat +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM.dat -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9277 0.0000 -0.9817 0.0000 -0.8934 0.0000 -1.0378 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP.dat deleted file mode 100644 index 80a0f2486d..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP.dat +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9824 0.0000 -0.9805 0.0000 -0.9784 0.0000 -0.9677 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM_DEN.dat deleted file mode 100644 index 28ea9c7edd..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM_DEN.dat +++ /dev/null @@ -1,12 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM.dat -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9755 0.0000 -0.9755 0.0000 -0.9755 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM_NUM.dat deleted file mode 100644 index 0fca2e57d7..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM_NUM.dat +++ /dev/null @@ -1,12 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9824 0.0000 -0.9805 0.0000 -0.9784 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT.dat deleted file mode 100644 index db8f1799dd..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT.dat +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9249 0.0000 -1.0003 0.0000 -1.0431 0.0000 -1.0619 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM_DEN.dat deleted file mode 100644 index 4164171ce9..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM_DEN.dat +++ /dev/null @@ -1,12 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9722 0.0000 -0.9722 0.0000 -0.9722 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM_NUM.dat deleted file mode 100644 index 1534fe7f19..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM_NUM.dat +++ /dev/null @@ -1,12 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9249 0.0000 -1.0003 0.0000 -1.0431 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP.dat deleted file mode 100644 index 55b6ef4275..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP.dat +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9752 0.0000 -0.9727 0.0000 -0.9718 0.0000 -0.9710 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM_DEN.dat deleted file mode 100644 index 726b179384..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM_DEN.dat +++ /dev/null @@ -1,12 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9722 0.0000 -0.9722 0.0000 -0.9722 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM_NUM.dat deleted file mode 100644 index 5d2bf3941e..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM_NUM.dat +++ /dev/null @@ -1,12 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9752 0.0000 -0.9727 0.0000 -0.9718 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT.dat deleted file mode 100644 index 85125cb838..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT.dat +++ /dev/null @@ -1,14 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9294 0.0000 -0.9982 0.0000 -1.0356 0.0000 -1.0422 0.0000 -1.0497 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM_DEN.dat deleted file mode 100644 index 0c35acffc0..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM_DEN.dat +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9748 0.0000 -0.9748 0.0000 -0.9748 0.0000 -0.9748 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM_NUM.dat deleted file mode 100644 index efb10396e1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM_NUM.dat +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9294 0.0000 -0.9982 0.0000 -1.0356 0.0000 -1.0422 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP.dat deleted file mode 100644 index 4293c89904..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP.dat +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9806 0.0000 -0.9800 0.0000 -0.9800 0.0000 -0.9673 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM_DEN.dat deleted file mode 100644 index 4987f41ae9..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM_DEN.dat +++ /dev/null @@ -1,12 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9748 0.0000 -0.9748 0.0000 -0.9748 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM_NUM.dat deleted file mode 100644 index 9275af36b5..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM_NUM.dat +++ /dev/null @@ -1,12 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9806 0.0000 -0.9800 0.0000 -0.9800 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_R_13TEV_T.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_R_13TEV_T.dat deleted file mode 100644 index 00c168402b..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_R_13TEV_T.dat +++ /dev/null @@ -1,10 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_R_7TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9725 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_R_13TEV_TB.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_R_13TEV_TB.dat deleted file mode 100644 index a48d455419..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_R_13TEV_TB.dat +++ /dev/null @@ -1,10 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_R_13TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9696 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_R_7TEV_T.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_R_7TEV_T.dat deleted file mode 100644 index 6a8ecb4045..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_R_7TEV_T.dat +++ /dev/null @@ -1,10 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_R_7TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9755 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_R_7TEV_TB.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_R_7TEV_TB.dat deleted file mode 100644 index e81481a0a4..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_R_7TEV_TB.dat +++ /dev/null @@ -1,10 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_R_7TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9732 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_R_8TEV_T.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_R_8TEV_T.dat deleted file mode 100644 index 534c99e5ae..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_R_8TEV_T.dat +++ /dev/null @@ -1,10 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_R_8TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9748 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_R_8TEV_TB.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_R_8TEV_TB.dat deleted file mode 100644 index fe13d9b9c1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_SINGLETOP_TCH_R_8TEV_TB.dat +++ /dev/null @@ -1,10 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_R_8TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9722 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TOPDIFF_DILEPT_8TEV_TTM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TOPDIFF_DILEPT_8TEV_TTM.dat deleted file mode 100644 index 5d99387bfd..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TOPDIFF_DILEPT_8TEV_TTM.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: ATLAS_TOPDIFF_DILEPT_8TEV_TTM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: K-factors provided by Shaun Bailey (Amanda Cooper-Sarkar) -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07351 0.00000 -1.06054 0.00000 -1.07278 0.00000 -1.08464 0.00000 -1.10038 0.00000 -1.11975 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM_DEN.dat deleted file mode 100644 index ed0da67b13..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM_DEN.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: K-factors provided by Shaun Bailey (Amanda Cooper-Sarkar) -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM_NUM.dat deleted file mode 100644 index 3f0aa9bdc3..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM_NUM.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: K-factors provided by Shaun Bailey (Amanda Cooper-Sarkar) -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07351 0.00000 -1.06054 0.00000 -1.07278 0.00000 -1.08464 0.00000 -1.10038 0.00000 -1.11975 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP.dat deleted file mode 100644 index 6a641145b2..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP.dat +++ /dev/null @@ -1,14 +0,0 @@ -******************************************************************************** -SetName: ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: K-factors provided by Shaun Bailey (Amanda Cooper-Sarkar) -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06466 0.00000 -1.06473 0.00000 -1.06631 0.00000 -1.07209 0.00000 -1.07209 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM_DEN.dat deleted file mode 100644 index 21da7e8de2..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM_DEN.dat +++ /dev/null @@ -1,14 +0,0 @@ -******************************************************************************** -SetName: ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: K-factors provided by Shaun Bailey (Amanda Cooper-Sarkar) -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM_NUM.dat deleted file mode 100644 index 5e093ec6e2..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM_NUM.dat +++ /dev/null @@ -1,14 +0,0 @@ -******************************************************************************** -SetName: ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: November 2019 -CodesUsed: K-factors provided by Shaun Bailey (Amanda Cooper-Sarkar) -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06466 0.00000 -1.06473 0.00000 -1.06631 0.00000 -1.07209 0.00000 -1.07209 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTBARTOT_13TEV_FULLLUMI.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTBARTOT_13TEV_FULLLUMI.dat deleted file mode 100644 index c6fc7dd6c4..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTBARTOT_13TEV_FULLLUMI.dat +++ /dev/null @@ -1,10 +0,0 @@ -******************************************************************************** -SetName: ATLAS_TTBARTOT_13TEV_FULLLUMI -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: June 2020 -CodesUsed: top++ v2.0 -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: NNLO theory (no NNLL effects) -******************************************************************************** -1.0703 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTB_DIFF_8TEV_LJ_TRAP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTB_DIFF_8TEV_LJ_TRAP.dat deleted file mode 100644 index 2e7c7d206d..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTB_DIFF_8TEV_LJ_TRAP.dat +++ /dev/null @@ -1,14 +0,0 @@ -******************************************************************************** -SetName: ATLAS_TTB_DIFF_8TEV_LJ_TRAP -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.05897 0.00000 -1.06056 0.00000 -1.06401 0.00000 -1.07024 0.00000 -1.08566 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_DEN.dat deleted file mode 100644 index 8a8d1e5839..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_DEN.dat +++ /dev/null @@ -1,14 +0,0 @@ -******************************************************************************** -SetName: ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_NUM.dat deleted file mode 100644 index ba235fddc8..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_NUM.dat +++ /dev/null @@ -1,14 +0,0 @@ -******************************************************************************** -SetName: ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.05897 0.00000 -1.06056 0.00000 -1.06401 0.00000 -1.07024 0.00000 -1.08566 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP.dat deleted file mode 100644 index 72232acc48..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP.dat +++ /dev/null @@ -1,14 +0,0 @@ -******************************************************************************** -SetName: ATLAS_TTB_DIFF_8TEV_LJ_TTRAP -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06466 0.00000 -1.06473 0.00000 -1.06544 0.00000 -1.06631 0.00000 -1.07209 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_DEN.dat deleted file mode 100644 index 8a8d1e5839..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_DEN.dat +++ /dev/null @@ -1,14 +0,0 @@ -******************************************************************************** -SetName: ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_NUM.dat deleted file mode 100644 index 4b45223929..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_NUM.dat +++ /dev/null @@ -1,14 +0,0 @@ -******************************************************************************** -SetName: ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06466 0.00000 -1.06473 0.00000 -1.06544 0.00000 -1.06631 0.00000 -1.07209 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_WMU_8TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_WMU_8TEV.dat deleted file mode 100644 index f8a2c9da4a..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_WMU_8TEV.dat +++ /dev/null @@ -1,31 +0,0 @@ -******************************************************************************** -SetName: ATLAS_WMU_8TEV -Author: Emanuele R. Nocera -Date: March 2021 -CodesUsed: DYNNLO -TheoryInput: QCD NNLO -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -0.99087 0.00000 -0.99033 0.00000 -0.99073 0.00000 -0.98816 0.00000 -0.99142 0.00000 -0.98833 0.00000 -0.98775 0.00000 -0.99112 0.00000 -0.99191 0.00000 -0.98576 0.00000 -0.98881 0.00000 -0.98427 0.00000 -0.98053 0.00000 -0.98382 0.00000 -0.98331 0.00000 -0.98623 0.00000 -0.98516 0.00000 -0.98377 0.00000 -0.98733 0.00000 -0.99123 0.00000 -0.98774 0.00000 -0.99687 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_WM_JET_8TEV_PT.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_WM_JET_8TEV_PT.dat deleted file mode 100644 index 174a1d583b..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_WM_JET_8TEV_PT.dat +++ /dev/null @@ -1,25 +0,0 @@ -******************************************************************************** -SetName: ATLAS_WM_JET_8TEV_PT -Author: Emanuele R. Nocera -Date: November 2019 -CodesUsed: NJetti from hepdata 10.17182/hepdata.80076.v1/t84 -TheoryInput: NNLO QCD -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.33 0.00000 -0.91 0.00000 -1.06 0.00000 -1.10 0.00000 -1.11 0.00000 -1.11 0.00000 -1.11 0.00000 -1.10 0.00000 -1.11 0.00000 -1.11 0.00000 -1.10 0.00000 -1.08 0.00000 -1.12 0.00000 -0.81 0.00000 -1.02 0.00000 -1.10 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_WM_JET_8TEV_PTJ.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_WM_JET_8TEV_PTJ.dat deleted file mode 100644 index d4808e4444..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_WM_JET_8TEV_PTJ.dat +++ /dev/null @@ -1,31 +0,0 @@ -******************************************************************************** -SetName: ATLAS_WP_JET_8TEV_PTJ -Author: Emanuele R. Nocera -Date: November 2019 -CodesUsed: NJetti from hepdata 10.17182/hepdata.80076.v1/t84 -TheoryInput: NNLO QCD -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.00 0.00000 -1.04 0.00000 -1.06 0.00000 -1.07 0.00000 -1.07 0.00000 -1.08 0.00000 -1.09 0.00000 -1.08 0.00000 -1.10 0.00000 -1.11 0.00000 -1.08 0.00000 -1.10 0.00000 -1.12 0.00000 -1.12 0.00000 -1.13 0.00000 -1.14 0.00000 -1.14 0.00000 -1.16 0.00000 -1.12 0.00000 -1.17 0.00000 -1.14 0.00000 -1.20 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_WP_JET_8TEV_PT.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_WP_JET_8TEV_PT.dat deleted file mode 100644 index bd37552b88..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_WP_JET_8TEV_PT.dat +++ /dev/null @@ -1,25 +0,0 @@ -******************************************************************************** -SetName: ATLAS_WP_JET_8TEV_PT -Author: Emanuele R. Nocera -Date: November 2019 -CodesUsed: NJetti from hepdata 10.17182/hepdata.80076.v1/t84 -TheoryInput: NNLO QCD -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.33 0.00000 -0.92 0.00000 -1.06 0.00000 -1.10 0.00000 -1.10 0.00000 -1.10 0.00000 -1.10 0.00000 -1.11 0.00000 -1.09 0.00000 -1.08 0.00000 -1.09 0.00000 -1.08 0.00000 -1.09 0.00000 -1.06 0.00000 -1.11 0.00000 -1.10 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_WP_JET_8TEV_PTJ.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_WP_JET_8TEV_PTJ.dat deleted file mode 100644 index 54dd31fb62..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_ATLAS_WP_JET_8TEV_PTJ.dat +++ /dev/null @@ -1,31 +0,0 @@ -******************************************************************************** -SetName: ATLAS_WP_JET_8TEV_PTJ -Author: Emanuele R. Nocera -Date: November 2019 -CodesUsed: NJetti from hepdata 10.17182/hepdata.80076.v1/t84 -TheoryInput: NNLO QCD -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.01 0.00000 -1.05 0.00000 -1.06 0.00000 -1.07 0.00000 -1.07 0.00000 -1.07 0.00000 -1.07 0.00000 -1.07 0.00000 -1.11 0.00000 -1.09 0.00000 -1.08 0.00000 -1.11 0.00000 -1.09 0.00000 -1.09 0.00000 -1.10 0.00000 -1.12 0.00000 -1.13 0.00000 -1.11 0.00000 -1.14 0.00000 -1.11 0.00000 -1.18 0.00000 -1.11 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CDFR2KT.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CDFR2KT.dat deleted file mode 100644 index ad182680f5..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CDFR2KT.dat +++ /dev/null @@ -1,85 +0,0 @@ -******************************************************************************************* -SetName: CDFR2KT -Author: Stefano Carrazza and Joao Pires, stefano.carrazza@mi.infn.it and Joao.Pires@mib.infn.it -Date: Early 2014 -CodesUsed: Private gg->jj code from JP, validated with threshold approximation code from Vogelsang -TheoryInput: NNPDF2.3 NNLO, alphas(MZ)=0.119 -> CONVERTED TO 0.118 -PDFset: NNPDF23_nnlo_as_0119 -Warnings: Uses pt_jet as central scale rather than pt_leading, to update once final pp -> jj code available -******************************************************************************************** -1.2461 0.00000 -1.2209 0.00000 -1.19812 0.00000 -1.18061 0.00000 -1.16378 0.00000 -1.15056 0.00000 -1.1393 0.00000 -1.13069 0.00000 -1.12167 0.00000 -1.11826 0.00000 -1.11377 0.00000 -1.11429 0.00000 -1.11304 0.00000 -1.11584 0.00000 -1.11824 0.00000 -1.12468 0.00000 -1.1351 0.00000 -1.26828 0.00000 -1.2428 0.00000 -1.22062 0.00000 -1.20165 0.00000 -1.18276 0.00000 -1.17251 0.00000 -1.15948 0.00000 -1.15107 0.00000 -1.14384 0.00000 -1.13965 0.00000 -1.13565 0.00000 -1.1349 0.00000 -1.13494 0.00000 -1.13646 0.00000 -1.13975 0.00000 -1.14601 0.00000 -1.15258 0.00000 -1.35221 0.00000 -1.32412 0.00000 -1.29875 0.00000 -1.27599 0.00000 -1.26106 0.00000 -1.24818 0.00000 -1.23834 0.00000 -1.22907 0.00000 -1.22689 0.00000 -1.22559 0.00000 -1.22655 0.00000 -1.23056 0.00000 -1.2328 0.00000 -1.24273 0.00000 -1.25237 0.00000 -1.26171 0.00000 -1.48964 0.00000 -1.45898 0.00000 -1.43318 0.00000 -1.41599 0.00000 -1.40349 0.00000 -1.39431 0.00000 -1.39349 0.00000 -1.3964 0.00000 -1.40078 0.00000 -1.41225 0.00000 -1.42411 0.00000 -1.44031 0.00000 -1.45682 0.00000 -1.48289 0.00000 -1.74025 0.00000 -1.71602 0.00000 -1.7105 0.00000 -1.71204 0.00000 -1.72121 0.00000 -1.74159 0.00000 -1.77713 0.00000 -1.82165 0.00000 -1.88451 0.00000 -1.95951 0.00000 -2.07536 0.00000 -2.28573 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CDFZRAP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CDFZRAP.dat deleted file mode 100644 index 100141ee99..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CDFZRAP.dat +++ /dev/null @@ -1,38 +0,0 @@ -******************************************************************************************* -SetName: D0ZRAP -Author: Juan Rojo juan.rojo@physics.ox.ac.uk -Date: Early 2011 -CodesUsed: VRAP v0.9 -TheoryInput: Fixed muR and muF settings, as(MZ) = 0.119 -> CONVERTED TO 0.118 -PDFset: Preliminary version of NNPDF2.1 NNLO -Warnings: To update with recent C-factors (NNPDFres paper) with dynamical central scale -******************************************************************************************** -1.02313 0.00000 -1.02316 0.00000 -1.02322 0.00000 -1.02333 0.00000 -1.02347 0.00000 -1.02365 0.00000 -1.02383 0.00000 -1.02403 0.00000 -1.02422 0.00000 -1.02442 0.00000 -1.02458 0.00000 -1.02475 0.00000 -1.02489 0.00000 -1.02501 0.00000 -1.02512 0.00000 -1.02523 0.00000 -1.02534 0.00000 -1.02551 0.00000 -1.02574 0.00000 -1.02606 0.00000 -1.02654 0.00000 -1.02723 0.00000 -1.02823 0.00000 -1.02965 0.00000 -1.03169 0.00000 -1.03475 0.00000 -1.03947 0.00000 -1.04716 0.00000 -1.06158 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CDFZRAP_NEW.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CDFZRAP_NEW.dat deleted file mode 100644 index d9269ca746..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CDFZRAP_NEW.dat +++ /dev/null @@ -1,37 +0,0 @@ -******************************************************************************** -SetName: D0ZRAP -Author: Juan Rojo juan.rojo@physics.ox.ac.uk -Date: Early 2011 -CodesUsed: VRAP v0.9 -TheoryInput: Fixed muR and muF settings, as(MZ) = 0.119 -> CONVERTED TO 0.118 -PDFset: Preliminary version of NNPDF2.1 NNLO -Warnings: To update with recent C-factors (NNPDFres paper) with dynamical central scale -******************************************************************************** -1.02313 0.00000 -1.02316 0.00000 -1.02322 0.00000 -1.02333 0.00000 -1.02347 0.00000 -1.02365 0.00000 -1.02383 0.00000 -1.02403 0.00000 -1.02422 0.00000 -1.02442 0.00000 -1.02458 0.00000 -1.02475 0.00000 -1.02489 0.00000 -1.02501 0.00000 -1.02512 0.00000 -1.02523 0.00000 -1.02534 0.00000 -1.02551 0.00000 -1.02574 0.00000 -1.02606 0.00000 -1.02654 0.00000 -1.02723 0.00000 -1.02823 0.00000 -1.02965 0.00000 -1.03169 0.00000 -1.03475 0.00000 -1.03947 0.00000 -1.05091 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSDY2D11.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSDY2D11.dat deleted file mode 100644 index 66bb2706d4..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSDY2D11.dat +++ /dev/null @@ -1,141 +0,0 @@ -******************************************************************************************* -SetName: CMSDY2D11 -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: 2014 -CodesUsed: FEWZ -TheoryInput: NNPDF2.3 NLO, alphas(MZ)=0.119 -> CONVERTED TO 0.118 -PDFset: NNPDF23_nlo_as_0119 -Warnings: -******************************************************************************************** -1.07952 0.00000 -1.08735 0.00000 -1.08814 0.00000 -1.08683 0.00000 -1.08573 0.00000 -1.08587 0.00000 -1.08739 0.00000 -1.0898 0.00000 -1.09228 0.00000 -1.09416 0.00000 -1.0952 0.00000 -1.09577 0.00000 -1.09666 0.00000 -1.09854 0.00000 -1.10141 0.00000 -1.10416 0.00000 -1.10463 0.00000 -1.10036 0.00000 -1.08996 0.00000 -1.07466 0.00000 -1.06005 0.00000 -1.0586 0.00000 -1.09295 0.00000 -1.13124 0.00000 -0.934114 0.00000 -0.937734 0.00000 -0.939671 0.00000 -0.940121 0.00000 -0.940225 0.00000 -0.940974 0.00000 -0.942733 0.00000 -0.945209 0.00000 -0.94767 0.00000 -0.94928 0.00000 -0.949447 0.00000 -0.948093 0.00000 -0.94575 0.00000 -0.943494 0.00000 -0.942751 0.00000 -0.945082 0.00000 -0.951997 0.00000 -0.964763 0.00000 -0.984056 0.00000 -1.00915 0.00000 -1.03597 0.00000 -1.05296 0.00000 -1.03132 0.00000 -0.828917 0.00000 -0.944464 0.00000 -0.954996 0.00000 -0.962184 0.00000 -0.966686 0.00000 -0.969192 0.00000 -0.970351 0.00000 -0.970731 0.00000 -0.970807 0.00000 -0.970968 0.00000 -0.971528 0.00000 -0.972743 0.00000 -0.974826 0.00000 -0.977968 0.00000 -0.982346 0.00000 -0.988141 0.00000 -0.995551 0.00000 -1.00481 0.00000 -1.01618 0.00000 -1.03004 0.00000 -1.04686 0.00000 -1.06731 0.00000 -1.09249 0.00000 -1.12476 0.00000 -1.17713 0.00000 -0.978349 0.00000 -0.979038 0.00000 -0.979919 0.00000 -0.980973 0.00000 -0.982183 0.00000 -0.983539 0.00000 -0.985031 0.00000 -0.986656 0.00000 -0.988411 0.00000 -0.990298 0.00000 -0.992321 0.00000 -0.994492 0.00000 -0.996827 0.00000 -0.999351 0.00000 -1.0021 0.00000 -1.00514 0.00000 -1.00857 0.00000 -1.01254 0.00000 -1.01733 0.00000 -1.02351 0.00000 -1.03232 0.00000 -1.04727 0.00000 -1.08343 0.00000 -1.43779 0.00000 -0.994091 0.00000 -0.992121 0.00000 -0.992121 0.00000 -0.994091 0.00000 -0.995076 0.00000 -0.997045 0.00000 -0.999015 0.00000 -1 0.00000 -1.00098 0.00000 -1.00197 0.00000 -1.00197 0.00000 -1.00098 0.00000 -1.00098 0.00000 -1.00098 0.00000 -1.00098 0.00000 -1.00098 0.00000 -1.00295 0.00000 -1.00591 0.00000 -1.01083 0.00000 -1.01773 0.00000 -1.02758 0.00000 -1.0394 0.00000 -1.04727 0.00000 -0.976363 0.00000 -1.01284 0.00000 -1.01581 0.00000 -1.01581 0.00000 -1.01779 0.00000 -1.02075 0.00000 -1.02371 0.00000 -1.02371 0.00000 -1.02174 0.00000 -1.01779 0.00000 -1.01877 0.00000 -1.03952 0.00000 -1.13536 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSDY2D12.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSDY2D12.dat deleted file mode 100644 index 6c76f13479..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSDY2D12.dat +++ /dev/null @@ -1,141 +0,0 @@ -******************************************************************************** -SetName: CMSDY2D12 -Author: Alberto Guffanti -Date: 2016-11-14 -CodesUsed: FEWZ 3.1b2 -TheoryInput: NNLO QCD (Input cards in external/FEWZ_3.1.b2/bin/InputCards) -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.68312 0.00181013 -1.6857 0.00185486 -1.68225 0.00187451 -1.68374 0.00186973 -1.68862 0.00186305 -1.68968 0.00193068 -1.6891 0.00187333 -1.69632 0.00190797 -1.69939 0.00189496 -1.70608 0.00192834 -1.71035 0.00193546 -1.71789 0.00197799 -1.72138 0.00197303 -1.73154 0.00201728 -1.73925 0.00205701 -1.74364 0.00211246 -1.75537 0.00219162 -1.76513 0.00227209 -1.77573 0.0024079 -1.78811 0.00259277 -1.79171 0.00293346 -1.79334 0.00345728 -1.80515 0.00465364 -1.79894 0.00898177 -1.10555 0.00481675 -1.11199 0.00365124 -1.10324 0.00371674 -1.11388 0.00367928 -1.11335 0.00373201 -1.11742 0.00377527 -1.117 0.00377751 -1.11198 0.00375595 -1.12363 0.00376565 -1.11704 0.00383805 -1.12097 0.00377659 -1.11944 0.00400368 -1.12384 0.00388977 -1.12354 0.00391846 -1.1202 0.00410146 -1.12046 0.0041766 -1.11065 0.00429547 -1.11414 0.00445554 -1.1 0.00478844 -1.09689 0.00525007 -1.11058 0.00609175 -1.09896 0.00770565 -1.11246 0.0115375 -1.08261 0.0322005 -0.967564 0.00862266 -0.974168 0.00444594 -0.982254 0.00428245 -0.976302 0.00431736 -0.987758 0.00415758 -0.973491 0.0041679 -0.980133 0.0422077 -0.981101 0.00441416 -0.985655 0.00440696 -0.985442 0.00436391 -0.98775 0.00437937 -0.98026 0.00452376 -0.97797 0.0045909 -0.98204 0.00468213 -0.969416 0.00468789 -0.981277 0.00481188 -0.982972 0.00525809 -1.00403 0.00576402 -1.01112 0.00663038 -1.01387 0.00912962 -1.02003 0.0104727 -1.00355 0.0175324 -0.984098 0.0310854 -1.04994 0.0969227 -0.986548 0.00909918 -0.993595 0.00369822 -0.987769 0.00368973 -0.995553 0.00381075 -0.993715 0.00373954 -0.987604 0.00384293 -0.988495 0.00370959 -0.987287 0.00388289 -0.987892 0.00372613 -0.98769 0.00391781 -1.00092 0.00501396 -0.997605 0.00460513 -1.00441 0.00475193 -1.00616 0.0055126 -1.00031 0.00658778 -1.05096 0.0134901 -1.02021 0.0045241 -0.966738 0.0102774 -1.00026 0.00891517 -0.991277 0.0113457 -1.12961 0.0515861 -1.01438 0.0152651 -0.928131 0.0404627 -0.918579 0.0972006 -0.994625 0.0071133 -0.998432 0.00256572 -0.999722 0.0026556 -0.999743 0.00258408 -0.99736 0.00272027 -0.992628 0.00249447 -1.00126 0.00296676 -0.999801 0.00335738 -1.00177 0.00323834 -1.00231 0.00343249 -1.0072 0.0328686 -0.999972 0.00360829 -1.01295 0.00379674 -1.00976 0.00339024 -1.00358 0.00401779 -1.01854 0.00399615 -1.00402 0.00615344 -1.00483 0.00542521 -1.02159 0.00609904 -1.01425 0.00771109 -1.04388 0.00895666 -1.02357 0.0116225 -0.949793 0.0279424 -0.807472 0.0664825 -1.00034 0.00543653 -1.01319 0.00223412 -1.01456 0.00212559 -1.01637 0.00215188 -1.01823 0.00241855 -1.01471 0.00235715 -1.01965 0.00263145 -1.01811 0.00328644 -1.02313 0.00439571 -1.02355 0.00487212 -1.03278 0.02701053 -1.21092 0.07886921 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSJETS11.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSJETS11.dat deleted file mode 100644 index 3315a49860..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSJETS11.dat +++ /dev/null @@ -1,142 +0,0 @@ -******************************************************************************************* -SetName: CMSJETS11 -Author: J. Curry, N. Glover, J. Pires -Date: March 2017 -CodesUsed: Private pp->jj code -TheoryInput: MMHT2014 NNLO, alphas(MZ)=0.118 -PDFset: MMHT2014nnlo68cl -Warnings: Uses pt_jet as central scale rather than pt_leading. (points with 0 error are not provided by CGP so we extend its values from the previous point) -******************************************************************************************** -9.811500E-01 5.855550E-03 -1.000940E+00 5.846310E-03 -9.901840E-01 5.933610E-03 -9.907510E-01 6.005570E-03 -9.949820E-01 5.925630E-03 -1.000300E+00 6.058590E-03 -9.898640E-01 5.897610E-03 -9.935830E-01 5.870930E-03 -1.021840E+00 8.200500E-03 -1.003170E+00 5.636940E-03 -1.006720E+00 5.656800E-03 -1.014070E+00 5.654350E-03 -1.008870E+00 5.260040E-03 -1.010790E+00 5.334560E-03 -1.002200E+00 5.208250E-03 -1.009110E+00 5.015320E-03 -1.022450E+00 5.138110E-03 -1.020480E+00 5.593430E-03 -1.020610E+00 5.857690E-03 -1.023530E+00 6.480530E-03 -1.028660E+00 6.919730E-03 -1.027460E+00 6.314770E-03 -1.033820E+00 6.051420E-03 -1.039030E+00 6.846830E-03 -1.038370E+00 6.658050E-03 -1.045950E+00 6.740000E-03 -1.047890E+00 6.700240E-03 -1.046120E+00 7.139130E-03 -1.046120E+00 0.000000E+00 -1.046120E+00 0.000000E+00 -1.046120E+00 0.000000E+00 -1.046120E+00 0.000000E+00 -1.046120E+00 0.000000E+00 -9.917020E-01 6.325770E-03 -9.907940E-01 6.365710E-03 -9.998250E-01 6.441830E-03 -1.002640E+00 6.451520E-03 -9.854460E-01 6.202890E-03 -1.006930E+00 8.866520E-03 -9.865170E-01 8.882660E-03 -1.002000E+00 6.290270E-03 -9.987590E-01 6.062140E-03 -1.005030E+00 5.890060E-03 -1.008050E+00 6.041750E-03 -1.014080E+00 5.896210E-03 -1.010940E+00 5.518000E-03 -1.017670E+00 5.554590E-03 -1.005980E+00 5.559250E-03 -1.008670E+00 5.627460E-03 -1.012450E+00 5.771940E-03 -1.013340E+00 5.955710E-03 -1.017840E+00 6.318750E-03 -1.014910E+00 7.779650E-03 -1.018800E+00 6.525500E-03 -1.013420E+00 8.304370E-03 -1.023780E+00 6.666240E-03 -1.036620E+00 8.062990E-03 -1.031140E+00 7.872270E-03 -1.032160E+00 7.943080E-03 -1.040190E+00 8.305830E-03 -1.045420E+00 8.256630E-03 -1.045420E+00 0.000000E+00 -1.045420E+00 0.000000E+00 -9.855990E-01 6.445880E-03 -1.000640E+00 6.439990E-03 -9.861380E-01 6.472800E-03 -9.971310E-01 6.486450E-03 -9.903810E-01 6.327560E-03 -9.933550E-01 6.414980E-03 -9.995440E-01 6.319770E-03 -1.000870E+00 6.265470E-03 -1.001780E+00 6.075210E-03 -1.001330E+00 6.016990E-03 -1.009450E+00 8.346260E-03 -1.012750E+00 6.188120E-03 -1.001190E+00 5.812190E-03 -1.000970E+00 6.011130E-03 -1.010700E+00 6.086940E-03 -1.001520E+00 6.234100E-03 -1.012440E+00 6.642300E-03 -1.007940E+00 7.033850E-03 -1.012670E+00 7.492060E-03 -1.010270E+00 7.869500E-03 -1.015160E+00 9.530540E-03 -1.010500E+00 1.012220E-02 -1.015520E+00 1.043410E-02 -1.016100E+00 1.081730E-02 -1.019000E+00 1.194640E-02 -1.019000E+00 0.000000E+00 -1.019000E+00 0.000000E+00 -9.852720E-01 6.675340E-03 -9.914110E-01 6.675910E-03 -9.903590E-01 6.722660E-03 -9.838180E-01 6.621800E-03 -9.886250E-01 6.581650E-03 -9.865810E-01 6.656750E-03 -9.860240E-01 6.503970E-03 -9.850590E-01 6.598620E-03 -1.002100E+00 6.529290E-03 -9.815170E-01 9.193870E-03 -1.004690E+00 6.932750E-03 -9.900910E-01 7.196690E-03 -9.936290E-01 7.086220E-03 -9.882940E-01 7.443580E-03 -9.925320E-01 8.303360E-03 -9.894240E-01 9.289670E-03 -9.953720E-01 1.207210E-02 -9.941300E-01 1.352740E-02 -9.920120E-01 1.472390E-02 -9.967150E-01 1.712080E-02 -9.923240E-01 1.890230E-02 -9.923240E-01 0.000000E+00 -9.923240E-01 0.000000E+00 -9.923240E-01 0.000000E+00 -9.916230E-01 7.143890E-03 -9.906040E-01 7.240540E-03 -9.881230E-01 7.306880E-03 -9.850320E-01 7.315380E-03 -9.808700E-01 7.252470E-03 -9.876640E-01 7.509830E-03 -9.898160E-01 7.620350E-03 -9.713980E-01 7.977830E-03 -9.717150E-01 8.319410E-03 -9.849990E-01 9.140160E-03 -9.892740E-01 1.049900E-02 -9.680700E-01 1.367410E-02 -9.694900E-01 1.481510E-02 -9.784140E-01 1.652660E-02 -9.870360E-01 2.405530E-02 -9.844830E-01 2.836880E-02 -9.844830E-01 0.000000E+00 -9.844830E-01 0.000000E+00 -9.844830E-01 0.000000E+00 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSJETS11_NEW_SCALE.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSJETS11_NEW_SCALE.dat deleted file mode 100644 index 872d268de0..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSJETS11_NEW_SCALE.dat +++ /dev/null @@ -1,142 +0,0 @@ -******************************************************************************** -SetName: CMSJETS11_NEW_SCALE -Author: J. Curry, N. Glover, J. Pires -Date: October 2019 -CodesUsed: Private pp->jj code -TheoryInput: NNPDF3.0 NNLO, alphas(MZ)=0.118, R=0.6 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: Uses average HThat as central scale. -******************************************************************************** -1.06318 0.00587 -1.07827 0.00587 -1.04813 0.00600 -1.09294 0.00609 -1.07469 0.00589 -1.07234 0.00589 -1.09084 0.00582 -1.08795 0.00608 -1.08469 0.00622 -1.08364 0.00627 -1.08234 0.00635 -1.10709 0.00620 -1.08318 0.00609 -1.09268 0.00632 -1.10022 0.00629 -1.09939 0.00626 -1.10538 0.00641 -1.10296 0.00651 -1.11319 0.00675 -1.11544 0.00694 -1.13109 0.00696 -1.12698 0.00659 -1.13633 0.00669 -1.11881 0.00655 -1.15528 0.00660 -1.15943 0.00667 -1.17460 0.00669 -1.17693 0.00741 -1.18609 0.00747 -1.20412 0.00845 -1.20802 0.00958 -1.23726 0.00501 -1.25490 0.00552 -1.07267 0.00652 -1.07907 0.00643 -1.08481 0.00631 -1.06280 0.00672 -1.07696 0.00617 -1.07468 0.00632 -1.09077 0.00629 -1.08795 0.00656 -1.09017 0.00647 -1.08132 0.00669 -1.10077 0.00677 -1.09714 0.00643 -1.08547 0.00649 -1.09666 0.00683 -1.09664 0.00670 -1.09109 0.00675 -1.11152 0.00683 -1.09103 0.00709 -1.11262 0.00719 -1.10619 0.00733 -1.12564 0.00767 -1.11984 0.00751 -1.12570 0.00998 -1.13475 0.00806 -1.14587 0.00800 -1.14832 0.00821 -1.15010 0.01002 -1.17583 0.00932 -1.16385 0.01080 -1.19555 0.00644 -1.07562 0.00692 -1.08641 0.00686 -1.04692 0.00892 -1.08110 0.00675 -1.07444 0.00652 -1.07907 0.00691 -1.09756 0.00683 -1.08329 0.00698 -1.09466 0.00684 -1.09026 0.00690 -1.09503 0.00698 -1.08668 0.00703 -1.09000 0.00691 -1.10533 0.00747 -1.10531 0.00766 -1.09793 0.00771 -1.10331 0.00788 -1.09523 0.00831 -1.11683 0.00866 -1.10878 0.00918 -1.10988 0.00945 -1.13159 0.01239 -1.14789 0.01069 -1.11541 0.01459 -1.13933 0.01204 -1.16364 0.01357 -1.16267 0.01134 -1.08015 0.00752 -1.07130 0.00703 -1.07727 0.00744 -1.07355 0.00777 -1.07672 0.00733 -1.08945 0.00760 -1.07829 0.00761 -1.08967 0.00765 -1.09373 0.00800 -1.08217 0.00814 -1.08698 0.00862 -1.08760 0.00847 -1.09911 0.00871 -1.10105 0.00975 -1.08734 0.01042 -1.08550 0.01072 -1.10826 0.01156 -1.09127 0.01311 -1.11406 0.01383 -1.09359 0.01636 -1.13601 0.01797 -1.17605 0.02081 -1.10698 0.02986 -1.14226 0.02994 -1.07070 0.00812 -1.07589 0.00834 -1.08278 0.00844 -1.05220 0.00895 -1.07189 0.00905 -1.07848 0.00941 -1.09053 0.00941 -1.06941 0.01033 -1.07659 0.01083 -1.08228 0.01161 -1.07541 0.01288 -1.09062 0.01409 -1.07422 0.01547 -1.10369 0.01812 -1.08595 0.02061 -1.07359 0.02742 -1.12691 0.03717 -1.10971 0.04360 -1.15957 0.05474 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSJETS11_SF.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSJETS11_SF.dat deleted file mode 100644 index 3315a49860..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSJETS11_SF.dat +++ /dev/null @@ -1,142 +0,0 @@ -******************************************************************************************* -SetName: CMSJETS11 -Author: J. Curry, N. Glover, J. Pires -Date: March 2017 -CodesUsed: Private pp->jj code -TheoryInput: MMHT2014 NNLO, alphas(MZ)=0.118 -PDFset: MMHT2014nnlo68cl -Warnings: Uses pt_jet as central scale rather than pt_leading. (points with 0 error are not provided by CGP so we extend its values from the previous point) -******************************************************************************************** -9.811500E-01 5.855550E-03 -1.000940E+00 5.846310E-03 -9.901840E-01 5.933610E-03 -9.907510E-01 6.005570E-03 -9.949820E-01 5.925630E-03 -1.000300E+00 6.058590E-03 -9.898640E-01 5.897610E-03 -9.935830E-01 5.870930E-03 -1.021840E+00 8.200500E-03 -1.003170E+00 5.636940E-03 -1.006720E+00 5.656800E-03 -1.014070E+00 5.654350E-03 -1.008870E+00 5.260040E-03 -1.010790E+00 5.334560E-03 -1.002200E+00 5.208250E-03 -1.009110E+00 5.015320E-03 -1.022450E+00 5.138110E-03 -1.020480E+00 5.593430E-03 -1.020610E+00 5.857690E-03 -1.023530E+00 6.480530E-03 -1.028660E+00 6.919730E-03 -1.027460E+00 6.314770E-03 -1.033820E+00 6.051420E-03 -1.039030E+00 6.846830E-03 -1.038370E+00 6.658050E-03 -1.045950E+00 6.740000E-03 -1.047890E+00 6.700240E-03 -1.046120E+00 7.139130E-03 -1.046120E+00 0.000000E+00 -1.046120E+00 0.000000E+00 -1.046120E+00 0.000000E+00 -1.046120E+00 0.000000E+00 -1.046120E+00 0.000000E+00 -9.917020E-01 6.325770E-03 -9.907940E-01 6.365710E-03 -9.998250E-01 6.441830E-03 -1.002640E+00 6.451520E-03 -9.854460E-01 6.202890E-03 -1.006930E+00 8.866520E-03 -9.865170E-01 8.882660E-03 -1.002000E+00 6.290270E-03 -9.987590E-01 6.062140E-03 -1.005030E+00 5.890060E-03 -1.008050E+00 6.041750E-03 -1.014080E+00 5.896210E-03 -1.010940E+00 5.518000E-03 -1.017670E+00 5.554590E-03 -1.005980E+00 5.559250E-03 -1.008670E+00 5.627460E-03 -1.012450E+00 5.771940E-03 -1.013340E+00 5.955710E-03 -1.017840E+00 6.318750E-03 -1.014910E+00 7.779650E-03 -1.018800E+00 6.525500E-03 -1.013420E+00 8.304370E-03 -1.023780E+00 6.666240E-03 -1.036620E+00 8.062990E-03 -1.031140E+00 7.872270E-03 -1.032160E+00 7.943080E-03 -1.040190E+00 8.305830E-03 -1.045420E+00 8.256630E-03 -1.045420E+00 0.000000E+00 -1.045420E+00 0.000000E+00 -9.855990E-01 6.445880E-03 -1.000640E+00 6.439990E-03 -9.861380E-01 6.472800E-03 -9.971310E-01 6.486450E-03 -9.903810E-01 6.327560E-03 -9.933550E-01 6.414980E-03 -9.995440E-01 6.319770E-03 -1.000870E+00 6.265470E-03 -1.001780E+00 6.075210E-03 -1.001330E+00 6.016990E-03 -1.009450E+00 8.346260E-03 -1.012750E+00 6.188120E-03 -1.001190E+00 5.812190E-03 -1.000970E+00 6.011130E-03 -1.010700E+00 6.086940E-03 -1.001520E+00 6.234100E-03 -1.012440E+00 6.642300E-03 -1.007940E+00 7.033850E-03 -1.012670E+00 7.492060E-03 -1.010270E+00 7.869500E-03 -1.015160E+00 9.530540E-03 -1.010500E+00 1.012220E-02 -1.015520E+00 1.043410E-02 -1.016100E+00 1.081730E-02 -1.019000E+00 1.194640E-02 -1.019000E+00 0.000000E+00 -1.019000E+00 0.000000E+00 -9.852720E-01 6.675340E-03 -9.914110E-01 6.675910E-03 -9.903590E-01 6.722660E-03 -9.838180E-01 6.621800E-03 -9.886250E-01 6.581650E-03 -9.865810E-01 6.656750E-03 -9.860240E-01 6.503970E-03 -9.850590E-01 6.598620E-03 -1.002100E+00 6.529290E-03 -9.815170E-01 9.193870E-03 -1.004690E+00 6.932750E-03 -9.900910E-01 7.196690E-03 -9.936290E-01 7.086220E-03 -9.882940E-01 7.443580E-03 -9.925320E-01 8.303360E-03 -9.894240E-01 9.289670E-03 -9.953720E-01 1.207210E-02 -9.941300E-01 1.352740E-02 -9.920120E-01 1.472390E-02 -9.967150E-01 1.712080E-02 -9.923240E-01 1.890230E-02 -9.923240E-01 0.000000E+00 -9.923240E-01 0.000000E+00 -9.923240E-01 0.000000E+00 -9.916230E-01 7.143890E-03 -9.906040E-01 7.240540E-03 -9.881230E-01 7.306880E-03 -9.850320E-01 7.315380E-03 -9.808700E-01 7.252470E-03 -9.876640E-01 7.509830E-03 -9.898160E-01 7.620350E-03 -9.713980E-01 7.977830E-03 -9.717150E-01 8.319410E-03 -9.849990E-01 9.140160E-03 -9.892740E-01 1.049900E-02 -9.680700E-01 1.367410E-02 -9.694900E-01 1.481510E-02 -9.784140E-01 1.652660E-02 -9.870360E-01 2.405530E-02 -9.844830E-01 2.836880E-02 -9.844830E-01 0.000000E+00 -9.844830E-01 0.000000E+00 -9.844830E-01 0.000000E+00 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTPT.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTPT.dat deleted file mode 100644 index 2a33fbfbb4..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTPT.dat +++ /dev/null @@ -1,17 +0,0 @@ -******************************************************************************** -SetName: CMSTOPDIFF8TEVTPT -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=sqrt(mt^2+pTt^2)/2, mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.10290 0.00000 -1.07677 0.00000 -1.06349 0.00000 -1.04887 0.00000 -1.03123 0.00000 -1.00981 0.00000 -0.98509 0.00000 -0.95357 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTPT_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTPT_DEN.dat deleted file mode 100644 index dd63517396..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTPT_DEN.dat +++ /dev/null @@ -1,17 +0,0 @@ -******************************************************************************** -SetName: ATLASTOPDIFF8TEVTPTNORM -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=sqrt(mt^2+pTt^2)/2, mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06868 0.00000 -1.06868 0.00000 -1.06868 0.00000 -1.06868 0.00000 -1.06868 0.00000 -1.06868 0.00000 -1.06868 0.00000 -1.06868 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTPT_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTPT_NUM.dat deleted file mode 100644 index 2a33fbfbb4..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTPT_NUM.dat +++ /dev/null @@ -1,17 +0,0 @@ -******************************************************************************** -SetName: CMSTOPDIFF8TEVTPT -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=sqrt(mt^2+pTt^2)/2, mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.10290 0.00000 -1.07677 0.00000 -1.06349 0.00000 -1.04887 0.00000 -1.03123 0.00000 -1.00981 0.00000 -0.98509 0.00000 -0.95357 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTRAP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTRAP.dat deleted file mode 100644 index 57990210b0..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTRAP.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMSTOPDIFF8TEVTRAP -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.08566 0.00000 -1.07024 0.00000 -1.06401 0.00000 -1.06056 0.00000 -1.05897 0.00000 -1.05897 0.00000 -1.06056 0.00000 -1.06401 0.00000 -1.07024 0.00000 -1.08566 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTRAP_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTRAP_DEN.dat deleted file mode 100644 index eda766763b..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTRAP_DEN.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMSTOPDIFF8TEVTRAPNORM -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTRAP_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTRAP_NUM.dat deleted file mode 100644 index 57990210b0..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTRAP_NUM.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMSTOPDIFF8TEVTRAP -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.08566 0.00000 -1.07024 0.00000 -1.06401 0.00000 -1.06056 0.00000 -1.05897 0.00000 -1.05897 0.00000 -1.06056 0.00000 -1.06401 0.00000 -1.07024 0.00000 -1.08566 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTM.dat deleted file mode 100644 index a855193446..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTM.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: CMSTOPDIFF8TEVTTM -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07351 0.00000 -1.05135 0.00000 -1.06054 0.00000 -1.07278 0.00000 -1.08464 0.00000 -1.10038 0.00000 -1.11975 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTM_DEN.dat deleted file mode 100644 index b1d07eddf6..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTM_DEN.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: CMSTOPDIFF8TEVTTMNORM -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTM_NUM.dat deleted file mode 100644 index a855193446..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTM_NUM.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: CMSTOPDIFF8TEVTTM -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07351 0.00000 -1.05135 0.00000 -1.06054 0.00000 -1.07278 0.00000 -1.08464 0.00000 -1.10038 0.00000 -1.11975 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTPT.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTPT.dat deleted file mode 100644 index 43c1ae36b9..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTPT.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: CMSTOPDIFF8TEVTTPT -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.1706 0.00000 -0.864983 0.00000 -1.16169 0.00000 -1.264 0.00000 -1.28102 0.00000 -1.22307 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTPT_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTPT_DEN.dat deleted file mode 100644 index a378a90ab1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTPT_DEN.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: CMSTOPDIFF8TEVTTPTNORM -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTPT_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTPT_NUM.dat deleted file mode 100644 index 43c1ae36b9..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTPT_NUM.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: CMSTOPDIFF8TEVTTPT -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.1706 0.00000 -0.864983 0.00000 -1.16169 0.00000 -1.264 0.00000 -1.28102 0.00000 -1.22307 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTRAP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTRAP.dat deleted file mode 100644 index 032a64d91c..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTRAP.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMSTOPDIFF8TEVTTRAP -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07209 0.00000 -1.06631 0.00000 -1.06544 0.00000 -1.06473 0.00000 -1.06466 0.00000 -1.06466 0.00000 -1.06473 0.00000 -1.06544 0.00000 -1.06631 0.00000 -1.07209 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTRAP_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTRAP_DEN.dat deleted file mode 100644 index e29baef555..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTRAP_DEN.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMSTOPDIFF8TEVTTRAPNORM -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 -1.06615 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTRAP_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTRAP_NUM.dat deleted file mode 100644 index 032a64d91c..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTOPDIFF8TEVTTRAP_NUM.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMSTOPDIFF8TEVTTRAP -Author: Emanuele Nocera emanuele.nocera@physics.ox.ac.uk -Date: 02/2016 -CodesUsed: Predictions provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4 [HT = sqrt(mt^2+pTt^2)+sqrt(mt^2+pTT^2), mt=173.3 GeV], as(MZ) = 0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07209 0.00000 -1.06631 0.00000 -1.06544 0.00000 -1.06473 0.00000 -1.06466 0.00000 -1.06466 0.00000 -1.06473 0.00000 -1.06544 0.00000 -1.06631 0.00000 -1.07209 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTTBARTOT.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTTBARTOT.dat deleted file mode 100644 index 72c487038e..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTTBARTOT.dat +++ /dev/null @@ -1,12 +0,0 @@ -******************************************************************************** -SetName: CMSTTBARTOT -Author: Emanuele R. Nocera emanuele.nocera@physics.ox.ac.uk -Date: June 2016 -CodesUsed: top++ v2.0 -TheoryInput: NNPDF3.0 with alphas(MZ)=0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: NNLO theory (no NNLL effects) -******************************************************************************** -1.0660 0.0000 -1.0671 0.0000 -1.0703 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTTBARTOT13TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTTBARTOT13TEV.dat deleted file mode 100644 index 8e95838431..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTTBARTOT13TEV.dat +++ /dev/null @@ -1,10 +0,0 @@ -******************************************************************************** -SetName: CMSSTTBARTOT13TEV -Author: Emanuele R. Nocera emanuele.nocera@physics.ox.ac.uk -Date: June 2016 -CodesUsed: top++ v2.0 -TheoryInput: NNPDF3.0 with alphas(MZ)=0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: NNLO theory (no NNLL effects) -******************************************************************************** -1.0703 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTTBARTOT5TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTTBARTOT5TEV.dat deleted file mode 100644 index d8b6a35ee8..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTTBARTOT5TEV.dat +++ /dev/null @@ -1,10 +0,0 @@ -******************************************************************************** -SetName: CMSTTBARTOT5TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2020 -CodesUsed: top++ v2.0 -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: NNLO theory (no NNLL effects) -******************************************************************************** -1.1270 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTTBARTOT7TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTTBARTOT7TEV.dat deleted file mode 100644 index cf09e2ec6f..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTTBARTOT7TEV.dat +++ /dev/null @@ -1,10 +0,0 @@ -******************************************************************************** -SetName: CMSTTBARTOT7TEV -Author: Emanuele R. Nocera emanuele.nocera@physics.ox.ac.uk -Date: June 2016 -CodesUsed: top++ v2.0 -TheoryInput: NNPDF3.0 with alphas(MZ)=0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: NNLO theory (no NNLL effects) -******************************************************************************** -1.0660 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTTBARTOT8TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTTBARTOT8TEV.dat deleted file mode 100644 index b36fef10c8..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSTTBARTOT8TEV.dat +++ /dev/null @@ -1,10 +0,0 @@ -******************************************************************************** -SetName: CMSTTBARTOT8TEV -Author: Emanuele R. Nocera emanuele.nocera@physics.ox.ac.uk -Date: June 2016 -CodesUsed: top++ v2.0 -TheoryInput: NNPDF3.0 with alphas(MZ)=0.118 -PDFset: NNPDF30_nnlo_as_0118 -Warnings: NNLO theory (no NNLL effects) -******************************************************************************** -1.0671 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSWEASY840PB_WM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSWEASY840PB_WM.dat deleted file mode 100644 index 111df25762..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSWEASY840PB_WM.dat +++ /dev/null @@ -1,20 +0,0 @@ -******************************************************************************************* -SetName: CMSWEASY840PB_WM -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: Early 2012 -CodesUsed: FEWZ -TheoryInput: NNPDF2.1 NNLO alphas(MZ)=0.119 -> CONVERTED TO 0.118 -PDFset: NNPDF21_nnlo_as_0119 -Warnings: C-factors smeared to reduce stat fluctuations -******************************************************************************************** -1.02239 0.00000 -1.02431 0.00000 -1.02493 0.00000 -1.02481 0.00000 -1.02441 0.00000 -1.02407 0.00000 -1.02405 0.00000 -1.02551 0.00000 -1.02702 0.00000 -1.02891 0.00000 -1.03095 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSWEASY840PB_WP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSWEASY840PB_WP.dat deleted file mode 100644 index d23b1d5878..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSWEASY840PB_WP.dat +++ /dev/null @@ -1,20 +0,0 @@ -******************************************************************************************* -SetName: CMSWEASY840PB_WP -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: Early 2012 -CodesUsed: FEWZ -TheoryInput: NNPDF2.1 NNLO alphas(MZ)=0.119 -> CONVERTED TO 0.118 -PDFset: NNPDF21_nnlo_as_0119 -Warnings: C-factors smeared to reduce stat fluctuations -******************************************************************************************** -1.02094 0.00000 -1.02381 0.00000 -1.0245 0.00000 -1.02423 0.00000 -1.02382 0.00000 -1.02375 0.00000 -1.02413 0.00000 -1.02494 0.00000 -1.02382 0.00000 -1.02003 0.00000 -1.01191 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSWMASY47FB_WM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSWMASY47FB_WM.dat deleted file mode 100644 index c2dc4afa3d..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSWMASY47FB_WM.dat +++ /dev/null @@ -1,20 +0,0 @@ -******************************************************************************************* -SetName: CMSWMASY47FB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: 2014 -CodesUsed: FEWZ -TheoryInput: NNPDF2.3 NLO, alphas(MZ)=0.119 -> CONVERTED TO 0.118 -PDFset: NNPDF23_nlo_as_0119 -Warnings: -******************************************************************************************** -1.02067 0.00000 -1.00308 0.00000 -0.995859 0.00000 -0.99492 0.00000 -0.997026 0.00000 -0.999747 0.00000 -1.00147 0.00000 -1.00139 0.00000 -0.999015 0.00000 -0.994874 0.00000 -0.991955 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSWMASY47FB_WP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSWMASY47FB_WP.dat deleted file mode 100644 index d313154f42..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSWMASY47FB_WP.dat +++ /dev/null @@ -1,20 +0,0 @@ -******************************************************************************************* -SetName: CMSWMASY47FB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: 2014 -CodesUsed: FEWZ -TheoryInput: NNPDF2.3 NLO, alphas(MZ)=0.119 -> CONVERTED TO 0.118 -PDFset: NNPDF23_nlo_as_0119 -Warnings: -******************************************************************************************** -1.02067 0.00000 -1.00308 0.00000 -0.995859 0.00000 -0.99492 0.00000 -0.997026 0.00000 -0.999747 0.00000 -1.00147 0.00000 -1.00139 0.00000 -0.999015 0.00000 -0.994874 0.00000 -0.991955 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSWMU8TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSWMU8TEV.dat deleted file mode 100644 index 7c70c40856..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSWMU8TEV.dat +++ /dev/null @@ -1,31 +0,0 @@ -******************************************************************************** -SetName: CMSWMU8TEV -Author: Alberto Guffanti -Date: 2016-09-26 -CodesUsed: -TheoryInput: -PDFset: -Warnings: Obtained from XFitter -******************************************************************************** -1.002 0.00000 -1.003 0.00000 -1.004 0.00000 -1.003 0.00000 -1.001 0.00000 -1.004 0.00000 -1.000 0.00000 -1.000 0.00000 -1.000 0.00000 -1.000 0.00000 -0.998 0.00000 -0.998 0.00000 -0.998 0.00000 -1.000 0.00000 -1.000 0.00000 -1.001 0.00000 -0.999 0.00000 -0.999 0.00000 -1.002 0.00000 -1.002 0.00000 -1.001 0.00000 -1.004 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSZDIFF12.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSZDIFF12.dat deleted file mode 100644 index 9deacb508c..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMSZDIFF12.dat +++ /dev/null @@ -1,59 +0,0 @@ -******************************************************************************************* -SetName: CMSZDIFF12 -Author: Frank Petriello & Raja Boughezai -Date: Fina numbers sent on 16/12/2016 -CodesUsed: their own code -TheoryInput: NNPDF3.1, alphas(MZ)=0.118 -PDFset: -Warnings: -******************************************************************************************** -1.0000000e+00 2.5000000e-03 -1.0350000e+00 2.5900000e-03 -1.0570000e+00 2.6400000e-03 -1.0640000e+00 2.6625000e-03 -1.0720000e+00 2.6850000e-03 -1.0640000e+00 2.6525000e-03 -1.0570000e+00 2.6550000e-03 -1.0770000e+00 2.6250000e-03 -1.0750000e+00 2.7375000e-03 -1.0790000e+00 2.7125000e-03 -1.0000000e+00 2.5000000e-03 -1.0360000e+00 2.5900000e-03 -1.0620000e+00 2.6550000e-03 -1.0640000e+00 2.6700000e-03 -1.0560000e+00 2.6450000e-03 -1.0730000e+00 2.6775000e-03 -1.0730000e+00 2.6875000e-03 -1.0620000e+00 2.6550000e-03 -1.0720000e+00 2.6825000e-03 -1.0580000e+00 2.6375000e-03 -1.0000000e+00 2.5000000e-03 -1.0380000e+00 2.5950000e-03 -1.0580000e+00 2.6450000e-03 -1.0650000e+00 2.6450000e-03 -1.0740000e+00 2.6800000e-03 -1.0690000e+00 2.6775000e-03 -1.0680000e+00 2.6675000e-03 -1.0800000e+00 2.7000000e-03 -1.0800000e+00 2.7000000e-03 -1.0690000e+00 2.6800000e-03 -1.0000000e+00 2.5000000e-03 -1.0420000e+00 2.6025000e-03 -1.0620000e+00 2.6525000e-03 -1.0710000e+00 2.6825000e-03 -1.0700000e+00 2.6800000e-03 -1.0750000e+00 2.6725000e-03 -1.0880000e+00 2.7150000e-03 -1.0850000e+00 2.7300000e-03 -1.0720000e+00 2.7250000e-03 -1.0640000e+00 2.6500000e-03 -1.0000000e+00 2.5000000e-03 -1.0460000e+00 2.6150000e-03 -1.0620000e+00 2.6550000e-03 -1.0700000e+00 2.6750000e-03 -1.0720000e+00 2.6775000e-03 -1.0710000e+00 2.6775000e-03 -1.0840000e+00 2.7100000e-03 -1.0820000e+00 2.7050000e-03 -1.0450000e+00 2.6125000e-03 -1.1020000e+00 2.7550000e-03 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_1JET_8TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_1JET_8TEV.dat deleted file mode 100644 index 00152a52ff..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_1JET_8TEV.dat +++ /dev/null @@ -1,248 +0,0 @@ -******************************************************************************** -SetName: CMS_1JET_8TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: Sep 2019 -CodesUsed: K-factors provided by J. Pires et al. -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.12412 0.05161 -1.11153 0.04154 -1.01787 0.03913 -1.09082 0.03071 -1.04882 0.02678 -1.04709 0.02639 -1.02739 0.02221 -1.08078 0.01964 -1.03650 0.01582 -1.05675 0.01479 -1.07901 0.01197 -1.05692 0.00917 -1.05392 0.00822 -1.07217 0.00789 -1.06106 0.00807 -1.07250 0.00748 -1.08623 0.00713 -1.07775 0.00714 -1.06499 0.00667 -1.08394 0.00638 -1.07552 0.00614 -1.08560 0.00615 -1.07720 0.00596 -1.07520 0.00579 -1.08945 0.00541 -1.08354 0.00526 -1.09680 0.00538 -1.08904 0.00514 -1.10198 0.00515 -1.09686 0.00510 -1.09621 0.00485 -1.09844 0.00486 -1.11210 0.00489 -1.10951 0.00481 -1.12189 0.00473 -1.11540 0.00461 -1.12981 0.00452 -1.12337 0.00472 -1.13546 0.00456 -1.13697 0.00439 -1.14943 0.00433 -1.15960 0.00447 -1.16246 0.00470 -1.18183 0.00298 -1.20164 0.00283 -1.24478 0.00422 -1.05509 0.05634 -1.07406 0.04373 -1.01553 0.04130 -1.03934 0.03255 -1.08997 0.02778 -1.06634 0.02824 -1.04335 0.02391 -1.07800 0.02050 -1.05517 0.01674 -1.06773 0.01652 -1.05003 0.01310 -1.07361 0.01051 -1.06643 0.00953 -1.06513 0.00878 -1.07779 0.00863 -1.06168 0.00818 -1.06624 0.00739 -1.07441 0.00747 -1.07193 0.00713 -1.07812 0.00680 -1.07919 0.00662 -1.08652 0.00654 -1.08746 0.00628 -1.08247 0.00599 -1.09058 0.00559 -1.08957 0.00553 -1.09772 0.00551 -1.10416 0.00548 -1.08999 0.00551 -1.10596 0.00534 -1.09715 0.00511 -1.11116 0.00528 -1.10450 0.00526 -1.11153 0.00515 -1.10737 0.00513 -1.11711 0.00525 -1.12633 0.00515 -1.11250 0.00516 -1.13020 0.00498 -1.14015 0.00531 -1.12880 0.00559 -1.14905 0.00571 -1.14837 0.00662 -1.16187 0.00429 -1.18315 0.00498 -1.21699 0.00812 -1.13876 0.05950 -1.06471 0.04530 -1.04295 0.04232 -1.03869 0.03461 -1.07045 0.02960 -1.06101 0.02905 -1.08679 0.02384 -1.06677 0.02092 -1.07563 0.01731 -1.07446 0.01626 -1.03758 0.01390 -1.08171 0.01116 -1.06312 0.00973 -1.06111 0.00935 -1.06995 0.00899 -1.07190 0.00805 -1.08631 0.00775 -1.06584 0.00744 -1.08985 0.00728 -1.08405 0.00712 -1.08347 0.00644 -1.09185 0.00615 -1.08501 0.00621 -1.08348 0.00620 -1.09505 0.00585 -1.08813 0.00598 -1.09348 0.00607 -1.09103 0.00575 -1.08630 0.00576 -1.10107 0.00596 -1.09591 0.00567 -1.09558 0.00588 -1.10643 0.00597 -1.10383 0.00600 -1.10647 0.00640 -1.09132 0.00679 -1.11082 0.00705 -1.09812 0.00760 -1.11558 0.00831 -1.10474 0.01102 -1.11024 0.01007 -1.10984 0.01192 -1.14353 0.01399 -1.13331 0.01433 -1.15900 0.02216 -1.05638 0.05833 -1.06591 0.04600 -0.99256 0.04627 -1.02924 0.03585 -1.04653 0.03000 -1.11799 0.02875 -1.02607 0.02475 -1.04027 0.02178 -1.05580 0.01774 -1.04785 0.01735 -1.07330 0.01438 -1.07155 0.01136 -1.07786 0.01012 -1.06226 0.01175 -1.06547 0.00892 -1.06332 0.00882 -1.07902 0.00812 -1.06351 0.00792 -1.07496 0.00769 -1.08169 0.00759 -1.08563 0.00708 -1.08165 0.00718 -1.07776 0.00702 -1.09409 0.00675 -1.07110 0.00655 -1.08707 0.00701 -1.09052 0.00726 -1.06797 0.00724 -1.08357 0.00767 -1.06958 0.00823 -1.08544 0.00847 -1.07545 0.00907 -1.09124 0.01006 -1.07267 0.01143 -1.07474 0.01255 -1.08584 0.01465 -1.08534 0.01813 -1.06610 0.02426 -1.06622 0.03590 -1.10052 0.05515 -1.06779 0.06639 -1.05255 0.06031 -1.03538 0.04868 -1.08507 0.04513 -0.99946 0.03761 -1.09268 0.03079 -1.03924 0.02929 -1.05683 0.02576 -1.10220 0.02330 -1.05457 0.01793 -1.03265 0.01837 -1.06537 0.01469 -1.06343 0.01171 -1.05985 0.01045 -1.08164 0.01004 -1.06432 0.00950 -1.07564 0.00949 -1.06709 0.00925 -1.07684 0.00921 -1.07294 0.00901 -1.06341 0.00904 -1.08154 0.00873 -1.07085 0.00920 -1.08156 0.00988 -1.06139 0.01045 -1.08975 0.01092 -1.06254 0.01202 -1.05381 0.01338 -1.06117 0.01502 -1.05625 0.01733 -1.04377 0.01916 -1.03809 0.02623 -1.06611 0.03691 -1.05577 0.06387 -1.05318 0.07875 -1.03335 0.06613 -1.00894 0.04971 -1.08738 0.04893 -1.05292 0.03811 -1.06700 0.03262 -1.05681 0.03320 -1.10301 0.02759 -1.05718 0.02448 -1.06902 0.02063 -1.08434 0.01940 -1.09982 0.01546 -1.06084 0.01295 -1.07073 0.01190 -1.06068 0.01191 -1.05554 0.01223 -1.07466 0.01238 -1.05881 0.01249 -1.05743 0.01291 -1.06594 0.01351 -1.06633 0.01578 -1.03020 0.01655 -1.04951 0.01895 -1.01810 0.02129 -1.02244 0.02610 -1.03598 0.03635 -1.01242 0.04593 -0.98181 0.08009 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_2JET_3D_8TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_2JET_3D_8TEV.dat deleted file mode 100644 index 686aa59e4a..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_2JET_3D_8TEV.dat +++ /dev/null @@ -1,131 +0,0 @@ -******************************************************************************** -SetName: CMS_2JET_3D_8TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: Sep 2019 -CodesUsed: K-factors provided by J. Pires et al. -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.02755 0.00676 -1.03725 0.00628 -1.04112 0.00591 -1.02508 0.00563 -1.05073 0.00552 -1.04289 0.00523 -1.04441 0.00513 -1.04744 0.00487 -1.05113 0.00471 -1.04678 0.00454 -1.05379 0.00444 -1.05178 0.00432 -1.06175 0.00433 -1.06969 0.00422 -1.06141 0.00410 -1.06934 0.00404 -1.06267 0.00412 -1.07579 0.00407 -1.07812 0.00415 -1.07352 0.00423 -1.08303 0.00437 -1.09233 0.00439 -1.08062 0.00478 -1.09266 0.00455 -1.11017 0.00487 -1.10989 0.00507 -1.11625 0.00534 -1.12343 0.00576 -1.12705 0.00629 -1.14593 0.00664 -1.14829 0.00491 -1.07929 0.00836 -1.09703 0.00825 -1.10074 0.00817 -1.09490 0.00777 -1.10873 0.00784 -1.09468 0.00727 -1.10280 0.00736 -1.09839 0.00739 -1.10509 0.00748 -1.11613 0.00781 -1.11231 0.00793 -1.10154 0.00807 -1.10892 0.00822 -1.12308 0.00860 -1.09513 0.00890 -1.11466 0.00947 -1.10938 0.01023 -1.11657 0.01051 -1.11237 0.01120 -1.14996 0.01263 -1.12835 0.01375 -1.14448 0.01469 -1.11216 0.01616 -1.12294 0.02165 -1.17928 0.02480 -1.22892 0.02094 -1.28087 0.02257 -1.22631 0.02547 -1.22228 0.02580 -1.22457 0.02634 -1.22856 0.02823 -1.27328 0.02878 -1.25154 0.03168 -1.24309 0.03437 -1.30697 0.03883 -1.26153 0.04363 -1.27153 0.05633 -1.21984 0.07473 -1.44749 0.08597 -1.41454 0.09638 -1.02733 0.00804 -1.02888 0.00752 -1.02760 0.00783 -1.03316 0.00708 -1.04161 0.00718 -1.04269 0.00706 -1.04235 0.00702 -1.04766 0.00696 -1.03846 0.00683 -1.05579 0.00697 -1.04317 0.00709 -1.06474 0.00697 -1.03946 0.00748 -1.07777 0.00813 -1.06437 0.00831 -1.06881 0.00883 -1.06671 0.00977 -1.08534 0.01067 -1.07288 0.01351 -1.09123 0.01322 -1.08843 0.01371 -1.11480 0.01586 -1.11426 0.02127 -1.09669 0.01270 -1.07132 0.01380 -1.09946 0.01265 -1.06982 0.01439 -1.11808 0.01320 -1.09394 0.01332 -1.12498 0.01377 -1.10811 0.01446 -1.12188 0.01827 -1.10960 0.02062 -1.10472 0.01999 -1.16519 0.02100 -1.21211 0.02402 -1.12331 0.03710 -1.17075 0.03198 -1.20832 0.03684 -1.20353 0.04304 -1.05793 0.01622 -1.04359 0.01654 -1.01847 0.01771 -1.07982 0.01879 -1.05332 0.01774 -1.07066 0.01985 -1.06866 0.02202 -1.03558 0.02370 -1.07246 0.02479 -1.06257 0.03422 -1.08971 0.03483 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_2JET_5TEV_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_2JET_5TEV_DEN.dat deleted file mode 100644 index bd1114216e..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_2JET_5TEV_DEN.dat +++ /dev/null @@ -1,94 +0,0 @@ -******************************************************************************** -SetName: CMS_2JET_5TEV_tot -Author: Emanuele R. Nocera enocera@ed.ac.uk -Date: Dec 2020 -CodesUsed: K-factors provided by J. Pires et al. -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -0.82877 0.00000 -0.82877 0.00000 -0.82877 0.00000 -0.82877 0.00000 -0.82877 0.00000 -0.82877 0.00000 -0.82877 0.00000 -0.82877 0.00000 -0.82877 0.00000 -0.82877 0.00000 -0.82877 0.00000 -0.82877 0.00000 -0.82877 0.00000 -0.82877 0.00000 -0.82877 0.00000 -0.82877 0.00000 -0.82877 0.00000 -0.82877 0.00000 -0.86213 0.00000 -0.86213 0.00000 -0.86213 0.00000 -0.86213 0.00000 -0.86213 0.00000 -0.86213 0.00000 -0.86213 0.00000 -0.86213 0.00000 -0.86213 0.00000 -0.86213 0.00000 -0.86213 0.00000 -0.86213 0.00000 -0.86213 0.00000 -0.86213 0.00000 -0.86213 0.00000 -0.86213 0.00000 -0.86213 0.00000 -0.88262 0.00000 -0.88262 0.00000 -0.88262 0.00000 -0.88262 0.00000 -0.88262 0.00000 -0.88262 0.00000 -0.88262 0.00000 -0.88262 0.00000 -0.88262 0.00000 -0.88262 0.00000 -0.88262 0.00000 -0.88262 0.00000 -0.88262 0.00000 -0.88262 0.00000 -0.88262 0.00000 -0.88262 0.00000 -0.88262 0.00000 -0.89203 0.00000 -0.89203 0.00000 -0.89203 0.00000 -0.89203 0.00000 -0.89203 0.00000 -0.89203 0.00000 -0.89203 0.00000 -0.89203 0.00000 -0.89203 0.00000 -0.89203 0.00000 -0.89203 0.00000 -0.89203 0.00000 -0.89203 0.00000 -0.89203 0.00000 -0.89203 0.00000 -0.89203 0.00000 -0.89203 0.00000 -0.90705 0.00000 -0.90705 0.00000 -0.90705 0.00000 -0.90705 0.00000 -0.90705 0.00000 -0.90705 0.00000 -0.90705 0.00000 -0.90705 0.00000 -0.90705 0.00000 -0.90705 0.00000 -0.90705 0.00000 -0.90705 0.00000 -0.90705 0.00000 -0.90705 0.00000 -0.90705 0.00000 -0.90705 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_2JET_5TEV_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_2JET_5TEV_NUM.dat deleted file mode 100644 index 5db30bc716..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_2JET_5TEV_NUM.dat +++ /dev/null @@ -1,94 +0,0 @@ -******************************************************************************** -SetName: CMS_2JET_5TEV -Author: Emanuele R. Nocera enocera@ed.ac.uk -Date: Dec 2020 -CodesUsed: K-factors provided by J. Pires et al. -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.27675 0.00000 -0.90158 0.00000 -0.80649 0.00000 -0.80763 0.00000 -0.79409 0.00000 -0.80365 0.00000 -0.83286 0.00000 -0.81951 0.00000 -0.83857 0.00000 -0.81340 0.00000 -0.84213 0.00000 -0.83070 0.00000 -0.84786 0.00000 -0.81874 0.00000 -0.81108 0.00000 -0.80833 0.00000 -0.82158 0.00000 -1.13138 0.00000 -0.87129 0.00000 -0.75696 0.00000 -0.82912 0.00000 -0.81033 0.00000 -0.84784 0.00000 -0.84489 0.00000 -0.87317 0.00000 -0.87075 0.00000 -0.86076 0.00000 -0.88101 0.00000 -0.87020 0.00000 -0.87079 0.00000 -0.85668 0.00000 -0.84367 0.00000 -0.81961 0.00000 -0.85488 0.00000 -0.93766 0.00000 -0.85667 0.00000 -0.85589 0.00000 -0.82224 0.00000 -0.83562 0.00000 -0.85518 0.00000 -0.87392 0.00000 -0.88484 0.00000 -0.88896 0.00000 -0.89210 0.00000 -0.89594 0.00000 -0.87820 0.00000 -0.88305 0.00000 -0.87777 0.00000 -0.84909 0.00000 -0.83727 0.00000 -0.84200 0.00000 -1.01499 0.00000 -1.03938 0.00000 -0.91242 0.00000 -0.79415 0.00000 -0.82402 0.00000 -0.88280 0.00000 -0.89833 0.00000 -0.88905 0.00000 -0.87753 0.00000 -0.89868 0.00000 -0.90512 0.00000 -0.89724 0.00000 -0.88487 0.00000 -0.90357 0.00000 -0.87796 0.00000 -0.85734 0.00000 -0.83347 0.00000 -1.12029 0.00000 -0.92459 0.00000 -0.80350 0.00000 -0.80788 0.00000 -0.85394 0.00000 -0.88008 0.00000 -0.90008 0.00000 -0.92020 0.00000 -0.91594 0.00000 -0.91615 0.00000 -0.91349 0.00000 -0.91293 0.00000 -0.89832 0.00000 -0.88699 0.00000 -0.88486 0.00000 -0.82733 0.00000 -0.91538 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_2JET_7TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_2JET_7TEV.dat deleted file mode 100644 index 1a4580d699..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_2JET_7TEV.dat +++ /dev/null @@ -1,63 +0,0 @@ -******************************************************************************** -SetName: CMS_2JET_7TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: Sep 2019 -CodesUsed: K-factors provided by J. Pires et al. -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.01016 0.01458 -1.02547 0.01261 -1.03849 0.01043 -1.05613 0.00899 -1.06264 0.00855 -1.06147 0.00826 -1.08983 0.00809 -1.09323 0.00841 -1.10946 0.00953 -1.14403 0.01415 -1.17586 0.01454 -1.20548 0.02254 -1.25703 0.01826 -1.03504 0.00983 -1.04106 0.00814 -1.05051 0.00714 -1.05642 0.00626 -1.06348 0.00592 -1.07745 0.00574 -1.09062 0.00586 -1.10316 0.00637 -1.12174 0.00787 -1.13856 0.00974 -1.17582 0.01471 -1.20043 0.01627 -1.06362 0.00851 -1.07889 0.00734 -1.07707 0.00667 -1.09454 0.00625 -1.10269 0.00669 -1.11025 0.00646 -1.11622 0.00683 -1.12189 0.00849 -1.15195 0.01061 -1.19305 0.01401 -1.24000 0.01541 -1.10707 0.01079 -1.11747 0.01001 -1.10955 0.00973 -1.13133 0.00891 -1.13816 0.00867 -1.13199 0.00926 -1.16650 0.01024 -1.14756 0.01229 -1.17763 0.01842 -1.19140 0.01874 -1.16038 0.01317 -1.18093 0.01337 -1.16095 0.01296 -1.15497 0.01912 -1.21424 0.01449 -1.19922 0.01760 -1.23579 0.02007 -1.18823 0.02532 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_SINGLETOP_TCH_R_13TEV_T.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_SINGLETOP_TCH_R_13TEV_T.dat deleted file mode 100644 index ee5d02630b..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_SINGLETOP_TCH_R_13TEV_T.dat +++ /dev/null @@ -1,10 +0,0 @@ -******************************************************************************** -SetName: ATLAS_SINGLETOP_TCH_R_13TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9725 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_SINGLETOP_TCH_R_13TEV_TB.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_SINGLETOP_TCH_R_13TEV_TB.dat deleted file mode 100644 index 77a4832aea..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_SINGLETOP_TCH_R_13TEV_TB.dat +++ /dev/null @@ -1,10 +0,0 @@ -******************************************************************************** -SetName: CMS_SINGLETOP_TCH_R_13TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9696 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_SINGLETOP_TCH_R_7TEV_T.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_SINGLETOP_TCH_R_7TEV_T.dat deleted file mode 100644 index 11bc33c3fa..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_SINGLETOP_TCH_R_7TEV_T.dat +++ /dev/null @@ -1,10 +0,0 @@ -******************************************************************************** -SetName: CMS_SINGLETOP_TCH_TOT_7TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9755 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_SINGLETOP_TCH_R_7TEV_TB.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_SINGLETOP_TCH_R_7TEV_TB.dat deleted file mode 100644 index 784b24a7a2..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_SINGLETOP_TCH_R_7TEV_TB.dat +++ /dev/null @@ -1,10 +0,0 @@ -******************************************************************************** -SetName: CMS_SINGLETOP_TCH_TOT_7TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9732 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_SINGLETOP_TCH_R_8TEV_T.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_SINGLETOP_TCH_R_8TEV_T.dat deleted file mode 100644 index 0bd574bc4d..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_SINGLETOP_TCH_R_8TEV_T.dat +++ /dev/null @@ -1,10 +0,0 @@ -******************************************************************************** -SetName: CMS_SINGLETOP_TCH_R_8TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9748 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_SINGLETOP_TCH_R_8TEV_TB.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_SINGLETOP_TCH_R_8TEV_TB.dat deleted file mode 100644 index 4ff0b552d7..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_SINGLETOP_TCH_R_8TEV_TB.dat +++ /dev/null @@ -1,10 +0,0 @@ -******************************************************************************** -SetName: CMS_SINGLETOP_TCH_R_8TEV -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: January 2019 -CodesUsed: Predictions provided by Jun Gao -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_hessian_pdfas -Warnings: -******************************************************************************** -0.9722 0.0000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM_DEN.dat deleted file mode 100644 index 20d98f7e7b..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM_DEN.dat +++ /dev/null @@ -1,25 +0,0 @@ -******************************************************************************** -SetName: CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM -Author: Emanuele Nocera enocera@nikhef.nl -Date 03/2019 -CodesUsed: top++ v2.0 -TheoryInput: Fixed muR=muF=HT/4, mt=172.5 GeV, as(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************* -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM_NUM.dat deleted file mode 100644 index 3bf2a4ef98..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM_NUM.dat +++ /dev/null @@ -1,25 +0,0 @@ -******************************************************************************** -SetName: CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM -Author: Emanuele Nocera enocera@nikhef.nl -Date 03/2019 -CodesUsed: FastNLO tables provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4, mt=173.3 GeV, as(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: must be replaced with mt=172.5 when the computation becomes available -******************************************************************************** -1.07368 0.00000 -1.07213 0.00000 -1.07366 0.00000 -1.07281 0.00000 -1.05135 0.00000 -1.05037 0.00000 -1.05318 0.00000 -1.06248 0.00000 -1.05797 0.00000 -1.06249 0.00000 -1.06712 0.00000 -1.08660 0.00000 -1.06760 0.00000 -1.07609 0.00000 -1.09017 0.00000 -1.12829 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM_DEN.dat deleted file mode 100644 index 4e0e5ccd7b..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM_DEN.dat +++ /dev/null @@ -1,25 +0,0 @@ -******************************************************************************** -SetName: CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM -Author: Emanuele Nocera enocera@nikhef.nl -Date 03/2019 -CodesUsed: top++ v2.0 -TheoryInput: Fixed muR=muF=HT/4, mt=172.5 GeV, as(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************* -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM_NUM.dat deleted file mode 100644 index 52b91e5421..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM_NUM.dat +++ /dev/null @@ -1,25 +0,0 @@ -******************************************************************************** -SetName: CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM -Author: Emanuele Nocera enocera@nikhef.nl -Date 03/2019 -CodesUsed: FastNLO tables provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4, mt=173.3 GeV, as(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: must be replaced with mt=172.5 when the computation becomes available -******************************************************************************** -1.07241 0.00000 -1.07098 0.00000 -1.07357 0.00000 -1.07555 0.00000 -1.05127 0.00000 -1.05151 0.00000 -1.05098 0.00000 -1.06173 0.00000 -1.06378 0.00000 -1.06558 0.00000 -1.07145 0.00000 -1.07440 0.00000 -1.09239 0.00000 -1.08971 0.00000 -1.09842 0.00000 -1.10497 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM_DEN.dat deleted file mode 100644 index be364c210e..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM_DEN.dat +++ /dev/null @@ -1,25 +0,0 @@ -******************************************************************************** -SetName: CMS_TTBAR_2D_DIFF_PT_TRAP_NORM -Author: Emanuele Nocera enocera@nikhef.nl -Date 03/2019 -CodesUsed: top++ v2.0 -TheoryInput: Fixed muR=muF=HT/4, mt=172.5 GeV, as(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************* -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 -1.0671 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM_NUM.dat deleted file mode 100644 index 25c171e00a..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM_NUM.dat +++ /dev/null @@ -1,25 +0,0 @@ -******************************************************************************** -SetName: CMS_TTBAR_2D_DIFF_PT_TRAP_NORM -Author: Emanuele Nocera enocera@nikhef.nl -Date 03/2019 -CodesUsed: FastNLO tables provided by Alex Mitov -TheoryInput: Fixed muR=muF=HT/4, mt=173.3 GeV, as(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: must be replaced with mt=172.5 when the computation becomes available -******************************************************************************** -1.07546 0.00000 -1.05820 0.00000 -1.04760 0.00000 -1.02503 0.00000 -1.07698 0.00000 -1.05812 0.00000 -1.04889 0.00000 -1.03040 0.00000 -1.07974 0.00000 -1.06473 0.00000 -1.05181 0.00000 -1.03496 0.00000 -1.09365 0.00000 -1.07597 0.00000 -1.07692 0.00000 -1.05449 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TPT.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TPT.dat deleted file mode 100644 index c5dee02284..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TPT.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_2L_TPT -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07547 0.00000 -1.05768 0.00000 -1.06112 0.00000 -1.05878 0.00000 -1.06630 0.00000 -1.04977 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM_DEN.dat deleted file mode 100644 index 02b95de896..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM_DEN.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM_NUM.dat deleted file mode 100644 index 40d1b8e640..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM_NUM.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07547 0.00000 -1.05768 0.00000 -1.06112 0.00000 -1.05878 0.00000 -1.06630 0.00000 -1.04977 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TRAP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TRAP.dat deleted file mode 100644 index d98e23f4a5..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TRAP.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_2L_TRAP -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07037 0.00000 -1.08169 0.00000 -1.06104 0.00000 -1.06255 0.00000 -1.06245 0.00000 -1.06245 0.00000 -1.06255 0.00000 -1.06104 0.00000 -1.08169 0.00000 -1.07037 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM_DEN.dat deleted file mode 100644 index 1472897371..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM_DEN.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM_NUM.dat deleted file mode 100644 index cec9ff5d7b..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM_NUM.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07037 0.00000 -1.08169 0.00000 -1.06104 0.00000 -1.06255 0.00000 -1.06245 0.00000 -1.06245 0.00000 -1.06255 0.00000 -1.06104 0.00000 -1.08169 0.00000 -1.07037 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TTM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TTM.dat deleted file mode 100644 index f5c17e8549..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TTM.dat +++ /dev/null @@ -1,16 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_2L_TTM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.09124 0.00000 -1.05225 0.00000 -1.06373 0.00000 -1.08225 0.00000 -1.09178 0.00000 -1.09284 0.00000 -1.12079 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM_DEN.dat deleted file mode 100644 index 181c31090a..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM_DEN.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM_NUM.dat deleted file mode 100644 index efb9700175..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM_NUM.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.09124 0.00000 -1.05225 0.00000 -1.06373 0.00000 -1.08225 0.00000 -1.09178 0.00000 -1.09284 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP.dat deleted file mode 100644 index 5898d525d8..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_2L_TTRAP -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06936 0.00000 -1.06976 0.00000 -1.06274 0.00000 -1.06933 0.00000 -1.06563 0.00000 -1.06563 0.00000 -1.06933 0.00000 -1.06274 0.00000 -1.06976 0.00000 -1.06936 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM_DEN.dat deleted file mode 100644 index 28541d5565..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM_DEN.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM_NUM.dat deleted file mode 100644 index 08194c4246..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM_NUM.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06936 0.00000 -1.06976 0.00000 -1.06274 0.00000 -1.06933 0.00000 -1.06563 0.00000 -1.06563 0.00000 -1.06933 0.00000 -1.06274 0.00000 -1.06976 0.00000 -1.06936 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TPT.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TPT.dat deleted file mode 100644 index 93277aabec..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TPT.dat +++ /dev/null @@ -1,21 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_LJ_TPT -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.09196 0.00000 -1.05585 0.00000 -1.06318 0.00000 -1.05934 0.00000 -1.06241 0.00000 -1.05833 0.00000 -1.05859 0.00000 -1.06186 0.00000 -1.05894 0.00000 -1.05955 0.00000 -1.05299 0.00000 -1.04304 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM_DEN.dat deleted file mode 100644 index 7c928a1518..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM_DEN.dat +++ /dev/null @@ -1,21 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM_NUM.dat deleted file mode 100644 index 6d7eb627bf..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM_NUM.dat +++ /dev/null @@ -1,21 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.09196 0.00000 -1.05585 0.00000 -1.06318 0.00000 -1.05934 0.00000 -1.06241 0.00000 -1.05833 0.00000 -1.05859 0.00000 -1.06186 0.00000 -1.05894 0.00000 -1.05955 0.00000 -1.05299 0.00000 -1.04304 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP.dat deleted file mode 100644 index 4c01500847..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP.dat +++ /dev/null @@ -1,20 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_LJ_TRAP -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.05336 0.00000 -1.06617 0.00000 -1.05997 0.00000 -1.05916 0.00000 -1.06568 0.00000 -1.06194 0.00000 -1.06569 0.00000 -1.06766 0.00000 -1.07110 0.00000 -1.07504 0.00000 -1.08735 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM_DEN.dat deleted file mode 100644 index 739373214c..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM_DEN.dat +++ /dev/null @@ -1,20 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM_NUM.dat deleted file mode 100644 index 480210e7c1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM_NUM.dat +++ /dev/null @@ -1,20 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.05336 0.00000 -1.06617 0.00000 -1.05997 0.00000 -1.05916 0.00000 -1.06568 0.00000 -1.06194 0.00000 -1.06569 0.00000 -1.06766 0.00000 -1.07110 0.00000 -1.07504 0.00000 -1.08735 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TTM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TTM.dat deleted file mode 100644 index 3792ac97bc..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TTM.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_LJ_TTM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.17311 0.00000 -1.05377 0.00000 -1.05436 0.00000 -1.06353 0.00000 -1.07315 0.00000 -1.07945 0.00000 -1.09096 0.00000 -1.09429 0.00000 -1.10873 0.00000 -1.12502 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM_DEN.dat deleted file mode 100644 index 1c02fc6cbe..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM_DEN.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM_NUM.dat deleted file mode 100644 index 3e8e8c0c9c..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM_NUM.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.17311 0.00000 -1.05377 0.00000 -1.05436 0.00000 -1.06353 0.00000 -1.07315 0.00000 -1.07945 0.00000 -1.09096 0.00000 -1.09429 0.00000 -1.10873 0.00000 -1.12502 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP.dat deleted file mode 100644 index 3a4f4645f0..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06533 0.00000 -1.06696 0.00000 -1.06234 0.00000 -1.06196 0.00000 -1.06514 0.00000 -1.06553 0.00000 -1.06765 0.00000 -1.06578 0.00000 -1.07243 0.00000 -1.07779 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM_DEN.dat deleted file mode 100644 index e6d16ba972..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM_DEN.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 -1.07030 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM_NUM.dat deleted file mode 100644 index 08813c8c57..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM_NUM.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: May 2019 -CodesUsed: Predictions from A. Mitov fastNLo tables -TheoryInput: NNPDF3.1 with alphas(MZ)=0.118 -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.06533 0.00000 -1.06696 0.00000 -1.06234 0.00000 -1.06196 0.00000 -1.06514 0.00000 -1.06553 0.00000 -1.06765 0.00000 -1.06578 0.00000 -1.07243 0.00000 -1.07779 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0WEASY_WM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0WEASY_WM.dat deleted file mode 100644 index 7a881f86d1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0WEASY_WM.dat +++ /dev/null @@ -1,22 +0,0 @@ -******************************************************************************** -SetName: D0WEASY-WM -Author: Alberto Guffanti -Date: 2016-11-14 -CodesUsed: FEWZ 3.1b2 -TheoryInput: -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.05589 0.00693648 -1.02355 0.00209489 -1.02728 0.00213559 -1.02566 0.00217674 -1.03154 0.00227474 -1.03067 0.00217300 -1.02567 0.00123098 -1.02844 0.00249864 -1.03138 0.00297710 -1.01954 0.00301960 -1.01897 0.00306955 -1.02028 0.00260621 -1.01170 0.00377109 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0WEASY_WP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0WEASY_WP.dat deleted file mode 100644 index ebb55afd6d..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0WEASY_WP.dat +++ /dev/null @@ -1,22 +0,0 @@ -******************************************************************************** -SetName: D0WEASY-WP -Author: Alberto Guffanti -Date: 2016-11-14 -CodesUsed: FEWZ 3.1b2 -TheoryInput: -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.02848 0.00585779 -1.02623 0.00207647 -1.02253 0.00204984 -1.02553 0.00203628 -1.02515 0.00204057 -1.02282 0.00192677 -1.02147 0.00102194 -1.02534 0.00211341 -1.03160 0.00257916 -1.02462 0.00293852 -1.03075 0.00339132 -1.01120 0.00311445 -0.990574 0.00508363 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0WMASY-WM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0WMASY-WM.dat deleted file mode 100644 index 9bc2b2a097..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0WMASY-WM.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: D0WMASY-WM -Author: Alberto Guffanti -Date: 2016-06-07 -CodesUsed: FEWZ 3.1b2 -TheoryInput: -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.0591946781713888 0.00000 -1.0173804421892623 0.00000 -1.018267068270173 0.00000 -1.0245842629658082 0.00000 -1.0287176556137458 0.00000 -1.0240411484292118 0.00000 -1.0214835223237941 0.00000 -1.02036786321344 0.00000 -1.028351490535428 0.00000 -1.0346130495858574 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0WMASY-WP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0WMASY-WP.dat deleted file mode 100644 index 9180fac828..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0WMASY-WP.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: D0WMASY-WP -Author: Alberto Guffanti -Date: 2016-06-07 -CodesUsed: FEWZ 3.1b2 -TheoryInput: -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.0574436482195437 0.00000 -1.0154977218085568 0.00000 -1.0116485190490272 0.00000 -1.0189417015484041 0.00000 -1.014517455998847 0.00000 -1.0064713062398585 0.00000 -1.0083876764800952 0.00000 -1.0120275991331737 0.00000 -1.0149542067612334 0.00000 -1.0294082520227628 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0WMASY_WM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0WMASY_WM.dat deleted file mode 100644 index d9e121017c..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0WMASY_WM.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: D0WMASY-WM -Author: Alberto Guffanti -Date: 2016-02-02 -CodesUsed: FEWZ 3.1b2 -TheoryInput: NNLO QCD (Input cards in external/FEWZ_3.1b2/bin/InputCards) -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.0599143963 0.00000 -1.01728880794 0.00000 -1.01560872609 0.00000 -1.02300508762 0.00000 -1.02615781463 0.00000 -1.0236627831 0.00000 -1.02957478273 0.00000 -1.02560480329 0.00000 -1.03091888753 0.00000 -1.03554224909 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0WMASY_WP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0WMASY_WP.dat deleted file mode 100644 index 2c755e9193..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0WMASY_WP.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************** -SetName: D0WMASY-WP -Author: Alberto Guffanti -Date: 2016-02-02 -CodesUsed: FEWZ 3.1b2 -TheoryInput: NNLO QCD (Input cards in external/FEWZ_3.1b2/bin/InputCards) -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.05638574531 0.00000 -1.0195280192 0.00000 -1.01070214047 0.00000 -1.01886709847 0.00000 -1.01676726283 0.00000 -1.01054455399 0.00000 -1.0113704934 0.00000 -1.01269631597 0.00000 -1.01494474926 0.00000 -1.03410062608 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0ZRAP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0ZRAP.dat deleted file mode 100644 index 5e4dcbdce6..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0ZRAP.dat +++ /dev/null @@ -1,37 +0,0 @@ -******************************************************************************************* -SetName: D0ZRAP -Author: Juan Rojo juan.rojo@physics.ox.ac.uk -Date: Early 2011 -CodesUsed: VRAP v0.9 -TheoryInput: Fixed muR and muF settings, as(MZ) = 0.119 -> CONVERTED TO 0.118 -PDFset: Preliminary version of NNPDF2.1 NNLO -Warnings: To update with recent C-factors (NNPDFres paper) with dynamical central scale -******************************************************************************************** -1.02313 0.00000 -1.02316 0.00000 -1.02322 0.00000 -1.02333 0.00000 -1.02347 0.00000 -1.02365 0.00000 -1.02383 0.00000 -1.02403 0.00000 -1.02422 0.00000 -1.02442 0.00000 -1.02458 0.00000 -1.02475 0.00000 -1.02489 0.00000 -1.02501 0.00000 -1.02512 0.00000 -1.02523 0.00000 -1.02534 0.00000 -1.02551 0.00000 -1.02574 0.00000 -1.02606 0.00000 -1.02654 0.00000 -1.02723 0.00000 -1.02823 0.00000 -1.02965 0.00000 -1.03169 0.00000 -1.03475 0.00000 -1.03947 0.00000 -1.04716 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0ZRAP_TOT.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0ZRAP_TOT.dat deleted file mode 100644 index 523ef5450f..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_D0ZRAP_TOT.dat +++ /dev/null @@ -1,37 +0,0 @@ -******************************************************************************************* -SetName: D0ZRAP_TOT -Author: Juan Rojo juan.rojo@physics.ox.ac.uk -Date: Early 2011 -CodesUsed: VRAP v0.9 -TheoryInput: Fixed muR and muF settings, as(MZ) = 0.119 -> CONVERTED TO 0.118 -PDFset: Preliminary version of NNPDF2.1 NNLO -Warnings: To update with recent C-factors (NNPDFres paper) with dynamical central scale -******************************************************************************************** -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 -1.02323 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE605.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE605.dat deleted file mode 100644 index f8707502df..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE605.dat +++ /dev/null @@ -1,128 +0,0 @@ -******************************************************************************** -SetName: DYE605 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: VRAP v0.9 (version modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll, as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -1.14539 0.00000 -1.14824 0.00000 -1.15097 0.00000 -1.15358 0.00000 -1.15637 0.00000 -1.15939 0.00000 -1.16247 0.00000 -1.16516 0.00000 -1.16776 0.00000 -1.17034 0.00000 -1.18754 0.00000 -1.18888 0.00000 -1.18988 0.00000 -1.19114 0.00000 -1.19905 0.00000 -1.22217 0.00000 -1.26253 0.00000 -1.14556 0.00000 -1.14852 0.00000 -1.15152 0.00000 -1.15442 0.00000 -1.15729 0.00000 -1.16011 0.00000 -1.16297 0.00000 -1.16577 0.00000 -1.16869 0.00000 -1.17181 0.00000 -1.19462 0.00000 -1.19649 0.00000 -1.19824 0.00000 -1.20096 0.00000 -1.20532 0.00000 -1.20487 0.00000 -1.22998 0.00000 -1.31675 0.00000 -1.14580 0.00000 -1.14852 0.00000 -1.15151 0.00000 -1.15457 0.00000 -1.15765 0.00000 -1.16071 0.00000 -1.16382 0.00000 -1.16686 0.00000 -1.17002 0.00000 -1.17293 0.00000 -1.19784 0.00000 -1.20092 0.00000 -1.20361 0.00000 -1.20975 0.00000 -1.21349 0.00000 -1.21550 0.00000 -1.21527 0.00000 -1.27783 0.00000 -1.14588 0.00000 -1.14901 0.00000 -1.15213 0.00000 -1.15507 0.00000 -1.15792 0.00000 -1.16067 0.00000 -1.16367 0.00000 -1.16690 0.00000 -1.17017 0.00000 -1.17344 0.00000 -1.19997 0.00000 -1.20169 0.00000 -1.20352 0.00000 -1.21031 0.00000 -1.22124 0.00000 -1.23246 0.00000 -1.24522 0.00000 -1.37893 0.00000 -1.14590 0.00000 -1.14895 0.00000 -1.15183 0.00000 -1.15487 0.00000 -1.15803 0.00000 -1.16137 0.00000 -1.16486 0.00000 -1.16793 0.00000 -1.17099 0.00000 -1.17417 0.00000 -1.20104 0.00000 -1.20477 0.00000 -1.20653 0.00000 -1.21194 0.00000 -1.22511 0.00000 -1.25061 0.00000 -1.31707 0.00000 -1.50606 0.00000 -1.14511 0.00000 -1.14856 0.00000 -1.15208 0.00000 -1.15526 0.00000 -1.15857 0.00000 -1.16195 0.00000 -1.16534 0.00000 -1.16879 0.00000 -1.17163 0.00000 -1.17396 0.00000 -1.20046 0.00000 -1.20387 0.00000 -1.20789 0.00000 -1.21439 0.00000 -1.23420 0.00000 -1.27386 0.00000 -1.34942 0.00000 -1.95776 0.00000 -1.16470 0.00000 -1.16851 0.00000 -1.17283 0.00000 -1.17564 0.00000 -1.20311 0.00000 -1.20492 0.00000 -1.20957 0.00000 -1.21398 0.00000 -1.22246 0.00000 -1.25040 0.00000 -1.29526 0.00000 -1.37120 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE886P.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE886P.dat deleted file mode 100644 index 9c2b9b46ca..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE886P.dat +++ /dev/null @@ -1,193 +0,0 @@ -******************************************************************************** -SetName: DYE886P -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: VRAP v0.9 (version modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -1.10578 0.00000 -1.11228 0.00000 -1.11910 0.00000 -1.12583 0.00000 -1.13148 0.00000 -1.13837 0.00000 -1.14463 0.00000 -1.15097 0.00000 -1.15856 0.00000 -1.20540 0.00000 -1.10452 0.00000 -1.11107 0.00000 -1.11776 0.00000 -1.12476 0.00000 -1.13155 0.00000 -1.13864 0.00000 -1.14508 0.00000 -1.15159 0.00000 -1.15884 0.00000 -1.20506 0.00000 -1.10189 0.00000 -1.10906 0.00000 -1.11715 0.00000 -1.12402 0.00000 -1.13100 0.00000 -1.13834 0.00000 -1.14584 0.00000 -1.15337 0.00000 -1.16013 0.00000 -1.20069 0.00000 -1.09964 0.00000 -1.10674 0.00000 -1.11528 0.00000 -1.12394 0.00000 -1.13121 0.00000 -1.13908 0.00000 -1.14704 0.00000 -1.15260 0.00000 -1.16038 0.00000 -1.20212 0.00000 -1.22497 0.00000 -1.27393 0.00000 -1.09822 0.00000 -1.10543 0.00000 -1.11445 0.00000 -1.12331 0.00000 -1.13075 0.00000 -1.13863 0.00000 -1.14792 0.00000 -1.15487 0.00000 -1.16196 0.00000 -1.21089 0.00000 -1.22652 0.00000 -1.32418 0.00000 -1.09776 0.00000 -1.10404 0.00000 -1.11341 0.00000 -1.12277 0.00000 -1.13142 0.00000 -1.14005 0.00000 -1.14796 0.00000 -1.15652 0.00000 -1.16389 0.00000 -1.22393 0.00000 -1.26833 0.00000 -1.32134 0.00000 -1.09996 0.00000 -1.10465 0.00000 -1.11343 0.00000 -1.12278 0.00000 -1.13221 0.00000 -1.14222 0.00000 -1.15252 0.00000 -1.16131 0.00000 -1.17083 0.00000 -1.24977 0.00000 -1.26677 0.00000 -1.35945 0.00000 -1.10309 0.00000 -1.10896 0.00000 -1.11663 0.00000 -1.12651 0.00000 -1.13618 0.00000 -1.14322 0.00000 -1.15558 0.00000 -1.16887 0.00000 -1.18154 0.00000 -1.24866 0.00000 -1.28633 0.00000 -1.39211 0.00000 -1.10640 0.00000 -1.11321 0.00000 -1.12183 0.00000 -1.13251 0.00000 -1.14423 0.00000 -1.15642 0.00000 -1.16911 0.00000 -1.17935 0.00000 -1.18745 0.00000 -1.25125 0.00000 -1.30904 0.00000 -1.56007 0.00000 -1.11783 0.00000 -1.12399 0.00000 -1.13110 0.00000 -1.13745 0.00000 -1.14711 0.00000 -1.15819 0.00000 -1.16910 0.00000 -1.18178 0.00000 -1.19416 0.00000 -1.29469 0.00000 -1.38620 0.00000 -1.46933 0.00000 -1.12037 0.00000 -1.12707 0.00000 -1.13565 0.00000 -1.14197 0.00000 -1.14944 0.00000 -1.16255 0.00000 -1.17665 0.00000 -1.19203 0.00000 -1.20605 0.00000 -1.34277 0.00000 -1.54473 0.00000 -0.88014 0.00000 -1.09742 0.00000 -1.12937 0.00000 -1.13883 0.00000 -1.14781 0.00000 -1.15806 0.00000 -1.16884 0.00000 -1.18286 0.00000 -1.19825 0.00000 -1.21157 0.00000 -1.22710 0.00000 -1.42759 0.00000 -1.40954 0.00000 -0.90244 0.00000 -1.14672 0.00000 -1.15412 0.00000 -1.16292 0.00000 -1.17256 0.00000 -1.18515 0.00000 -1.19982 0.00000 -1.21530 0.00000 -1.22971 0.00000 -1.24480 0.00000 -1.54632 0.00000 -0.99041 0.00000 -1.24410 0.00000 -1.16040 0.00000 -1.16810 0.00000 -1.17681 0.00000 -1.18434 0.00000 -1.19359 0.00000 -1.20314 0.00000 -1.21522 0.00000 -1.23005 0.00000 -1.25405 0.00000 -0.94090 0.00000 -1.04655 0.00000 -1.11476 0.00000 -1.17126 0.00000 -1.18033 0.00000 -1.19439 0.00000 -1.20912 0.00000 -1.22670 0.00000 -1.24640 0.00000 -1.26235 0.00000 -1.27971 0.00000 -1.26696 0.00000 -1.00082 0.00000 -1.09874 0.00000 -1.19546 0.00000 -1.18121 0.00000 -1.19908 0.00000 -1.20376 0.00000 -1.20612 0.00000 -1.22246 0.00000 -1.23958 0.00000 -1.26093 0.00000 -1.28305 0.00000 -1.35752 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE886R_D.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE886R_D.dat deleted file mode 100644 index 7e474581e6..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE886R_D.dat +++ /dev/null @@ -1,24 +0,0 @@ -******************************************************************************** -SetName: DYE886R_D -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: VRAP v0.9 (version modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll as(MZ) = 0.00000.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -1.12747 0.00000 -1.11787 0.00000 -1.12231 0.00000 -1.13128 0.00000 -1.14275 0.00000 -1.14685 0.00000 -1.15194 0.00000 -1.15613 0.00000 -1.16290 0.00000 -1.17112 0.00000 -1.18435 0.00000 -1.19797 0.00000 -1.20894 0.00000 -1.22036 0.00000 -1.22568 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE886R_P.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE886R_P.dat deleted file mode 100644 index 986b1adb61..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE886R_P.dat +++ /dev/null @@ -1,24 +0,0 @@ -******************************************************************************** -SetName: DYE886R_P -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: VRAP v0.9 (version modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -1.12364 0.00000 -1.11254 0.00000 -1.11768 0.00000 -1.12752 0.00000 -1.13981 0.00000 -1.14373 0.00000 -1.14885 0.00000 -1.15128 0.00000 -1.15669 0.00000 -1.16346 0.00000 -1.17562 0.00000 -1.18808 0.00000 -1.19738 0.00000 -1.21381 0.00000 -1.22184 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN01.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN01.dat deleted file mode 100644 index 9d933a093e..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN01.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN01 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: Vrap v0.9 (modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll,as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.31101 0.00000 -1.30802 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN02.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN02.dat deleted file mode 100644 index a69bc00581..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN02.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN02 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: Vrap v0.9 (modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll,as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -1.28511 0.00000 -1.29600 0.00000 -1.31539 0.00000 -1.31954 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN03.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN03.dat deleted file mode 100644 index 9f74bf5cd3..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN03.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN03 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: Vrap v0.9 (modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll,as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -1.28164 0.00000 -1.29710 0.00000 -1.31238 0.00000 -1.33602 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN04.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN04.dat deleted file mode 100644 index c325a47c80..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN04.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN04 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: Vrap v0.9 (modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll,as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -0.00000 0.00000 -1.27404 0.00000 -1.28892 0.00000 -1.29820 0.00000 -1.34614 0.00000 -1.33353 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN05.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN05.dat deleted file mode 100644 index 73238d9a2b..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN05.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN05 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: Vrap v0.9 (modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll,as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -0.00000 0.00000 -1.27500 0.00000 -1.30541 0.00000 -1.34282 0.00000 -1.37112 0.00000 -1.64312 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN06.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN06.dat deleted file mode 100644 index d67e7fee80..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN06.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN06 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: Vrap v0.9 (modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll,as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -1.27859 0.00000 -1.29003 0.00000 -1.32764 0.00000 -1.38494 0.00000 -1.56968 0.00000 -2.92230 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN07.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN07.dat deleted file mode 100644 index 2d3b0be53a..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN07.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN07 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: Vrap v0.9 (modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll,as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -1.28665 0.00000 -1.29974 0.00000 -1.36532 0.00000 -1.53590 0.00000 -1.87787 0.00000 -0.94396 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN08.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN08.dat deleted file mode 100644 index e5d5c5d4c0..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN08.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN08 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: Vrap v0.9 (modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll,as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -1.27800 0.00000 -1.33208 0.00000 -1.46058 0.00000 -1.62602 0.00000 -1.34927 0.00000 -1.15934 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN09.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN09.dat deleted file mode 100644 index 4b5b662fbc..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN09.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN09 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: Vrap v0.9 (modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll,as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -1.30716 0.00000 -1.40283 0.00000 -1.50307 0.00000 -2.01352 0.00000 -1.17480 0.00000 -0.87862 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN10.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN10.dat deleted file mode 100644 index 6c8f9f1782..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_D_BIN10.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_D_BIN10 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: Vrap v0.9 (modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll,as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -1.35931 0.00000 -1.44135 0.00000 -1.57149 0.00000 -0.80496 0.00000 -0.91509 0.00000 -0.91547 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN01.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN01.dat deleted file mode 100644 index 03ee0c6204..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN01.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN01 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: Vrap v0.9 (modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll,as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -0.00000 0.00000 -1.30211 0.00000 -1.26165 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN02.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN02.dat deleted file mode 100644 index f22e85f720..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN02.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN02 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: Vrap v0.9 (modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll,as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -1.30003 0.00000 -1.30717 0.00000 -1.28964 0.00000 -1.26070 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN03.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN03.dat deleted file mode 100644 index cf197ea7dc..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN03.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN03 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: Vrap v0.9 (modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll,as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -0.00000 0.00000 -0.00000 0.00000 -1.29973 0.00000 -1.31080 0.00000 -1.28362 0.00000 -1.28175 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN04.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN04.dat deleted file mode 100644 index e8815b0ec1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN04.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN04 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: Vrap v0.9 (modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll,as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -0.00000 0.00000 -1.29609 0.00000 -1.30753 0.00000 -1.31931 0.00000 -1.29975 0.00000 -1.27820 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN05.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN05.dat deleted file mode 100644 index 878bcf2fa1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN05.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN05 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: Vrap v0.9 (modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll,as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -0.00000 0.00000 -1.30003 0.00000 -1.32261 0.00000 -1.34458 0.00000 -1.31151 0.00000 -1.48173 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN06.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN06.dat deleted file mode 100644 index 728a33b5fe..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN06.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN06 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: Vrap v0.9 (modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll,as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -1.30163 0.00000 -1.31418 0.00000 -1.33994 0.00000 -1.36762 0.00000 -1.44679 0.00000 -1.57790 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN07.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN07.dat deleted file mode 100644 index 2b5a66482d..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN07.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN07 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: Vrap v0.9 (modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll,as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -1.30944 0.00000 -1.32485 0.00000 -1.37118 0.00000 -1.46570 0.00000 -1.47617 0.00000 -2.00456 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN08.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN08.dat deleted file mode 100644 index d7d0c65746..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN08.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN08 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: Vrap v0.9 (modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll,as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -1.30807 0.00000 -1.35072 0.00000 -1.44109 0.00000 -1.48139 0.00000 -1.62639 0.00000 -0.85721 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN09.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN09.dat deleted file mode 100644 index 6e5f536e55..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN09.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN09 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: Vrap v0.9 (modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll,as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -1.32799 0.00000 -1.40131 0.00000 -1.47193 0.00000 -1.55929 0.00000 -1.16640 0.00000 -0.73682 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN10.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN10.dat deleted file mode 100644 index 3b86ded7be..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_DYE906R_P_BIN10.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************** -SetName: DYE906R_P_BIN10 -Author: Emanuele R. Nocera -Date: May 2021 -CodesUsed: Vrap v0.9 (modified to handle isoscalar target) -TheoryInput: muR and muF equal to M_ll,as(MZ) = 0.118 -PDFset: NNPDF3.1 NNLO -Warnings: -******************************************************************************** -1.36573 0.00000 -1.42992 0.00000 -1.50872 0.00000 -1.55461 0.00000 -0.58867 0.00000 -0.95076 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBW36PB.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBW36PB.dat deleted file mode 100644 index 7bebbe6ddc..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBW36PB.dat +++ /dev/null @@ -1,19 +0,0 @@ -******************************************************************************************* -SetName: LHCBW36PB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: Early 2012 -CodesUsed: FEWZ (version?) -TheoryInput: NNPDF2.1 NNLO alphas(MZ)=0.119 -> CONVERTED TO 0.118 -PDFset: NNPDF21_nnlo -Warnings: -******************************************************************************************** -1.00961 0.00000 -1.00182 0.00000 -1.00464 0.00000 -1.00534 0.00000 -1.0263 0.00000 -1.00432 0.00000 -0.998015 0.00000 -0.996069 0.00000 -0.998565 0.00000 -0.966711 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBWMU1FB.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBWMU1FB.dat deleted file mode 100644 index 9a15e7726a..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBWMU1FB.dat +++ /dev/null @@ -1,25 +0,0 @@ -******************************************************************************************* -SetName: LHCBWMU1FB -Author: Alberto Guffanti -Date: 25/11/2015 -CodesUsed: FEWZ 3.1b2 -TheoryInput: Input Cards in external/FEWZ31b2/bin/InputCards -PDFset: NNPDF30_nnlo_as_0118 -Warnings: Datapoints ordering: first W+, then W- -******************************************************************************************** -0.9571 0.00000 -1.0054 0.00000 -0.9948 0.00000 -0.9980 0.00000 -0.9881 0.00000 -0.9927 0.00000 -0.9855 0.00000 -0.9767 0.00000 -0.9887 0.00000 -1.0159 0.00000 -1.0083 0.00000 -0.9990 0.00000 -0.9915 0.00000 -0.9842 0.00000 -0.9852 0.00000 -0.9662 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBWZMU7TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBWZMU7TEV.dat deleted file mode 100644 index ebe322405f..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBWZMU7TEV.dat +++ /dev/null @@ -1,42 +0,0 @@ -******************************************************************************** -SetName: LHCBWZMU7TEV-Z -Author: Alberto Guffanti -Date: 2016-06-07 -CodesUsed: FEWZ 3.1b2 -TheoryInput: -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.139636407128334 0.00000 -1.0479499027510764 0.00000 -1.001369192391491 0.00000 -1.009639379868618 0.00000 -1.005449414444484 0.00000 -1.0059939972443193 0.00000 -1.003842309195433 0.00000 -0.9949529737266062 0.00000 -0.9920742268581713 0.00000 -0.9920949663874471 0.00000 -0.980038005812567 0.00000 -0.9729205530813554 0.00000 -0.9931899484361589 0.00000 -0.9771271059335204 0.00000 -0.9885476032752017 0.00000 -0.9748929021521299 0.00000 -0.9811173687286068 0.00000 -0.9530276722063104 0.00000 -1.0079497380686808 0.00000 -0.994628692773718 0.00000 -0.9960297249245174 0.00000 -0.989732246217774 0.00000 -0.9923510473725752 0.00000 -0.9843218559215737 0.00000 -0.9770190998522019 0.00000 -0.9833746796082088 0.00000 -1.0075152964584748 0.00000 -1.013892148545224 0.00000 -0.996727676763255 0.00000 -0.9780648264341126 0.00000 -0.984325762023435 0.00000 -0.9853349294598541 0.00000 -0.9699707234227589 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBWZMU7TEV_PI.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBWZMU7TEV_PI.dat deleted file mode 100644 index 81676368ed..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBWZMU7TEV_PI.dat +++ /dev/null @@ -1,42 +0,0 @@ -******************************************************************************** -SetName: LHCBWZMU7TEV -Author: Nathan Hartland -Date: 20/10/2017 -CodesUsed: NA -TheoryInput: NA -PDFset: NA -Warnings: Obviously this is a placeholder -******************************************************************************** -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBWZMU8TEV.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBWZMU8TEV.dat deleted file mode 100644 index b66ecf744f..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBWZMU8TEV.dat +++ /dev/null @@ -1,43 +0,0 @@ -******************************************************************************** -SetName: LHCBWZMU8TEV -Author: Alberto Guffanti -Date: 2016-11-14 -CodesUsed: FEWZ 3.1b2 -TheoryInput: -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -0.982892 0.0250919 -1.02798 0.0108843 -0.978178 0.0116657 -1.01063 0.00437548 -1.01635 0.00717149 -1.0077 0.00293252 -0.999641 0.00271468 -0.996221 0.00235296 -0.989826 0.00246828 -0.987548 0.0023805 -0.985973 0.00211254 -0.976393 0.00268662 -0.984472 0.00303885 -0.984037 0.00389436 -0.985224 0.00507414 -0.983082 0.00745358 -0.970769 0.0107505 -0.997009 0.0383089 -0.99823 0.00353897 -0.999326 0.00130237 -0.99836 0.00121405 -0.995506 0.00127407 -0.996167 0.00134351 -0.998299 0.00168991 -0.986008 0.00113602 -0.968985 0.00331471 -1.00101 0.00324374 -1.00689 0.0012149 -1.00224 0.00125252 -1.00073 0.00131751 -1.00026 0.00190645 -0.993231 0.00153753 -0.987365 0.00108114 -0.966771 0.00257369 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBWZMU8TEV_PI.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBWZMU8TEV_PI.dat deleted file mode 100644 index 0391ac66a0..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBWZMU8TEV_PI.dat +++ /dev/null @@ -1,43 +0,0 @@ -******************************************************************************** -SetName: LHCBWZMU7TEV -Author: Nathan Hartland -Date: 20/10/2017 -CodesUsed: NA -TheoryInput: NA -PDFset: NA -Warnings: Obviously this is a placeholder -******************************************************************************** -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 -1 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBZ940PB.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBZ940PB.dat deleted file mode 100644 index 0eb8369767..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBZ940PB.dat +++ /dev/null @@ -1,18 +0,0 @@ -******************************************************************************************* -SetName: LHCBZ940PB -Author: Maria Ubiali ubiali@hep.phy.cam.ac.uk -Date: 2014 -CodesUsed: FEWZ -TheoryInput: NNPDF2.3 NLO, alphas(MZ)=0.119 -> CONVERTED TO 0.118 -PDFset: NNPDF23_nlo_as_0119 -Warnings: Smearing applied? Which version of FEWZ? -******************************************************************************************** -1.01185 0.00000 -1.0077 0.00000 -1.00176 0.00000 -0.994738 0.00000 -0.988029 0.00000 -0.98138 0.00000 -0.974541 0.00000 -0.970041 0.00000 -0.960565 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBZEE2FB.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBZEE2FB.dat deleted file mode 100644 index 58c03993dd..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCBZEE2FB.dat +++ /dev/null @@ -1,26 +0,0 @@ -******************************************************************************** -SetName: LHCBZEE2FB -Author: Alberto Guffanti -Date: 2015-12-22 -CodesUsed: FEWZ 3.1b2 -TheoryInput: NNLO QCD -PDFset: NNPDF30_nnlo_as_0118 -Warnings: -******************************************************************************** -1.01884410961 0.00000 -1.02724480129 0.00000 -1.00420266978 0.00000 -1.01619658869 0.00000 -1.00722055012 0.00000 -1.0046052656 0.00000 -1.00311223791 0.00000 -0.992987055248 0.00000 -0.99171093961 0.00000 -0.992575914135 0.00000 -0.980633019292 0.00000 -0.970795384472 0.00000 -0.990334990541 0.00000 -0.980931581919 0.00000 -0.985082005395 0.00000 -0.979043777407 0.00000 -0.984762908594 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCB_WENU_8TEV_R_DEN.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCB_WENU_8TEV_R_DEN.dat deleted file mode 100644 index fdd21a8ffa..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCB_WENU_8TEV_R_DEN.dat +++ /dev/null @@ -1,17 +0,0 @@ -******************************************************************************** -SetName: LHCB_WENU_8TEV_R -Author: Emanuele R. Nocera -Date: 2020-05-18 -CodesUsed: FEWZ 3.1b2 -TheoryInput: -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.00101 0.00324374 -1.00689 0.0012149 -1.00224 0.00125252 -1.00073 0.00131751 -1.00026 0.00190645 -0.993231 0.00153753 -0.987365 0.00108114 -0.966771 0.00257369 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCB_WENU_8TEV_R_NUM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCB_WENU_8TEV_R_NUM.dat deleted file mode 100644 index 618fb956b1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCB_WENU_8TEV_R_NUM.dat +++ /dev/null @@ -1,17 +0,0 @@ -******************************************************************************** -SetName: LHCB_WENU_8TEV_R -Author: Emanuele R. Nocera -Date: 2020-05-18 -CodesUsed: FEWZ 3.1b2 -TheoryInput: -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -0.99823 0.00353897 -0.999326 0.00130237 -0.99836 0.00121405 -0.995506 0.00127407 -0.996167 0.00134351 -0.998299 0.00168991 -0.986008 0.00113602 -0.968985 0.00331471 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCB_WENU_8TEV_R_WM.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCB_WENU_8TEV_R_WM.dat deleted file mode 100644 index fdd21a8ffa..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCB_WENU_8TEV_R_WM.dat +++ /dev/null @@ -1,17 +0,0 @@ -******************************************************************************** -SetName: LHCB_WENU_8TEV_R -Author: Emanuele R. Nocera -Date: 2020-05-18 -CodesUsed: FEWZ 3.1b2 -TheoryInput: -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.00101 0.00324374 -1.00689 0.0012149 -1.00224 0.00125252 -1.00073 0.00131751 -1.00026 0.00190645 -0.993231 0.00153753 -0.987365 0.00108114 -0.966771 0.00257369 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCB_WENU_8TEV_R_WP.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCB_WENU_8TEV_R_WP.dat deleted file mode 100644 index 618fb956b1..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCB_WENU_8TEV_R_WP.dat +++ /dev/null @@ -1,17 +0,0 @@ -******************************************************************************** -SetName: LHCB_WENU_8TEV_R -Author: Emanuele R. Nocera -Date: 2020-05-18 -CodesUsed: FEWZ 3.1b2 -TheoryInput: -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -0.99823 0.00353897 -0.999326 0.00130237 -0.99836 0.00121405 -0.995506 0.00127407 -0.996167 0.00134351 -0.998299 0.00168991 -0.986008 0.00113602 -0.968985 0.00331471 diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCB_Z_13TEV_DIELECTRON.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCB_Z_13TEV_DIELECTRON.dat deleted file mode 100644 index 2929e7f3d6..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCB_Z_13TEV_DIELECTRON.dat +++ /dev/null @@ -1,27 +0,0 @@ -******************************************************************************** -SetName: LHCB_Z_13TEV_DIELECTRON -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: 2018-07-03 -CodesUsed: FEWZ 3.1b2 -TheoryInput: -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.072024 0.00000 -1.005095 0.00000 -1.001927 0.00000 -1.015648 0.00000 -1.006609 0.00000 -1.009041 0.00000 -0.995915 0.00000 -0.991061 0.00000 -0.986385 0.00000 -0.987745 0.00000 -0.985566 0.00000 -0.984888 0.00000 -0.984716 0.00000 -0.993030 0.00000 -0.988924 0.00000 -0.967972 0.00000 -0.967886 0.00000 - diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCB_Z_13TEV_DIMUON.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCB_Z_13TEV_DIMUON.dat deleted file mode 100644 index a5e5ae554e..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_LHCB_Z_13TEV_DIMUON.dat +++ /dev/null @@ -1,28 +0,0 @@ -******************************************************************************** -SetName: LHCB_Z_13TEV_DIMUON -Author: Emanuele R. Nocera enocera@nikhef.nl -Date: 2018-07-03 -CodesUsed: FEWZ 3.1b2 -TheoryInput: -PDFset: NNPDF31_nnlo_as_0118 -Warnings: -******************************************************************************** -1.072024 0.00000 -1.005095 0.00000 -1.001927 0.00000 -1.015648 0.00000 -1.006609 0.00000 -1.009041 0.00000 -0.995915 0.00000 -0.991061 0.00000 -0.986385 0.00000 -0.987745 0.00000 -0.985566 0.00000 -0.984888 0.00000 -0.984716 0.00000 -0.993030 0.00000 -0.988924 0.00000 -0.967972 0.00000 -0.967886 0.00000 -0.952078 0.00000 - diff --git a/nnpdfcpp/data/NNLOCFAC/CF_QCD_TTBARTOT.dat b/nnpdfcpp/data/NNLOCFAC/CF_QCD_TTBARTOT.dat deleted file mode 100644 index d8aca764c5..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/CF_QCD_TTBARTOT.dat +++ /dev/null @@ -1,15 +0,0 @@ -******************************************************************************************* -SetName: TTBARTOT -Author: Juan Rojo juan.rojo@physics.ox.ac.uk -Date: Early 2014 -CodesUsed: top++ v2.0 -TheoryInput: NNPDF2.3 with alphas(MZ)=0.118 -PDFset: NNPDF23_nnlo_as_0118 -Warnings: NNLO theory (no NNLL effects), this dataset needs to be updated with the more recent measurements -******************************************************************************************** -1.1228 0.00000 -1.1228 0.00000 -1.1228 0.00000 -1.1228 0.00000 -1.1211 0.00000 -1.1211 0.00000 diff --git a/nnpdfcpp/data/NNLOCFAC/README b/nnpdfcpp/data/NNLOCFAC/README deleted file mode 100644 index 974e42781f..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/README +++ /dev/null @@ -1,12 +0,0 @@ -All NNLO C-factors calculated with NNPDF3.0 benchmark settings -(TheoryID 3) should be stored here in the format specified in the -document "data_layout.pdf" which can be found at /data/docs/. - -When adding a new QCD C-factor, you must add the name of the multiplying -grid, along with the setname, to the file - registeredCFactors.dat - -This file lists the C-factors to be converted when moving to a theory -with a different alpha_S value. - --nh 12/11/15 diff --git a/nnpdfcpp/data/NNLOCFAC/registeredCFactors.dat b/nnpdfcpp/data/NNLOCFAC/registeredCFactors.dat deleted file mode 100644 index 1de71a9aef..0000000000 --- a/nnpdfcpp/data/NNLOCFAC/registeredCFactors.dat +++ /dev/null @@ -1,315 +0,0 @@ -DEUT BCDMSD BCDMSD -DEUT NMCPD NMCPD -DEUT SLACD SLACD -DEU SLACD SLACD_sh -DEU BCDMSD BCDMSD_sh -DEU NMCPD_D NMCPD_sh -DEU NMCPD_P NMCPD_sh -DEU DYE886R_D DYE886R_sh -DEU DYE886R_P DYE886R_sh -NUC CHORUSNUPb CHORUSNUPb_sh -NUC CHORUSNBPb CHORUSNBPb_sh -NUC NTVNUDMNFe NTVNUDMNFe_sh -NUC NTVNBDMNFe NTVNBDMNFe_sh -NUC EMCF2C EMCF2C_sh -NUC DYE605 DYE605_sh -DEUI SLACD SLACD_sh_ite -DEUI BCDMSD BCDMSD_sh_ite -DEUI NMCPD_D NMCPD_sh_ite -DEUI NMCPD_P NMCPD_sh_ite -DEUI DYE886R_D DYE886R_sh_ite -DEUI DYE886R_P DYE886R_sh_ite -DEUI DYE906R_D_BIN01 DYE906R_BIN01 -DEUI DYE906R_D_BIN02 DYE906R_BIN02 -DEUI DYE906R_D_BIN03 DYE906R_BIN03 -DEUI DYE906R_D_BIN04 DYE906R_BIN04 -DEUI DYE906R_D_BIN05 DYE906R_BIN05 -DEUI DYE906R_D_BIN06 DYE906R_BIN06 -DEUI DYE906R_D_BIN07 DYE906R_BIN07 -DEUI DYE906R_D_BIN08 DYE906R_BIN08 -DEUI DYE906R_D_BIN09 DYE906R_BIN09 -DEUI DYE906R_D_BIN10 DYE906R_BIN10 -DEUI DYE906R_P_BIN01 DYE906R_BIN01 -DEUI DYE906R_P_BIN02 DYE906R_BIN02 -DEUI DYE906R_P_BIN03 DYE906R_BIN03 -DEUI DYE906R_P_BIN04 DYE906R_BIN04 -DEUI DYE906R_P_BIN05 DYE906R_BIN05 -DEUI DYE906R_P_BIN06 DYE906R_BIN06 -DEUI DYE906R_P_BIN07 DYE906R_BIN07 -DEUI DYE906R_P_BIN08 DYE906R_BIN08 -DEUI DYE906R_P_BIN09 DYE906R_BIN09 -DEUI DYE906R_P_BIN10 DYE906R_BIN10 -NUCI CHORUSNUPb CHORUSNUPb_sh_ite -NUCI CHORUSNBPb CHORUSNBPb_sh_ite -NUCI NTVNUDMNFe NTVNUDMNFe_sh_ite -NUCI NTVNBDMNFe NTVNBDMNFe_sh_ite -NUCI EMCF2C EMCF2C_sh_ite -NUCI DYE605 DYE605_sh_ite -ACC DYE906R_D_BIN01 DYE906R_BIN01 -ACC DYE906R_D_BIN02 DYE906R_BIN02 -ACC DYE906R_D_BIN03 DYE906R_BIN03 -ACC DYE906R_D_BIN04 DYE906R_BIN04 -ACC DYE906R_D_BIN05 DYE906R_BIN05 -ACC DYE906R_D_BIN06 DYE906R_BIN06 -ACC DYE906R_D_BIN07 DYE906R_BIN07 -ACC DYE906R_D_BIN08 DYE906R_BIN08 -ACC DYE906R_D_BIN09 DYE906R_BIN09 -ACC DYE906R_D_BIN10 DYE906R_BIN10 -ACC DYE906R_P_BIN01 DYE906R_BIN01 -ACC DYE906R_P_BIN02 DYE906R_BIN02 -ACC DYE906R_P_BIN03 DYE906R_BIN03 -ACC DYE906R_P_BIN04 DYE906R_BIN04 -ACC DYE906R_P_BIN05 DYE906R_BIN05 -ACC DYE906R_P_BIN06 DYE906R_BIN06 -ACC DYE906R_P_BIN07 DYE906R_BIN07 -ACC DYE906R_P_BIN08 DYE906R_BIN08 -ACC DYE906R_P_BIN09 DYE906R_BIN09 -ACC DYE906R_P_BIN10 DYE906R_BIN10 -MMHT CMSDY2D12 CMSDY2D12 -MAS NTVNUDMNFe NTVNUDMNFe -MAS NTVNBDMNFe NTVNBDMNFe -EWK ATLASLOMASSDY11 ATLASLOMASSDY11 -EWK ATLASLOMASSDY11EXT ATLASLOMASSDY11EXT -EWK ATLASWZRAP36PB ATLASWZRAP36PB -EWK ATLASWZTOT13TEV81PB ATLASWZTOT13TEV81PB -EWK ATLASZHIGHMASS49FB ATLASZHIGHMASS49FB -EWK ATLAS1JET11_NEW_SCALE ATLAS1JET11_NEW_SCALE -EWK ATLAS_1JET_8TEV_R04 ATLAS_1JET_8TEV_R04 -EWK ATLAS_1JET_8TEV_R06 ATLAS_1JET_8TEV_R06 -EWK ATLAS_2JET_7TEV_R04 ATLAS_2JET_7TEV_R04 -EWK ATLAS_2JET_7TEV_R06 ATLAS_2JET_7TEV_R06 -EWK ATLASPHT15 ATLASPHT15 -EWK ATLASPHT12 ATLASPHT12 -EWK CMSDY2D11 CMSDY2D11 -EWK CMSDY2D12 CMSDY2D12 -EWK LHCBWZMU7TEV LHCBWZMU7TEV -EWK LHCBWZMU8TEV LHCBWZMU8TEV -EWK LHCBZ940PB LHCBZ940PB -EWK LHCBZEE2FB LHCBZEE2FB -EWK CMSJETS11_NEW_SCALE CMSJETS11_NEW_SCALE -EWK CMS_1JET_8TEV CMS_1JET_8TEV -EWK CMS_2JET_7TEV CMS_2JET_7TEV -EWK CMS_2JET_3D_8TEV CMS_2JET_3D_8TEV -NRM ATLASWZTOT13TEV81PB ATLASWZTOT13TEV81PB -NRM ATLASZPT7TEV ATLASZPT7TEV -NRM ATLASZPT7TEV_PTZ ATLASZPT7TEV -NRM ATLASZPT7TEV_TOT ATLASZPT7TEV MZ -NRM ATLASZPT8TEVMDIST ATLASZPT8TEVMDIST -NRM ATLASZPT8TEVYDIST ATLASZPT8TEVYDIST -NRM ATLASPHT12 ATLASPHT12 -NRM CMSZDIFF12 CMSZDIFF12 -NRM LHCBWZMU7TEV LHCBWZMU7TEV -NRM LHCBWZMU8TEV LHCBWZMU8TEV -NRM LHCBWZMU7TEV_PI LHCBWZMU7TEV -NRM LHCBWZMU8TEV_PI LHCBWZMU8TEV -QCD ATLAS1JET11 ATLAS1JET11 -QCD ATLAS1JET11_SF ATLAS1JET11_SF -QCD ATLASLOMASSDY11 ATLASLOMASSDY11 -QCD ATLASLOMASSDY11EXT ATLASLOMASSDY11EXT -QCD ATLASR04JETS2P76TEV ATLASR04JETS2P76TEV -QCD ATLASR04JETS36PB ATLASR04JETS36PB -QCD ATLASR06JETS36PB ATLASR06JETS36PB -QCD ATLASTOPDIFF8TEVTPT ATLASTOPDIFF8TEVTPT -QCD ATLASTOPDIFF8TEVTRAP ATLASTOPDIFF8TEVTRAP -QCD ATLASTOPDIFF8TEVTTM ATLASTOPDIFF8TEVTTM -QCD ATLASTOPDIFF8TEVTTPT ATLASTOPDIFF8TEVTTPT -QCD ATLASTOPDIFF8TEVTTRAP ATLASTOPDIFF8TEVTTRAP -QCD ATLASTOPDIFF8TEVTPT_NUM ATLASTOPDIFF8TEVTPTNORM -QCD ATLASTOPDIFF8TEVTTPT_NUM ATLASTOPDIFF8TEVTTPTNORM -QCD ATLASTOPDIFF8TEVTRAP_NUM ATLASTOPDIFF8TEVTRAPNORM -QCD ATLASTOPDIFF8TEVTTRAP_NUM ATLASTOPDIFF8TEVTTRAPNORM -QCD ATLASTOPDIFF8TEVTTM_NUM ATLASTOPDIFF8TEVTTMNORM -QCD ATLASTOPDIFF8TEVTPT_DEN ATLASTOPDIFF8TEVTPTNORM MT -QCD ATLASTOPDIFF8TEVTTPT_DEN ATLASTOPDIFF8TEVTTPTNORM MT -QCD ATLASTOPDIFF8TEVTRAP_DEN ATLASTOPDIFF8TEVTRAPNORM MT -QCD ATLASTOPDIFF8TEVTTRAP_DEN ATLASTOPDIFF8TEVTTRAPNORM MT -QCD ATLASTOPDIFF8TEVTTM_DEN ATLASTOPDIFF8TEVTTMNORM MT -QCD ATLAS_TTB_DIFF_8TEV_LJ_TRAP ATLAS_TTB_DIFF_8TEV_LJ_TRAP -QCD ATLAS_TTB_DIFF_8TEV_LJ_TTRAP ATLAS_TTB_DIFF_8TEV_LJ_TTRAP -QCD ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_NUM ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM -QCD ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_DEN ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM -QCD ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_NUM ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM -QCD ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_DEN ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM -QCD ATLASTTBARTOT ATLASTTBARTOT -QCD ATLASTTBARTOT13TEV ATLASTTBARTOT13TEV -QCD ATLAS_TTBARTOT_13TEV_FULLLUMI ATLAS_TTBARTOT_13TEV_FULLLUMI -QCD ATLASTTBARTOT7TEV ATLASTTBARTOT7TEV -QCD ATLASTTBARTOT8TEV ATLASTTBARTOT8TEV -QCD ATLASWZRAP11 ATLASWZRAP11 -QCD ATLASWZRAP11CC ATLASWZRAP11CC -QCD ATLASWZRAP11CF ATLASWZRAP11CF -QCD ATLASWZRAP36PB ATLASWZRAP36PB -QCD ATLASWZTOT13TEV81PB ATLASWZTOT13TEV81PB -QCD ATLASZHIGHMASS49FB ATLASZHIGHMASS49FB -QCD ATLASZPT7TEV_PTZ ATLASZPT7TEV -QCD ATLASZPT7TEV_TOT ATLASZPT7TEV MZ -QCD ATLASZPT8TEVMDIST ATLASZPT8TEVMDIST -QCD ATLASZPT8TEVYDIST ATLASZPT8TEVYDIST -QCD ATLASPHT12 ATLASPHT12 -QCD ATLASPHT15 ATLASPHT15 -QCD ATLAS_TOPDIFF_DILEPT_8TEV_TTM ATLAS_TOPDIFF_DILEPT_8TEV_TTM -QCD ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP -QCD ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM_NUM ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM -QCD ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM_DEN ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM -QCD ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM_NUM ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM -QCD ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM_DEN ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM -QCD ATLAS_SINGLETOP_TCH_R_7TEV_T ATLAS_SINGLETOP_TCH_R_7TEV -QCD ATLAS_SINGLETOP_TCH_R_7TEV_TB ATLAS_SINGLETOP_TCH_R_7TEV -QCD ATLAS_SINGLETOP_TCH_R_8TEV_T ATLAS_SINGLETOP_TCH_R_8TEV -QCD ATLAS_SINGLETOP_TCH_R_8TEV_TB ATLAS_SINGLETOP_TCH_R_8TEV -QCD ATLAS_SINGLETOP_TCH_R_13TEV_T ATLAS_SINGLETOP_TCH_R_13TEV -QCD ATLAS_SINGLETOP_TCH_R_13TEV_TB ATLAS_SINGLETOP_TCH_R_13TEV -QCD ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT -QCD ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP -QCD ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT -QCD ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP -QCD ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM_NUM ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM -QCD ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM_DEN ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM -QCD ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM_NUM ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM -QCD ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM_DEN ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM -QCD ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM_NUM ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM -QCD ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM_DEN ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM -QCD ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM_NUM ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM -QCD ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM_DEN ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM -QCD ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT -QCD ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP -QCD ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT -QCD ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP -QCD ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM_NUM ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM -QCD ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM_DEN ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM -QCD ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM_NUM ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM -QCD ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM_DEN ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM -QCD ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM_NUM ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM -QCD ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM_DEN ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM -QCD ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM_NUM ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM -QCD ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM_DEN ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM -QCD ATLAS1JET11_NEW_SCALE ATLAS1JET11_NEW_SCALE -QCD ATLAS_1JET_8TEV_R04 ATLAS_1JET_8TEV_R04 -QCD ATLAS_1JET_8TEV_R06 ATLAS_1JET_8TEV_R06 -QCD ATLAS_2JET_7TEV_R04 ATLAS_2JET_7TEV_R04 -QCD ATLAS_2JET_7TEV_R06 ATLAS_2JET_7TEV_R06 -QCD ATLAS_WP_JET_8TEV_PT ATLAS_WP_JET_8TEV_PT -QCD ATLAS_WM_JET_8TEV_PT ATLAS_WM_JET_8TEV_PT -QCD ATLAS_WP_JET_8TEV_PTJ ATLAS_WP_JET_8TEV_PTJ -QCD ATLAS_WM_JET_8TEV_PTJ ATLAS_WM_JET_8TEV_PTJ -QCD ATLAS_WMU_8TEV ATLAS_WMU_8TEV -QCD ATLAS_DY_2D_8TEV_LOWMASS ATLAS_DY_2D_8TEV_LOWMASS -QCD CDFR2KT CDFR2KT -QCD CDFZRAP CDFZRAP -QCD CDFZRAP_NEW CDFZRAP_NEW -QCD CMSDY2D11 CMSDY2D11 -QCD CMSDY2D12 CMSDY2D12 -QCD CMSJETS11 CMSJETS11 -QCD CMSJETS11_SF CMSJETS11_SF -QCD CMSTTBARTOT5TEV CMSTTBARTOT5TEV -QCD CMSTOPDIFF8TEVTPT CMSTOPDIFF8TEVTPT -QCD CMSTOPDIFF8TEVTRAP CMSTOPDIFF8TEVTRAP -QCD CMSTOPDIFF8TEVTTM CMSTOPDIFF8TEVTTM -QCD CMSTOPDIFF8TEVTTPT CMSTOPDIFF8TEVTTPT -QCD CMSTOPDIFF8TEVTTRAP CMSTOPDIFF8TEVTTRAP -QCD CMSTOPDIFF8TEVTPT_NUM CMSTOPDIFF8TEVTPT -QCD CMSTOPDIFF8TEVTTPT_NUM CMSTOPDIFF8TEVTTPT -QCD CMSTOPDIFF8TEVTRAP_NUM CMSTOPDIFF8TEVTRAP -QCD CMSTOPDIFF8TEVTTRAP_NUM CMSTOPDIFF8TEVTTRAP -QCD CMSTOPDIFF8TEVTTM_NUM CMSTOPDIFF8TEVTTM -QCD CMSTOPDIFF8TEVTPT_DEN CMSTOPDIFF8TEVTPTNORM MT -QCD CMSTOPDIFF8TEVTTPT_DEN CMSTOPDIFF8TEVTTPTNORM MT -QCD CMSTOPDIFF8TEVTRAP_DEN CMSTOPDIFF8TEVTRAPNORM MT -QCD CMSTOPDIFF8TEVTTRAP_DEN CMSTOPDIFF8TEVTTRAPNORM MT -QCD CMSTOPDIFF8TEVTTM_DEN CMSTOPDIFF8TEVTTMNORM MT -QCD CMSTTBARTOT CMSTTBARTOT -QCD CMSTTBARTOT13TEV CMSTTBARTOT13TEV -QCD CMSTTBARTOT7TEV CMSTTBARTOT7TEV -QCD CMSTTBARTOT8TEV CMSTTBARTOT8TEV -QCD CMSWEASY840PB_WM CMSWEASY840PB -QCD CMSWEASY840PB_WP CMSWEASY840PB -QCD CMSWMASY47FB_WM CMSWMASY47FB -QCD CMSWMASY47FB_WP CMSWMASY47FB -QCD CMSWMU8TEV CMSWMU8TEV -QCD CMSZDIFF12 CMSZDIFF12 -QCD CMS_SINGLETOP_TCH_R_7TEV_T CMS_SINGLETOP_TCH_TOT_7TEV -QCD CMS_SINGLETOP_TCH_R_7TEV_TB CMS_SINGLETOP_TCH_TOT_7TEV -QCD CMS_SINGLETOP_TCH_R_8TEV_T CMS_SINGLETOP_TCH_R_8TEV -QCD CMS_SINGLETOP_TCH_R_8TEV_TB CMS_SINGLETOP_TCH_R_8TEV -QCD CMS_SINGLETOP_TCH_R_13TEV_T CMS_SINGLETOP_TCH_R_13TEV -QCD CMS_SINGLETOP_TCH_R_13TEV_TB CMS_SINGLETOP_TCH_R_13TEV -QCD CMS_TTB_DIFF_13TEV_2016_LJ_TPT CMS_TTB_DIFF_13TEV_2016_LJ_TPT -QCD CMS_TTB_DIFF_13TEV_2016_LJ_TRAP CMS_TTB_DIFF_13TEV_2016_LJ_TRAP -QCD CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP -QCD CMS_TTB_DIFF_13TEV_2016_LJ_TTM CMS_TTB_DIFF_13TEV_2016_LJ_TTM -QCD CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM_NUM CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM -QCD CMS_TTB_DIFF_13TEV_2016_LJ_TPPTNORM_DEN CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM -QCD CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM_NUM CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM -QCD CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM_DEN CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM -QCD CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM_NUM CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM -QCD CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM_DEN CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM -QCD CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM_NUM CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM -QCD CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM_DEN CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM -QCD CMS_TTB_DIFF_13TEV_2016_2L_TPT CMS_TTB_DIFF_13TEV_2016_2L_TPT -QCD CMS_TTB_DIFF_13TEV_2016_2L_TRAP CMS_TTB_DIFF_13TEV_2016_2L_TRAP -QCD CMS_TTB_DIFF_13TEV_2016_2L_TTRAP CMS_TTB_DIFF_13TEV_2016_2L_TTRAP -QCD CMS_TTB_DIFF_13TEV_2016_2L_TTM CMS_TTB_DIFF_13TEV_2016_2L_TTM -QCD CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM_NUM CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM -QCD CMS_TTB_DIFF_13TEV_2016_2L_TPPTNORM_DEN CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM -QCD CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM_NUM CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM -QCD CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM_DEN CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM -QCD CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM_NUM CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM -QCD CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM_DEN CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM -QCD CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM_NUM CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM -QCD CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM_DEN CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM -QCD CMS_TTBAR_2D_DIFF_PT_TRAP_NORM_NUM CMS_TTBAR_2D_DIFF_PT_TRAP_NORM -QCD CMS_TTBAR_2D_DIFF_PT_TRAP_NORM_DEN CMS_TTBAR_2D_DIFF_PT_TRAP_NORM -QCD CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM_NUM CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM -QCD CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM_DEN CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM -QCD CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM_NUM CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM -QCD CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM_DEN CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM -QCD CMSJETS11_NEW_SCALE CMSJETS11_NEW_SCALE -QCD CMS_1JET_8TEV CMS_1JET_8TEV -QCD CMS_2JET_7TEV CMS_2JET_7TEV -QCD CMS_2JET_3D_8TEV CMS_2JET_3D_8TEV -QCD CMS_2JET_5TEV_NUM CMS_2JET_5TEV -QCD CMS_2JET_5TEV_DEN CMS_2JET_5TEV -QCD D0WEASY_WM D0WEASY -QCD D0WEASY_WP D0WEASY -QCD D0WMASY_WM D0WMASY -QCD D0WMASY_WP D0WMASY -QCD D0ZRAP D0ZRAP -QCD D0ZRAP_TOT D0ZRAP MZ -QCD DYE605 DYE605 -QCD DYE886P DYE886P -QCD DYE886R_P DYE886R -QCD DYE886R_D DYE886R -QCD DYE906R_D_BIN01 DYE906R_BIN01 -QCD DYE906R_D_BIN02 DYE906R_BIN02 -QCD DYE906R_D_BIN03 DYE906R_BIN03 -QCD DYE906R_D_BIN04 DYE906R_BIN04 -QCD DYE906R_D_BIN05 DYE906R_BIN05 -QCD DYE906R_D_BIN06 DYE906R_BIN06 -QCD DYE906R_D_BIN07 DYE906R_BIN07 -QCD DYE906R_D_BIN08 DYE906R_BIN08 -QCD DYE906R_D_BIN09 DYE906R_BIN09 -QCD DYE906R_D_BIN10 DYE906R_BIN10 -QCD DYE906R_P_BIN01 DYE906R_BIN01 -QCD DYE906R_P_BIN02 DYE906R_BIN02 -QCD DYE906R_P_BIN03 DYE906R_BIN03 -QCD DYE906R_P_BIN04 DYE906R_BIN04 -QCD DYE906R_P_BIN05 DYE906R_BIN05 -QCD DYE906R_P_BIN06 DYE906R_BIN06 -QCD DYE906R_P_BIN07 DYE906R_BIN07 -QCD DYE906R_P_BIN08 DYE906R_BIN08 -QCD DYE906R_P_BIN09 DYE906R_BIN09 -QCD DYE906R_P_BIN10 DYE906R_BIN10 -QCD LHCBW36PB LHCBW36PB -QCD LHCBWMU1FB LHCBWMU1FB -QCD LHCBWZMU7TEV LHCBWZMU7TEV -QCD LHCBWZMU8TEV LHCBWZMU8TEV -QCD LHCBZ940PB LHCBZ940PB -QCD LHCBZEE2FB LHCBZEE2FB -QCD LHCB_Z_13TEV_DIMUON LHCB_Z_13TEV_DIMUON -QCD LHCB_Z_13TEV_DIELECTRON LHCB_Z_13TEV_DIELECTRON -QCD LHCB_WENU_8TEV_R_NUM LHCB_WENU_8TEV_R -QCD LHCB_WENU_8TEV_R_DEN LHCB_WENU_8TEV_R -QCD LHCB_WENU_8TEV_R_WP LHCB_WENU_8TEV_A -QCD LHCB_WENU_8TEV_R_WM LHCB_WENU_8TEV_A -QCD TTBARTOT TTBARTOT -QCDEWK ATLASDY2D8TEV ATLASDY2D8TEV diff --git a/nnpdfcpp/scripts/fiatlux.py b/nnpdfcpp/scripts/fiatlux.py deleted file mode 100755 index 459ea15dc9..0000000000 --- a/nnpdfcpp/scripts/fiatlux.py +++ /dev/null @@ -1,133 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -from __future__ import print_function -""" A postfit script which collects fiatlux replicas in a LHAPDF grid""" - -__authors__ = 'Stefano Carrazza' -__license__ = 'GPL' -__version__ = '1.0.0' -__email__ = 'stefano.carrazza@cern.ch' - -import os -import shutil -import sys -import argparse -import math -from subprocess import PIPE, Popen - - -def main(nrep, fit_filename): - - fitname = fit_filename.replace(".yml","") - dir = "../results/" + fitname + "/fiatlux/" - fitname_lux = fitname + '_fiatlux' - - shutil.rmtree(dir + fitname_lux, ignore_errors=True) - os.makedirs(dir + fitname_lux) - - # header - lhapath = Popen(["lhapdf-config","--datadir"],stdout=PIPE).communicate()[0] - lhapath = lhapath.decode() - lhapath = lhapath.replace('\n','/') - with open(lhapath + fitname + '/' + fitname + '.info', 'r') as header: - oheader = open(dir + '/' + fitname_lux + '/' + fitname_lux + '.info', 'w') - for line in header.readlines(): - if 'NumMembers' in line: - oheader.write('NumMembers: %d\n' % nrep+1) - elif 'Flavors' in line: - if not '22' in line: - oheader.write(line.replace(']', ', 22]')) - else: - oheader.write(line) - else: - oheader.write(line) - oheader.close() - - ## Preparing replicas - xpdf = [] - xgrid = [] - qgrid = [] - fgrid = [] - # copy replica files - for i in range(1,nrep+1): - replica = dir + 'replica_' + str(i) + ".dat" - shutil.copyfile(replica, dir + "/" + fitname_lux + "/" + fitname_lux + '_{:04n}.dat'.format(i)) - - print("Reading: %s" % replica) - f = open(replica, 'r') - xpdf.append([]) - for j in range(0,2): f.readline() - - s = 0 - while True: - f.readline() - xs = f.readline() - qs = f.readline() - fs = f.readline() - - nx = len(xs.split()) - nq = len(qs.split()) - nfl = len(fs.split()) - - if nx == 0: break - - xpdf[i-1].append([]) - - if i == 1: - xgrid.append(xs) - qgrid.append(qs) - fgrid.append(fs) - - for ix in range(nx): - xpdf[i-1][s].append([]) - for iq in range(nq): - xpdf[i-1][s][ix].append([]) - line = f.readline().split() - for ifl in range(nfl): - xpdf[i-1][s][ix][iq].append(float(line[ifl])) - s+=1 - f.close() - - print("Computing and priting replica 0") - f = open(dir + "/" + fitname_lux + "/" + fitname_lux + "_0000.dat", 'w') - f.write("PdfType: central\n") - f.write("Format: lhagrid1\n---\n") - - for s in range(len(qgrid)): - f.write(xgrid[s]) - f.write(qgrid[s]) - f.write(fgrid[s]) - for ix in range(len(xgrid[s].split())): - for iq in range(len(qgrid[s].split())): - f.write(" ") - for ifl in range(len(fgrid[s].split())): - sum = 0 - for irep in range(nrep): - sum += xpdf[irep][s][ix][iq][ifl] - sum /= nrep - f.write("%14.7E " % sum) - f.write("\n") - f.write("---\n") - f.close() - - print("\n- Finished see: \n%s" % dir + fitname_lux) - - print("\n- Copying grid to LHAPDF path.") - src = dir + fitname_lux - dst = lhapath + fitname_lux - try: - shutil.copytree(src,dst) - except: - print("Error: this grid already exists, please delete and run the script again") - exit(-1) - - -if __name__ == "__main__": - parser = argparse.ArgumentParser() - parser.add_argument('nrep', nargs='?', help="Number of desired replicas", type=int) - parser.add_argument('fit_filename', nargs='?', help="Fit configuration filename") - args = parser.parse_args() - if not all((args.nrep, args.fit_filename)): - parser.error("Too few arguments: nrep, fit_filename.") - mainargs = vars(args) - main(**mainargs) diff --git a/nnpdfcpp/scripts/nnfit.array.sh b/nnpdfcpp/scripts/nnfit.array.sh deleted file mode 100644 index d4533f5f6a..0000000000 --- a/nnpdfcpp/scripts/nnfit.array.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -#$ -cwd -#$ -t 1-100 -#$ -l h_rt=03:00:00 - -# Initialise the module environment -. /etc/profile.d/modules.sh - -export ROOTSYS=/exports/applications/apps/root/5.22.00/ -FILENAME=$SGE_TASK_ID".time" -/usr/bin/time -v -o $FILENAME ./nnfit $SGE_TASK_ID - diff --git a/nnpdfcpp/scripts/nnfit.condor b/nnpdfcpp/scripts/nnfit.condor deleted file mode 100755 index c8955b6553..0000000000 --- a/nnpdfcpp/scripts/nnfit.condor +++ /dev/null @@ -1,16 +0,0 @@ -rep = $(ProcId)+1 -executable = run.sh -arguments = $INT(rep) 170131-015.yml -#should_transfer_files = YES -#when_to_transfer_output = ON_EXIT -#transfer_input_files = ../data,../config -#transfer_output_files = ../results -output = logs/$(ClusterId).$(ProcId).out -error = logs/$(ClusterId).$(ProcId).err -log = logs/$(ClusterId).log -send_credential = True -notification = Error -getenv = True -+JobFlavour = "testmatch" -#+MaxRuntime = 60 -queue 160 diff --git a/nnpdfcpp/scripts/nnfit.lsf b/nnpdfcpp/scripts/nnfit.lsf deleted file mode 100644 index e2cdea37d8..0000000000 --- a/nnpdfcpp/scripts/nnfit.lsf +++ /dev/null @@ -1,13 +0,0 @@ -#BSUB -J nnfit[1-110] -#BSUB -q 1nd -#BSUB -n 1 -#BSUB -e err.err-%I -#BSUB -o out.out-%I -#BSUB -N -u stefano.carrazza@unimi.it -#BSUB -W 240 - -cd /afs/cern.ch/work/s/scarraza/nnpdfcpp/nnpdfcpp/bin -export LHAPATH=/afs/cern.ch/work/s/scarraza/lhapdf/share/lhapdf/PDFsets -export LD_LIBRARY_PATH=/afs/cern.ch/work/s/scarraza/lhapdf/lib -export OMP_NUM_THREADS=1 -./nnfit ${LSB_JOBINDEX} config.ini diff --git a/nnpdfcpp/scripts/nnfit.pbs b/nnpdfcpp/scripts/nnfit.pbs deleted file mode 100644 index 97bcfa5f60..0000000000 --- a/nnpdfcpp/scripts/nnfit.pbs +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -#PBS -N nnfit-30 -#PBS -q fast -#PBS -d . -#PBS -e err.err -#PBS -V -#PBS -m ae -#PBS -l nodes=1:ppn=1 -#PBS -l walltime=240:00:00 -#PBS -t 1-120 - -export OMP_NUM_THREADS=$PBS_NUM_PPN -./nnfit $PBS_ARRAYID config.ini diff --git a/nnpdfcpp/scripts/nnfit.steno.ll.cmd b/nnpdfcpp/scripts/nnfit.steno.ll.cmd deleted file mode 100644 index 32ff1c5ecf..0000000000 --- a/nnpdfcpp/scripts/nnfit.steno.ll.cmd +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# -# @ job_name = nnfit -# @ job_type = serial -# @ initialdir = . -# @ error = outfiles/nnfit-$(jobid)-$(stepid).err -# @ output = outfiles/nnfit-$(jobid)-$(stepid).out -# @ environment = COPY_ALL -# @ class = tier3 -# @ resources = ConsumableCpus(1) ConsumableMemory(2gb) -# @ wall_clock_limit = 47:59:59 -# @ queue - -echo "Submitting replica" $REP -./nnfit $REP diff --git a/nnpdfcpp/scripts/nnfit.steno.sh b/nnpdfcpp/scripts/nnfit.steno.sh deleted file mode 100755 index fdbfd496f7..0000000000 --- a/nnpdfcpp/scripts/nnfit.steno.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -for I in {1..110} -do - export REP=$I - llsubmit nnfit.steno.ll.cmd -done diff --git a/nnpdfcpp/scripts/nnfit.stoomboot.sh b/nnpdfcpp/scripts/nnfit.stoomboot.sh deleted file mode 100755 index 16231450fe..0000000000 --- a/nnpdfcpp/scripts/nnfit.stoomboot.sh +++ /dev/null @@ -1,8 +0,0 @@ -echo "Launching " $1 " jobs of configuration " $2 - -for (( c=1; c<=$1; c++ )) -do - echo "cd ${PWD} -./nnfit ${c} ${2}" > ${c}_${2}.run - qsub -q generic -l walltime=24:00:00 ${c}_${2}.run -done diff --git a/nnpdfcpp/src/CMakeLists.txt b/nnpdfcpp/src/CMakeLists.txt deleted file mode 100644 index 68efe18708..0000000000 --- a/nnpdfcpp/src/CMakeLists.txt +++ /dev/null @@ -1,83 +0,0 @@ -# common files -add_library(common STATIC - common/src/nnpdfsettings.cc - common/src/md5.cc - common/src/loadutils.cc - common/src/datautils.cc - common/src/exportgrid.cc -) -include_directories(common/inc) - -# filter -option(COMPILE_filter "Compile filter program." OFF) -if (COMPILE_filter) - add_executable(filter filter/src/filter.cc - filter/src/kincuts.cc) - include_directories(filter/inc) - target_link_libraries(filter common nnpdf ${LHAPDF_LIBRARIES} ${YAML_LDFLAGS} ${GSL_LDFLAGS}) - install(TARGETS filter DESTINATION bin - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -endif(COMPILE_filter) - -# nnfit -option(COMPILE_nnfit "Compile nnfit program." OFF) -if (COMPILE_nnfit) - add_executable(nnfit nnfit/src/nnfit.cc - nnfit/src/evolgrid.cc - nnfit/src/fastaddchi2.cc - nnfit/src/fitbases.cc - nnfit/src/fitpdfset.cc - nnfit/src/minimizer.cc - nnfit/src/pdfbasis.cc - nnfit/src/stopping.cc) - include_directories(nnfit/inc) - target_link_libraries(nnfit common nnpdf ${LHAPDF_LIBRARIES} ${YAML_LDFLAGS} ${APFEL_LIBRARIES} ${GSL_LDFLAGS}) - install(TARGETS nnfit DESTINATION bin - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -endif(COMPILE_nnfit) - -# chi2check -option(COMPILE_chi2check "Compile chi2check program." OFF) -if (COMPILE_chi2check) - add_executable(chi2check chi2check/src/chi2check.cc) - target_link_libraries(chi2check common nnpdf ${LHAPDF_LIBRARIES} ${YAML_LDFLAGS} ${GSL_LDFLAGS}) - install(TARGETS chi2check DESTINATION bin - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -endif(COMPILE_chi2check) - - -# evolvefit -option(COMPILE_evolvefit "Compile evolvefit program." OFF) -if (COMPILE_evolvefit) - add_executable(evolvefit - evolvefit/src/evolvefit.cc - nnfit/src/evolgrid.cc) - include_directories(evolvefit/inc nnfit/inc) - target_link_libraries(evolvefit common nnpdf ${YAML_LDFLAGS} ${APFEL_LIBRARIES} ${GSL_LDFLAGS}) - install(TARGETS evolvefit DESTINATION bin - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -endif(COMPILE_evolvefit) - -# libfiatlux -find_program(FIATLUX_CONFIG fiatlux-config) -if (FIATLUX_CONFIG) - exec_program(${FIATLUX_CONFIG} - ARGS --cppflags - OUTPUT_VARIABLE FIATLUX_CXX_FLAGS - ) - exec_program(${FIATLUX_CONFIG} - ARGS --ldflags - OUTPUT_VARIABLE FIATLUX_LIBRARIES - ) - # fiatlux - option(COMPILE_fiatlux "Compile fiatlux program." OFF) - if (COMPILE_fiatlux) - add_executable(fiatlux fiatlux/src/fiatlux.cc) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FIATLUX_CXX_FLAGS}") - target_link_libraries(fiatlux common nnpdf ${LHAPDF_LIBRARIES} ${YAML_LDFLAGS} ${GSL_LDFLAGS} ${FIATLUX_LIBRARIES} ${APFEL_LIBRARIES}) - install(TARGETS fiatlux DESTINATION bin - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - endif(COMPILE_fiatlux) -else(FIATLUX_CONFIG) - message(WARNING "libfiatlux not found: fiatlux compilation is disabled, install libfiatlux and rerun cmake to enable the fiatlux compilation") -endif(FIATLUX_CONFIG) diff --git a/nnpdfcpp/src/chi2check/src/chi2check.cc b/nnpdfcpp/src/chi2check/src/chi2check.cc deleted file mode 100644 index 9943baa938..0000000000 --- a/nnpdfcpp/src/chi2check/src/chi2check.cc +++ /dev/null @@ -1,207 +0,0 @@ -// $Id: chi2check.cc 1577 2014-02-11 15:19:24Z s1044006 $ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -/** - * chi2check - computes the values of chi2 for the datasets availble - */ - -#include -#include -#include -#include -#include -using std::cout; -using std::endl; -using std::flush; -using std::setw; -using std::setprecision; -using std::fixed; - -#include "nnpdfsettings.h" -#include "loadutils.h" -#include "datautils.h" -#include -#include -#include -#include -#include -using namespace NNPDF; - -/** - * \param argv the filename containing the configuration - */ -int main(int argc, char **argv) -{ - MPI::Init(); - - if (MPI::TaskID() == 0) // master slave - { - // Read configuration filename from arguments - string folder, pdfgrid, plottingfile = get_config_path() + "plotting.yml"; - if (argc > 1) - { - folder.assign(argv[1]); - if (argc == 3) pdfgrid.assign(argv[2]); - if (argc == 4) plottingfile.assign(argv[3]); - if (folder == "--help") { cout << "\nusage: chi2check [configuration folder] [optional plotting filename]\n" << endl; exit(-1); } - } - else - { - cerr << Colour::FG_RED << "\nusage: chi2check [configuration folder] [optional plotting filename]\n" << endl; - exit(-1); - } - - // Creates the configuration class - NNPDFSettings settings(folder); - settings.SetPlotFile(plottingfile); - settings.VerifyConfiguration(); - - LHAPDFSet* T0Set = NULL; - if (settings.GetPlotting("uset0").as()) - { - cout << Colour::FG_RED << " ----------------- SETTINGS: USING T0 COVARIANCE MATRIX -----------------\n" << Colour::FG_DEFAULT <(), PDFSet::erType::ER_MCT0); - } - else cout << Colour::FG_RED <<" ----------------- SETTINGS: USING EXP COVARIANCE MATRIX -----------------\n" << Colour::FG_DEFAULT << endl; - - // Load PDF - PDFSet *pdf = NULL; - if (argc == 3) - pdf = new LHAPDFSet(pdfgrid, PDFSet::erType::ER_MC); - else - pdf = new LHAPDFSet(settings.GetPDFName(), PDFSet::erType::ER_MC); - cout << endl; - - // Load experiments - vector exps; - for (int i=0; i datasets; - - for (int j = 0; j < Nsets; j++) - { - datasets.push_back(LoadDataSet(settings, settings.GetExpSets(i)[j], DATA_FILTERED)); - if (settings.GetPlotting("uset0").as()) MakeT0Predictions(T0Set,datasets[j]); - } - - auto exp = new Experiment(datasets, settings.GetExpName(i)); - if (settings.IsThUncertainties()) - { - string ThCovMatPath = settings.GetResultsDirectory() + "/tables/datacuts_theory_theorycovmatconfig_theory_covmat.csv"; - - exp->LoadRepCovMat(ThCovMatPath, settings.IsThCovSampling()); - exp->LoadFitCovMat(ThCovMatPath, settings.IsThCovFitting()); - } - - exps.push_back(exp); - } - - if (T0Set) delete T0Set; - - //Get Results - cout << "\n- Computing theoretical predictions:" << endl; - vector res; - for (int i = 0; i < settings.GetNExp(); i++) - { - res.push_back(new ExperimentResult(pdf, exps[i])); - cout << Colour::FG_YELLOW << "[" << exps[i]->GetExpName() << "]" << Colour::FG_DEFAULT << flush; - } - - // Output - ThPredictions* tt = 0; - DataSetResult* dr = 0; - - cout << "\n"; - cout << "\nValues of chi2 by dataset" << endl; - cout << "-------------------------- " << endl; - - for (int i = 0; i < settings.GetNExp(); i++) - { - const float eDOF = exps[i]->GetNData(); - if (!exps[i]->GetNSet()) continue; - - cout << endl << Colour::FG_RED - << "Experiment: " << Colour::FG_DEFAULT - << setw(16) << exps[i]->GetExpName() - << "\t" - << "Npts: " << (int) eDOF - << "\t" - << "chi2(cent|diag): " << setw(8) << fixed << setprecision(5) << res[i]->GetChi2Cent()/eDOF - << " | " << res[i]->GetChi2Diag()/eDOF - << endl; - - for (int j = 0; j < exps[i]->GetNSet(); j++) - { - dr = res[i]->GetSetResult(j); - tt = dr->GetTheory(); - - const float dDOF = dr->GetChi2Results().fDOF; - - cout << Colour::FG_BLUE - << "Dataset: " << Colour::FG_DEFAULT - << setw(16) << tt->GetSetName() - << "\t" - << "Npts: " << (int) dDOF - << "\t" - << "chi2(cent|diag): " << setw(8) << fixed << setprecision(5) << dr->GetChi2Results().fChi2Cent/dDOF - << " | " << dr->GetChi2Results().fChi2Diag/dDOF - << endl; - } - } - - // check for bad replicas - Chi2Results global; - global.fDOF = 0; - global.fChi2Cent = 0; - global.fChi2Avg = 0; - - global.fMembers = pdf->GetMembers(); - global.fChi2Mem = new real[global.fMembers]; - for (int n=0; n < global.fMembers; n++) - global.fChi2Mem[n] = 0.0; - - for (int i=0; i < settings.GetNExp(); i++) - { - if (!exps[i]->GetNSet()) continue; - global.fChi2Avg += res[i]->GetChi2Results().fChi2Avg; - global.fChi2Cent+= res[i]->GetChi2Results().fChi2Cent; - - global.fDOF+= res[i]->GetChi2Results().fDOF; - - for (int n=0; n < global.fMembers; n++) - global.fChi2Mem[n]+=res[i]->GetChi2Results().fChi2Mem[n]; - } - - real globalAVG = ComputeAVG(global.fMembers, global.fChi2Mem); - real globalSTD = ComputeStdDev(global.fMembers, global.fChi2Mem); - - cout < globalAVG + 4*globalSTD ) - cout << " Replica " << i <<" chi2 is too large: "< -using NNPDF::real; - -#include -using NNPDF::MPI; - -#include -#include - -using std::string; -using std::cout; -using std::cerr; -using std::cin; -using std::endl; -using std::ios; -using std::stringstream; - -typedef real (*gpdf)(real*); - -// ********* Physics ********************** - -enum {TBAR,BBAR,CBAR,SBAR,UBAR,DBAR,GLUON,D,U,S,C,B,T,PHT}; - -enum evlnBasis { EVLN_GAM, EVLN_SNG, EVLN_GLU, EVLN_VAL, EVLN_V3, EVLN_V8, EVLN_V15, EVLN_V24, EVLN_V35, - EVLN_T3, EVLN_T8, EVLN_T15, EVLN_T24, EVLN_T35}; - -// PDF Sum rules -enum sumRule {SUM_MSR, SUM_UVL, SUM_DVL, SUM_SVL, SUM_CVL, SUM_USM, SUM_DSM, SUM_SSM, SUM_CSM}; - -// ************ Code Organisation Enums *********** - -enum minType {MIN_UNDEF, MIN_GA, MIN_NGA, MIN_NGAFT, MIN_CMAES}; -enum stopType {STOP_UNDEF, STOP_NONE, STOP_LB}; -enum paramType {PARAM_UNDEF, PARAM_NN, PARAM_SLN, PARAM_SLNPP }; -enum basisType {BASIS_UNDEF, BASIS_NN23, BASIS_NN23QED, - BASIS_EVOL, BASIS_EVOLQED,BASIS_EVOLS, BASIS_EVOLSQED, - BASIS_NN30, BASIS_NN30QED, BASIS_FLVR, BASIS_FLVRQED, - BASIS_NN30IC, BASIS_EVOLIC, BASIS_NN31IC, BASIS_LUX, BASIS_NN31ICQED, - BASIS_NSR, BASIS_DISEVOL, BASIS_PDF4LHC20}; - -enum covType {COV_EXP = false, COV_T0 = true}; -enum filterType {DATA_UNFILTERED = false,DATA_FILTERED = true}; - -namespace Colour { - enum Code { - FG_RED = 31, - FG_GREEN = 32, - FG_YELLOW = 33, - FG_BLUE = 34, - FG_DEFAULT = 39, - BG_RED = 41, - BG_GREEN = 42, - BG_YELLOW = 43, - BG_BLUE = 44, - BG_DEFAULT = 49 - }; - static inline std::ostream& operator<<(std::ostream& os, Code code) { - return os << "\033[" << static_cast(code) << "m"; - } -} diff --git a/nnpdfcpp/src/common/inc/datautils.h b/nnpdfcpp/src/common/inc/datautils.h deleted file mode 100644 index a6d8078195..0000000000 --- a/nnpdfcpp/src/common/inc/datautils.h +++ /dev/null @@ -1,140 +0,0 @@ -// $Id -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -#pragma once - -#include "common.h" -#include -using std::vector; - -#include -#include -#include -#include -#include -using namespace NNPDF; -class NNPDFSettings; - -/** - * \struct Chi2Results - * Should really be consted, but then - * we'd need a class with a constructor - */ -struct Chi2Results -{ - real fChi2Avg; - real fChi2Cent; - real fChi2Diag; - - int fDOF; - int fMembers; - - real* fChi2Mem; -}; - -/** - * @brief The StatEstimators struct - */ -struct StatEstimators -{ - real fSigmaExp; - real fRhoExp; - real fCovExp; - - real fSigmaNet; - real fRhoNet; - real fCovNet; - - real fPhi; -}; - -/** - * @brief ComputeChi2 for dataset and experiments - supplements chi2 routines in libnnpdf - */ -void ComputeChi2(DataSet const&, ThPredictions* const&, Chi2Results &); -void ComputeChi2(Experiment* const&, vector const&, Chi2Results &); - -void ComputeEstimators(DataSet const&, ThPredictions* const&, StatEstimators &est); -void ComputeEstimators(Experiment* const&, vector const&, StatEstimators &est); - -/// Auxiliary function which loads computes T0 predictions -void MakeT0Predictions(PDFSet * const &T0Set, DataSet &set); - -/// Compute ArcLength -real CalculateArcLength(PDFSet* const& p, int const& mem, real const& Q, gpdf fop, double dampfact, real xmin = 1e-7, real xmax = 1.0); - -/** - * \class DataSetResult - * \brief Class for handling dataset results - */ -class DataSetResult -{ -public: - DataSetResult(PDFSet*, DataSet const&); //!< DataSetResult constructor. - ~DataSetResult(); //!< DataSetResult destructor - - ThPredictions* GetTheory() {return fTheory;} //!< Returns the contained ThPredictions object - DataSet const& GetDataSet() {return fData;} //!< Returns the associated DataSet object - PDFSet *GetPDFSet() { return fPDF; } //!< Returns the PDFset - Chi2Results const& GetChi2Results() const {return fChi2;} //!< Returns the associated Chi2 object - real GetChi2Cent() const { return fChi2.fChi2Cent; } //!< Returns the chi2cent - real GetChi2Avg() const { return fChi2.fChi2Avg; } //!< Returns the chi2avg - real GetChi2Diag() const { return fChi2.fChi2Diag; } //!< Returns the chi2diag - real GetSigmaExp() const { return fEstimators.fSigmaExp; } //!< Returns the sigma exp estimator - real GetSigmaNet() const { return fEstimators.fSigmaNet; } //!< Returns the sigma art estimator - real GetEstCovExp()const { return fEstimators.fCovExp; } //!< Return the cov exp estimator - real GetEstCovNet()const { return fEstimators.fCovNet; } //!< Return the cov art estimator - real GetEstRhoExp()const { return fEstimators.fRhoExp; } //!< Return the rho exp estimator - real GetEstRhoNet()const { return fEstimators.fRhoNet; } //!< Return the rho art estimator - real GetPhi() const { return fEstimators.fPhi; } //!< Return the phi estimator - int GetDOF() const { return fChi2.fDOF; } //!< Returns the number of degrees of freedom - -private: - PDFSet *fPDF; - DataSet const& fData; //!< Pointer to DataSet associated with results instance - ThPredictions* fTheory; //!< Theory predictions for DataSet fData - Chi2Results fChi2; //!< Chi2 results struct - StatEstimators fEstimators; //!< Statistical estimators -}; - - -/** - * \class ExperimentResults - * \brief Class for handling experiments results - */ - -class ExperimentResult -{ -public: - ExperimentResult(PDFSet*, Experiment*); //!< ExperimentResult constructor. - ~ExperimentResult(); //!< ExperimentResult destructor - - Experiment* GetExperiment() {return fExperiment;} //!< Returns the associated experiment - DataSetResult* GetSetResult(int const& i) {return fSetResults[i];} //!< Returns the ith DataSet Result object - ThPredictions* GetTheories(int const& i) {return fTheories[i]; } //!< Returns the ith Experiment object - PDFSet *GetPDFSet() { return fPDF; } //!< Returns the PDFset - Chi2Results const& GetChi2Results() {return fChi2;} //!< Returns the chi^2 results object - real GetChi2Cent() const { return fChi2.fChi2Cent; } //!< Returns the chi2cent - real GetChi2Avg() const { return fChi2.fChi2Avg; } //!< Returns the chi2avg - real GetChi2Diag() const { return fChi2.fChi2Diag; } //!< Returns the chi2diag - real GetSigmaExp() const { return fEstimators.fSigmaExp; } //!< Returns the sigma exp estimator - real GetSigmaNet() const { return fEstimators.fSigmaNet; } //!< Returns the sigma art estimator - real GetEstCovExp()const { return fEstimators.fCovExp; } //!< Return the cov exp estimator - real GetEstCovNet()const { return fEstimators.fCovNet; } //!< Return the cov art estimator - real GetEstRhoExp()const { return fEstimators.fRhoExp; } //!< Return the rho exp estimator - real GetEstRhoNet()const { return fEstimators.fRhoNet; } //!< Return the rho art estimator - real GetPhi() const { return fEstimators.fPhi; } //!< Return the phi estimator - int GetDOF() const { return fChi2.fDOF; } //!< Returns the number of degrees of freedom - -private: - PDFSet *fPDF; - Experiment* fExperiment; //!< Pointer to Experiment associated with results instance - vector fTheories; //!< Theory predictions - vector fSetResults; //!< Theory results for each included dataset - Chi2Results fChi2; //!< Chi2 results struct - StatEstimators fEstimators; //!< Statistical estimators -}; diff --git a/nnpdfcpp/src/common/inc/loadutils.h b/nnpdfcpp/src/common/inc/loadutils.h deleted file mode 100644 index 387d9055da..0000000000 --- a/nnpdfcpp/src/common/inc/loadutils.h +++ /dev/null @@ -1,27 +0,0 @@ -// $Id$ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -#pragma once - -#include "common.h" -#include -#include -#include - -using NNPDF::FKSet; -using NNPDF::DataSet; -using NNPDF::PositivitySet; -class NNPDFSettings; - -/// Load DataSet objects from settings and setnames -DataSet LoadDataSet(NNPDFSettings const& settings, std::string const& setname, filterType useFilter); - -/// Load PositivitySet objects from settings and posnames -PositivitySet LoadPositivitySet(NNPDFSettings const& settings, std::string const& posname, real const& lambda); - -/// Auxiliary function for loading FKSets -FKSet LoadFK(NNPDFSettings const& settings, std::string const& setname); diff --git a/nnpdfcpp/src/common/inc/md5.h b/nnpdfcpp/src/common/inc/md5.h deleted file mode 100644 index ea158008c6..0000000000 --- a/nnpdfcpp/src/common/inc/md5.h +++ /dev/null @@ -1,95 +0,0 @@ -/* MD5 - converted to C++ class by Frank Thilo (thilo@unix-ag.org) - for bzflag (http://www.bzflag.org) - - based on: - - md5.h and md5.c - reference implementation of RFC 1321 - - Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All - rights reserved. - - License to copy and use this software is granted provided that it - is identified as the "RSA Data Security, Inc. MD5 Message-Digest - Algorithm" in all material mentioning or referencing this software - or this function. - - License is also granted to make and use derivative works provided - that such works are identified as "derived from the RSA Data - Security, Inc. MD5 Message-Digest Algorithm" in all material - mentioning or referencing the derived work. - - RSA Data Security, Inc. makes no representations concerning either - the merchantability of this software or the suitability of this - software for any particular purpose. It is provided "as is" - without express or implied warranty of any kind. - - These notices must be retained in any copies of any part of this - documentation and/or software. - - */ - -#ifndef BZF_MD5_H -#define BZF_MD5_H - -#include -#include -#include -#include - -// a small class for calculating MD5 hashes of strings or byte arrays -// it is not meant to be fast or secure -// -// usage: 1) feed it blocks of uchars with update() -// 2) finalize() -// 3) get hexdigest() string -// or -// MD5(std::string).hexdigest() -// -// assumes that char is 8 bit and int is 32 bit -class MD5 -{ -public: - typedef unsigned int size_type; // must be 32bit - - MD5(); - MD5(const std::string& text); - void update(const unsigned char *buf, size_type length); - void update(const char *buf, size_type length); - void update(std::istream& stream); // Update with stream, modified from original MD5.cc --- nh 01/05/13 - MD5& finalize(); - std::string hexdigest() const; - friend std::ostream& operator<<(std::ostream&, MD5 md5); - -private: - void init(); - typedef unsigned char uint1; // 8bit - typedef unsigned int uint4; // 32bit - enum {blocksize = 64}; // VC6 won't eat a const static int here - - void transform(const uint1 block[blocksize]); - static void decode(uint4 output[], const uint1 input[], size_type len); - static void encode(uint1 output[], const uint4 input[], size_type len); - - bool finalized; - uint1 buffer[blocksize]; // bytes that didn't fit in last 64 byte chunk - uint4 count[2]; // 64bit counter for number of bits (lo, hi) - uint4 state[4]; // digest so far - uint1 digest[16]; // the result - - // low level logic operations - static inline uint4 F(uint4 x, uint4 y, uint4 z); - static inline uint4 G(uint4 x, uint4 y, uint4 z); - static inline uint4 H(uint4 x, uint4 y, uint4 z); - static inline uint4 I(uint4 x, uint4 y, uint4 z); - static inline uint4 rotate_left(uint4 x, int n); - static inline void FF(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac); - static inline void GG(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac); - static inline void HH(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac); - static inline void II(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac); -}; - -std::string md5(const std::string str); - -#endif diff --git a/nnpdfcpp/src/common/inc/nnpdfsettings.h b/nnpdfcpp/src/common/inc/nnpdfsettings.h deleted file mode 100644 index 8f36deb2d1..0000000000 --- a/nnpdfcpp/src/common/inc/nnpdfsettings.h +++ /dev/null @@ -1,175 +0,0 @@ -// $Id: nnpdfsettings.h 2478 2015-02-03 13:23:12Z s1044006 $ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -/** - * \class NNPDFSettings Read/write configuration files - * \brief Reads the .ini file that contains all the configuration - */ - -#pragma once - -#include "common.h" -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include - -using std::fstream; -using std::ifstream; -using std::vector; -using std::map; -using std::make_pair; - -using namespace NNPDF; - -class PDFBasis; - -/* - * DataSetInfo - * Container struct for Dataset level info - corresponds to each dataset line in config file - */ -struct DataSetInfo -{ - const string tSetName; - const string tSysOpt; - const real tTrainingFraction; - const std::vector tCFactors; - const double weight; -}; - -/** - * @brief Mutation property container for each flavor - */ -struct FlMutProperty -{ - vector mutsize; - vector mutprob; -}; - -/* - * PosSetInfo - * Container struct for Positivity level info - corresponds to each positivity line in config file - */ -struct PosSetInfo -{ - const string tSetName; //!< Set Name - const real tLambda; //!< Lagrange multiplier -}; - -class NNPDFSettings -{ -private: - string fFileName; - string fPDFName; - string fResultsDir; - string fTheoryDir; - - vector fExpName; //!< Contains the experiment names - vector fPosName; //!< Contains the positivity names - vector fSetName; //!< Contains the dataset names - vector< vector > fExpSetName; //!< Contains dataset names per experiment - vector fFlMutProperty;//!< Contains the mutation - not really need by improves NGA performance - vector fArch; //!< Contains the NN architecture - - map fDataSetInfo; //!< Contains the dataset info - map fPosSetInfo; //!< Map of PosSetInfo structs - - - gsl_error_handler_t * fGSL_old_handler; //!< GSL error handler - gsl_integration_workspace * fGSLWork; //!< GSL integration workspace - - YAML::Node fConfig; //!< main config file - YAML::Node fPlotting; //!< plotting config file - - map fTheory; - - bool fThUncertainties; //!< true if the fit uses an external runcard, false otherwise. - bool fThCovSampling; // true if the theory covariance matrix is included in the replicas generation - bool fThCovFitting; // true if the theroy covariance matrix is included in the fitting chi2 - -public: - - NNPDFSettings(const string& folder); //!< The constructor - ~NNPDFSettings(); //!< The destructor. - - // extra set methods - void SetPlotFile(string const&); - - // Get methods - YAML::Node Get(const string& item) const; - YAML::Node Get(const string& node, const string& item) const; - YAML::Node GetPlotting(const string& item) const; - YAML::Node GetFile() const { return fConfig; } - bool Exists(const string& item) const; - bool Exists(const string& node, const string& item) const; - string const& GetTheory(const string& item) const { return fTheory.at(item); } - string const& GetResultsDirectory() const { return fResultsDir; } - string const& GetTheoryDirectory() const { return fTheoryDir; } - - int GetNExp() const { return (int) fExpName.size(); } - int GetNSet() const { return (int) fSetName.size(); } - int GetNPos() const { return (int) fPosName.size(); } - int GetNFL() const; - string const& GetExpName(int i) const { return fExpName[i]; } - string const& GetSetName(int i) const { return fSetName[i]; } - string const& GetPosName(int i) const { return fPosName[i]; } - string const& GetPDFName() const { return fPDFName; } - vector const& GetExpSets(int i) const { return fExpSetName[i]; } - FlMutProperty const& GetFlMutProp(int i) const { return fFlMutProperty[i]; } - vector const& GetArch() const { return fArch; } - map const& GetTheoryMap() const { return fTheory; } - bool SavePseudodata() const; - bool IsQED() const; - bool IsIC() const; - bool IsThUncertainties() const { return fThUncertainties; } - bool IsThCovSampling() const { return fThCovSampling; } - bool IsThCovFitting() const { return fThCovFitting; } - - gsl_integration_workspace *GetGSLWorkspace() const { return fGSLWork; } //!< GSL integration workspace - - // Check methods - bool CheckParam(string const& param, double const& p1, double const& p2) const; //!< Check an individual parameter - bool CheckParam(string const& param, string const& p1, string const& p2) const; //!< Check an individual parameter - void VerifyConfiguration() const; //!< Checks the log hash against filter - void VerifyFK(FKTable* const&) const; //!< Verify FastKernel table settings - - // Print configuration - void PrintConfiguration(const string& filename) const; - void PrintTheory(const string& filename) const; - - vector GetDataInfo(string const& setname, filterType useFiltered) const; - vector GetDataMask(string const& setname, filterType useFiltered) const; - DataSetInfo const& GetSetInfo(string const& setname) const; - PosSetInfo const& GetPosInfo(string const& posname) const; - - static minType getFitMethod(string const& method); - static paramType getParamType(string const& method); - static stopType getStopType(string const& method); - static basisType getFitBasisType(string const& method); -private: - - void Splash() const; - void LoadExperiments(); - void LoadPositivities(); - void CheckBasis(); - void LoadGA(); -}; diff --git a/nnpdfcpp/src/common/inc/version.h.in b/nnpdfcpp/src/common/inc/version.h.in deleted file mode 100644 index 662003425e..0000000000 --- a/nnpdfcpp/src/common/inc/version.h.in +++ /dev/null @@ -1 +0,0 @@ -#define SVN_REV @nnpdfcpp_VERSION@ diff --git a/nnpdfcpp/src/common/src/datautils.cc b/nnpdfcpp/src/common/src/datautils.cc deleted file mode 100644 index beae18d6d3..0000000000 --- a/nnpdfcpp/src/common/src/datautils.cc +++ /dev/null @@ -1,393 +0,0 @@ -// $Id: experiments.cc 2069 2014-11-07 19:09:25Z s0673800 $ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -#include "datautils.h" -#include "nnpdfsettings.h" -#include -#include -using namespace NNPDF; - -/// Auxiliary function which loads computes T0 predictions -void MakeT0Predictions(PDFSet* const& T0Set, DataSet& set) -{ - // Make T0 Predictions - cout << Colour::FG_BLUE << " **** Producing T0 Predictions with Set "<< T0Set->GetSetName() << Colour::FG_DEFAULT << endl; - - // Export T0 vector - ThPredictions *t0pred = new ThPredictions(T0Set,&set); - set.SetT0(*t0pred); - - delete t0pred; - return; -} - -void ComputeChi2(DataSet const& set, ThPredictions* const& th, Chi2Results & chi2res) -{ - if (!set.GetData()) - { - cerr << "ComputeChi2 Error: Missing required data"<GetObs(); - const int nMem = th->GetNPdf(); - const int nData = set.GetNData(); - - // Compute the Chi2 for each replica - chi2res.fChi2Mem = new real[nMem]; - - for (int n = 0; n < nMem; n++) - chi2res.fChi2Mem[n] = 0.0; - - NNPDF::ComputeChi2(&set, nMem, theory, chi2res.fChi2Mem); - - // Compute central chi2 to data - chi2res.fChi2Cent = 0.0; - real* centTheory = new real[nData]; - for (int i = 0; i < nData; i++) - centTheory[i] = th->GetObsCV(i); - NNPDF::ComputeChi2(&set, 1, centTheory, &chi2res.fChi2Cent); - delete[] centTheory; - - // Computing the average - chi2res.fChi2Avg = ComputeAVG(nMem, chi2res.fChi2Mem); - - // Compute diagonal chi2 - chi2res.fChi2Diag = 0.0; - for (int i = 0; i < nData; i++) - chi2res.fChi2Diag += pow(set.GetData(i) - th->GetObsCV(i), 2.0) / set.GetCovMat()(i, i); - - //Degrees of freedom - chi2res.fDOF = nData; - - return; -} - -void ComputeChi2(Experiment* const& exp, const vector & th, Chi2Results &chi2res) -{ - // Number of PDFs - const int nData = exp->GetNData(); - const int nMem = th[0]->GetNPdf(); - - // Filling the theory - int index = 0; - real *theory = new real[nData*nMem]; - real *obsCV = new real[nData]; - - for (int s = 0; s < exp->GetNSet(); s++) - for (int p = 0; p < exp->GetSet(s).GetNData(); p++) - obsCV[index++] = th[s]->GetObsCV(p); - - index = 0; - for (int s = 0; s < exp->GetNSet(); s++) - for (int i = 0; i < exp->GetSet(s).GetNData(); i++) - for (int n = 0; n < nMem; n++) - theory[index++] = th[s]->GetObs()[n + nMem*i]; - - // Compute per member chi2 - chi2res.fChi2Mem = new real[nMem]; - for (int i = 0; i < nMem; i++) - chi2res.fChi2Mem[i] = 0; - - NNPDF::ComputeChi2(exp, nMem, theory, chi2res.fChi2Mem); - - // Compute central chi2 to data - chi2res.fChi2Cent = 0.0; index = 0; - real* centTheory = new real[nData]; - for (int s = 0; s < exp->GetNSet(); s++) - for (int p = 0; p < exp->GetSet(s).GetNData(); p++) - centTheory[index++] = th[s]->GetObsCV(p); - NNPDF::ComputeChi2(exp, 1, centTheory, &chi2res.fChi2Cent); - delete[] centTheory; - - // Compute the diagonal chi2 - chi2res.fChi2Diag = 0.0; - for (int i = 0; i < nData; i++) - chi2res.fChi2Diag += pow(exp->GetData()[i] - obsCV[i], 2.0) / exp->GetCovMat()(i, i); - - // Computing the average - chi2res.fChi2Avg = ComputeAVG(nMem, chi2res.fChi2Mem); - chi2res.fDOF=nData; - - delete[] theory; - delete[] obsCV; - - return; -} - -void ComputeEstimators(DataSet const& set, ThPredictions* const& th, StatEstimators& est) -{ - if (!set.IsArtificial()) - { - // Building experimental estimators - const int nData = set.GetNData(); - auto const& covmat = set.GetCovMat(); - - real *cov = new real[nData*(nData+1)/2]; - real *rho = new real[nData*(nData+1)/2]; - real *sigtot = new real[nData]; - - for (int i = 0; i < nData; i++) - sigtot[i] = fabs(sqrt(covmat(i, i))/set.GetData(i)*100); - - int index = 0; - for (int i = 0; i < nData; i++) - for (int j = i; j < nData; j++) - { - cov[index] = covmat(i, j); - rho[index] = covmat(i, j)/sqrt(covmat(i, i))/sqrt(covmat(j, j)); - index++; - } - - est.fSigmaExp = ComputeAVG(nData, sigtot); - est.fCovExp = ComputeAVG(nData*(nData+1)/2, cov); - est.fRhoExp = ComputeAVG(nData*(nData+1)/2, rho); - - delete[] sigtot; - delete[] cov; - delete[] rho; - - // Building network estimators - const int nrep = th->GetNPdf(); - - sigtot = new real[nData]; - cov = new real[nData*(nData+1)/2]; - rho = new real[nData*(nData+1)/2]; - - real **Fnet = new real*[nrep]; - for (int n = 0; n < nrep; n++) - Fnet[n] = new real[nData]; - - index = 0; - for (int i = 0; i < nData; i++) - { - real sumFnet = 0, sumF2net = 0; - for (int k = 0; k < nrep; k++) - { - Fnet[k][index] =th->GetObs()[k+nrep*i]; - sumFnet += Fnet[k][index]; - sumF2net += pow(Fnet[k][index], (real)2.0); - } - - real Favg = 1.0/nrep*sumFnet; - real F2avg = 1.0/nrep*sumF2net; - - if (nrep > 1) - sigtot[index] = fabs(sqrt(nrep/(nrep-1)*(F2avg-Favg*Favg))/Favg*100); - else - sigtot[index] = 0; - - index++; - } - - index = 0; - for (int i = 0; i < nData; i++) - for (int j = i; j < nData; j++) - { - real sumFij = 0, sumFi =0, sumFj = 0; - for (int k = 0; k < nrep; k++) - { - sumFij += Fnet[k][i]*Fnet[k][j]; - sumFi += Fnet[k][i]; - sumFj += Fnet[k][j]; - } - real Fijavg = 1.0/nrep*sumFij; - real Fiavg = 1.0/nrep*sumFi; - real Fjavg = 1.0/nrep*sumFj; - - if (nrep > 1) - cov[index] = nrep/(nrep-1)*(Fijavg-Fiavg*Fjavg); - else - cov[index] = 0; - rho[index] = cov[index]/(sigtot[i]*Fiavg/1e2)/(sigtot[j]*Fjavg/1e2); - index++; - } - - est.fSigmaNet = ComputeAVG(nData, sigtot); - est.fCovNet = ComputeAVG(nData*(nData+1)/2, cov); - est.fRhoNet = ComputeAVG(nData*(nData+1)/2, rho); - - for (int i = 0; i < nrep; i++) - if (Fnet[i]) delete[] Fnet[i]; - delete[] Fnet; - - delete[] sigtot; - delete[] cov; - delete[] rho; - } - else - { - // need implementation - } -} - -void ComputeEstimators(Experiment * const& exp, const vector & th, StatEstimators &est) -{ - if (!exp->IsArtificial()) - { - const int nData = exp->GetNData(); - auto const& covmat = exp->GetCovMat(); - - // Building experimental estimators - real *cov = new real[nData*(nData+1)/2]; - real *rho = new real[nData*(nData+1)/2]; - real *sigtot = new real[nData]; - - for (int i = 0; i < nData; i++) - sigtot[i] = fabs(sqrt(covmat(i, i))/exp->GetData()[i]*100); - - int index = 0; - for (int i = 0; i < nData; i++) - for (int j = i; j < nData; j++) - { - cov[index] = covmat(i, j); - rho[index] = covmat(i, j)/sqrt(covmat(i, i))/sqrt(covmat(j, j)); - index++; - } - - est.fSigmaExp = ComputeAVG(nData, sigtot); - est.fCovExp = ComputeAVG(nData*(nData+1)/2, cov); - est.fRhoExp = ComputeAVG(nData*(nData+1)/2, rho); - - delete[] sigtot; - delete[] cov; - delete[] rho; - - // Building network estimators - const int nrep = th[0]->GetNPdf(); - - sigtot = new real[nData]; - cov = new real[nData*(nData+1)/2]; - rho = new real[nData*(nData+1)/2]; - - real **Fnet = new real*[nrep]; - for (int n = 0; n < nrep; n++) - Fnet[n] = new real[nData]; - - index = 0; - - for (int t = 0; t < exp->GetNSet(); t++) - { - const DataSet &set = exp->GetSet(t); - - for (int i = 0; i < set.GetNData(); i++) - { - real sumFnet = 0, sumF2net = 0; - for (int k = 0; k < nrep; k++) - { - Fnet[k][index] = th[t]->GetObs()[k+nrep*i]; - sumFnet += Fnet[k][index]; - sumF2net += pow(Fnet[k][index], (real)2.0); - } - - real Favg = 1.0/nrep*sumFnet; - real F2avg = 1.0/nrep*sumF2net; - - if (nrep > 1) - sigtot[index] = fabs(sqrt(nrep/(nrep-1)*(F2avg-Favg*Favg))/Favg*100); - else - sigtot[index] = 0; - - index++; - } - } - - index = 0; - for (int i = 0; i < nData; i++) - for (int j = i; j < nData; j++) - { - real sumFij = 0, sumFi =0, sumFj = 0; - for (int k = 0; k < nrep; k++) - { - sumFij += Fnet[k][i]*Fnet[k][j]; - sumFi += Fnet[k][i]; - sumFj += Fnet[k][j]; - } - real Fijavg = 1.0/nrep*sumFij; - real Fiavg = 1.0/nrep*sumFi; - real Fjavg = 1.0/nrep*sumFj; - - if (nrep > 1) - cov[index] = nrep/(nrep-1)*(Fijavg-Fiavg*Fjavg); - else - cov[index] = 0; - - rho[index] = cov[index]/(sigtot[i]*Fiavg/1e2)/(sigtot[j]*Fjavg/1e2); - index++; - } - - est.fSigmaNet = ComputeAVG(nData, sigtot); - est.fCovNet = ComputeAVG(nData*(nData+1)/2, cov); - est.fRhoNet = ComputeAVG(nData*(nData+1)/2, rho); - - for (int i = 0; i < nrep; i++) - if (Fnet[i]) delete[] Fnet[i]; - delete[] Fnet; - - delete[] sigtot; - delete[] cov; - delete[] rho; - } - else - { - // need implementation - } -} - -/** - * Constructor - */ -DataSetResult::DataSetResult(PDFSet* pdf,DataSet const& dat): -fPDF(pdf), -fData(dat) -{ - fTheory = new ThPredictions(pdf,&dat); - ComputeChi2(dat,fTheory,fChi2); - ComputeEstimators(dat,fTheory, fEstimators); - fEstimators.fPhi = sqrt((fChi2.fChi2Avg - fChi2.fChi2Cent)/fChi2.fDOF); -} - -/** - * Destructor - */ -DataSetResult::~DataSetResult() -{ - delete[] fChi2.fChi2Mem; - delete fTheory; -} - -/** - * Constructor - */ -ExperimentResult::ExperimentResult(PDFSet* pdf, Experiment* exp): -fPDF(pdf), -fExperiment(exp) -{ - for (int i=0; iGetNSet(); i++) - { - fSetResults.push_back(new DataSetResult(pdf, exp->GetSet(i))); - fTheories.push_back(fSetResults[i]->GetTheory()); - } - - ComputeChi2(exp, fTheories, fChi2); - ComputeEstimators(exp, fTheories, fEstimators); - fEstimators.fPhi = sqrt((fChi2.fChi2Avg - fChi2.fChi2Cent)/fChi2.fDOF); - - return; -} - -/** - * Destructor - */ -ExperimentResult::~ExperimentResult() -{ - for (size_t i=0; i fs = settings.GetDataInfo(setname, useFilter); - vector mask = settings.GetDataMask(setname, useFilter); - auto weight = settings.GetSetInfo(setname).weight; - - // allocate commondata - CommonData cd = CommonData::ReadFile(fs[0], fs[1]); - - // Load fkset of tables - FKSet fk = LoadFK(settings, setname); - - // return dataset - if (mask.size() > 0) { - fk = FKSet(fk, mask); - } - return DataSet(cd, fk, weight); -} - -/** - * @brief LoadPositivitySet - * @param settings - * @param posname - * @param lambda - * @return - */ -PositivitySet LoadPositivitySet(NNPDFSettings const& settings, std::string const& posname, real const& lambda) -{ - // allocate commondata - CommonData cd = CommonData::ReadFile(get_data_path() + "/commondata/DATA_" + posname + ".dat", - get_data_path() + "/commondata/systypes/SYSTYPE_" + posname + "_DEFAULT.dat"); - // Load fkset of tables - FKTable fk(get_data_path() + "/" + settings.GetTheoryDirectory() + "/fastkernel/FK_" + posname + ".dat"); - - // return positivity set - return PositivitySet(cd,fk,lambda); -} - -/** - * @brief LoadFK - * @param settings - * @param setname - * @return - */ -FKSet LoadFK(NNPDFSettings const& settings, - std::string const& setname) -{ - const std::string theoryDir = settings.GetTheoryDirectory(); - const std::string theoryPath = get_data_path() + "/" + theoryDir + "/"; - - stringstream cfilename(""); - cfilename << theoryPath << "compound/" - << "FK_" << setname << "-COMPOUND.dat"; - - // allocating FKtables - vector nFK; - - int NSigma = 0; - SigmaOp op = FKSet::parseOperator("NULL"); - - ifstream compound(cfilename.str().c_str()); - if (compound) - { - string line; - while (getline(compound, line)) - { - - vector sline = split(line); - if (sline.size()==0) - continue; - - if (sline[0]=="OP:") - { - if (sline.size() > 1) - op = FKSet::parseOperator(sline[1]); - } - - if (sline[0]=="FK:") - if (sline.size()>1) - { - stringstream sigfilename(""); - sigfilename << theoryPath - << "fastkernel/" - << sline[1]; - - // load cfactors - vector cfactors; - for (int i = 0; i < (int) settings.GetSetInfo(setname).tCFactors.size(); i++) - { - const string cname = settings.GetSetInfo(setname).tCFactors[i]; - const string fname = sline[1].substr(3,sline[1].length()); - cfactors.push_back(get_data_path()+ "/" + theoryDir + "/cfactor/CF_"+cname+"_" + fname); - cout << Colour::FG_BLUE << "-- Reading "+cname+" C-factors from: " << cfactors[i] << Colour::FG_DEFAULT << endl; - } - - // Read FK Table - FKTable *newTable = new FKTable(sigfilename.str(), cfactors); - nFK.push_back(newTable); - NSigma++; - } - } - - if (NSigma==0) - { - cerr << "DataSet::ReadFK Error: No FastKernel Grids loaded"< cfactors; - for (int i = 0; i < (int) settings.GetSetInfo(setname).tCFactors.size(); i++) - { - const string cname = settings.GetSetInfo(setname).tCFactors[i]; - cfactors.push_back(get_data_path() + "/" + theoryDir + "/cfactor/CF_"+cname+"_" + setname + ".dat"); - cout << Colour::FG_BLUE << "-- Reading "+cname+" C-factors from: " << cfactors[i] << Colour::FG_DEFAULT << endl; - } - - // Read FK Table - FKTable *newTable = new FKTable(sigfilename.str(), cfactors); - - nFK.push_back(newTable); - NSigma++; - } - - // Verify FastKernel Tables - for (int i=0; i< NSigma; i++) settings.VerifyFK(nFK[i]); - - return FKSet(op, nFK); -} diff --git a/nnpdfcpp/src/common/src/md5.cc b/nnpdfcpp/src/common/src/md5.cc deleted file mode 100644 index a2fc5aa57f..0000000000 --- a/nnpdfcpp/src/common/src/md5.cc +++ /dev/null @@ -1,378 +0,0 @@ -/* MD5 - converted to C++ class by Frank Thilo (thilo@unix-ag.org) - for bzflag (http://www.bzflag.org) - - based on: - - md5.h and md5.c - reference implemantion of RFC 1321 - - Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All - rights reserved. - - License to copy and use this software is granted provided that it - is identified as the "RSA Data Security, Inc. MD5 Message-Digest - Algorithm" in all material mentioning or referencing this software - or this function. - - License is also granted to make and use derivative works provided - that such works are identified as "derived from the RSA Data - Security, Inc. MD5 Message-Digest Algorithm" in all material - mentioning or referencing the derived work. - - RSA Data Security, Inc. makes no representations concerning either - the merchantability of this software or the suitability of this - software for any particular purpose. It is provided "as is" - without express or implied warranty of any kind. - - These notices must be retained in any copies of any part of this - documentation and/or software. - - */ - -/* interface header */ -#include "md5.h" - -/* system implementation headers */ -#include - -using namespace std; - -// Constants for MD5Transform routine. -#define S11 7 -#define S12 12 -#define S13 17 -#define S14 22 -#define S21 5 -#define S22 9 -#define S23 14 -#define S24 20 -#define S31 4 -#define S32 11 -#define S33 16 -#define S34 23 -#define S41 6 -#define S42 10 -#define S43 15 -#define S44 21 - - -/////////////////////////////////////////////// - -// F, G, H and I are basic MD5 functions. -inline MD5::uint4 MD5::F(uint4 x, uint4 y, uint4 z) { - return (x&y) | (~x&z); -} - -inline MD5::uint4 MD5::G(uint4 x, uint4 y, uint4 z) { - return (x&z) | (y&~z); -} - -inline MD5::uint4 MD5::H(uint4 x, uint4 y, uint4 z) { - return x^y^z; -} - -inline MD5::uint4 MD5::I(uint4 x, uint4 y, uint4 z) { - return y ^ (x | ~z); -} - -// rotate_left rotates x left n bits. -inline MD5::uint4 MD5::rotate_left(uint4 x, int n) { - return (x << n) | (x >> (32-n)); -} - -// FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4. -// Rotation is separate from addition to prevent recomputation. -inline void MD5::FF(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac) { - a = rotate_left(a+ F(b,c,d) + x + ac, s) + b; -} - -inline void MD5::GG(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac) { - a = rotate_left(a + G(b,c,d) + x + ac, s) + b; -} - -inline void MD5::HH(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac) { - a = rotate_left(a + H(b,c,d) + x + ac, s) + b; -} - -inline void MD5::II(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac) { - a = rotate_left(a + I(b,c,d) + x + ac, s) + b; -} - -////////////////////////////////////////////// - -// default ctor, just initailize -MD5::MD5() -{ - init(); -} - -////////////////////////////////////////////// - -// nifty shortcut ctor, compute MD5 for string and finalize it right away -MD5::MD5(const std::string &text) -{ - init(); - update(text.c_str(), text.length()); - finalize(); -} - -////////////////////////////// - -void MD5::init() -{ - finalized=false; - - count[0] = 0; - count[1] = 0; - - // load magic initialization constants. - state[0] = 0x67452301; - state[1] = 0xefcdab89; - state[2] = 0x98badcfe; - state[3] = 0x10325476; -} - -////////////////////////////// - -// decodes input (unsigned char) into output (uint4). Assumes len is a multiple of 4. -void MD5::decode(uint4 output[], const uint1 input[], size_type len) -{ - for (unsigned int i = 0, j = 0; j < len; i++, j += 4) - output[i] = ((uint4)input[j]) | (((uint4)input[j+1]) << 8) | - (((uint4)input[j+2]) << 16) | (((uint4)input[j+3]) << 24); -} - -////////////////////////////// - -// encodes input (uint4) into output (unsigned char). Assumes len is -// a multiple of 4. -void MD5::encode(uint1 output[], const uint4 input[], size_type len) -{ - for (size_type i = 0, j = 0; j < len; i++, j += 4) { - output[j] = input[i] & 0xff; - output[j+1] = (input[i] >> 8) & 0xff; - output[j+2] = (input[i] >> 16) & 0xff; - output[j+3] = (input[i] >> 24) & 0xff; - } -} - -////////////////////////////// - -// apply MD5 algo on a block -void MD5::transform(const uint1 block[blocksize]) -{ - uint4 a = state[0], b = state[1], c = state[2], d = state[3], x[16]; - decode (x, block, blocksize); - - /* Round 1 */ - FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */ - FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */ - FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */ - FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */ - FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */ - FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */ - FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */ - FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */ - FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */ - FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */ - FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */ - FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */ - FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */ - FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */ - FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */ - FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */ - - /* Round 2 */ - GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */ - GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */ - GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */ - GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */ - GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */ - GG (d, a, b, c, x[10], S22, 0x2441453); /* 22 */ - GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */ - GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */ - GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */ - GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */ - GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */ - GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */ - GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */ - GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */ - GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */ - GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */ - - /* Round 3 */ - HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */ - HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */ - HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */ - HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */ - HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */ - HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */ - HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */ - HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */ - HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */ - HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */ - HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */ - HH (b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */ - HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */ - HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */ - HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */ - HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */ - - /* Round 4 */ - II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */ - II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */ - II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */ - II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */ - II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */ - II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */ - II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */ - II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */ - II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */ - II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */ - II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */ - II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */ - II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */ - II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */ - II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */ - II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */ - - state[0] += a; - state[1] += b; - state[2] += c; - state[3] += d; - - // Zeroize sensitive information. - memset(x, 0, sizeof x); -} - -////////////////////////////// - -// MD5 block update operation. Continues an MD5 message-digest -// operation, processing another message block -void MD5::update(const unsigned char input[], size_type length) -{ - // compute number of bytes mod 64 - size_type index = count[0] / 8 % blocksize; - - // Update number of bits - if ((count[0] += (length << 3)) < (length << 3)) - count[1]++; - count[1] += (length >> 29); - - // number of bytes we need to fill in buffer - size_type firstpart = 64 - index; - - size_type i; - - // transform as many times as possible. - if (length >= firstpart) - { - // fill buffer first, transform - memcpy(&buffer[index], input, firstpart); - transform(buffer); - - // transform chunks of blocksize (64 bytes) - for (i = firstpart; i + blocksize <= length; i += blocksize) - transform(&input[i]); - - index = 0; - } - else - i = 0; - - // buffer remaining input - memcpy(&buffer[index], &input[i], length-i); -} - - -////////////////////////////// - -// for convenience provide a verson with signed char -void MD5::update(const char input[], size_type length) -{ - update((const unsigned char*)input, length); -} - -// update with stream ---nh -void MD5::update(std::istream& stream){ - - char buffer[1024]; - - while (stream.good()){ - stream.read(buffer, 1024); // note that return value of read is unusable. - size_t len=stream.gcount(); - update(buffer, len); - } - -} - -////////////////////////////// - -// MD5 finalization. Ends an MD5 message-digest operation, writing the -// the message digest and zeroizing the context. -MD5& MD5::finalize() -{ - static unsigned char padding[64] = { - 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - }; - - if (!finalized) { - // Save number of bits - unsigned char bits[8]; - encode(bits, count, 8); - - // pad out to 56 mod 64. - size_type index = count[0] / 8 % 64; - size_type padLen = (index < 56) ? (56 - index) : (120 - index); - update(padding, padLen); - - // Append length (before padding) - update(bits, 8); - - // Store state in digest - encode(digest, state, 16); - - // Zeroize sensitive information. - memset(buffer, 0, sizeof buffer); - memset(count, 0, sizeof count); - - finalized=true; - } - - return *this; -} - -////////////////////////////// - -// return hex representation of digest as string -std::string MD5::hexdigest() const -{ - if (!finalized) - return ""; - - char buf[33]; - for (int i=0; i<16; i++) - sprintf(buf+i*2, "%02x", digest[i]); - buf[32]=0; - - return std::string(buf); -} - -////////////////////////////// - -std::ostream& operator<<(std::ostream& out, MD5 md5) -{ - return out << md5.hexdigest(); -} - -////////////////////////////// - -std::string md5(const std::string str) -{ - MD5 md5 = MD5(str); - - return md5.hexdigest(); -} diff --git a/nnpdfcpp/src/common/src/nnpdfsettings.cc b/nnpdfcpp/src/common/src/nnpdfsettings.cc deleted file mode 100644 index 882800790f..0000000000 --- a/nnpdfcpp/src/common/src/nnpdfsettings.cc +++ /dev/null @@ -1,677 +0,0 @@ -// $Id: nnpdfsettings.cc 2478 2015-02-03 13:23:12Z s1044006 $ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -#include -#include -#include -#include -#include -#include -#include - -#include "nnpdfsettings.h" -#include "version.h" - -// Strings for config file output -static const string minString[6] = {"UNDEFINED", "GA", "NGA", "NGAFT","CMAES"}; -static const string stopString[6] = {"UNDEFINED", "FIXEDLENGTH", "LOOKBACK"}; -static const string paramString[6] = {"UNDEFINED", "NN", "SLN", "SLNPP"}; -static const string basisString[19]= {"UNDEFINED", "NN23", "NN23QED","EVOL", "EVOLQED","EVOLS", - "EVOLSQED","NN30", "NN30QED","FLVR", "FLVRQED","NN30IC", - "EVOLIC","NN31IC","LUX", "NN31ICQED", "NSR", "DISEVOL","PDF4LHC20"}; - -static const vector< vector > basiselem = { {}, - {"sng","g","v","t3","ds","sp","sm"}, //NN23 - {"sng","g","v","t3","ds","sp","sm","pht"}, //NN23QED - {"sng","g","v","v3","v8","t3","t8"}, //EVOL - {"sng","g","v","v3","v8","t3","t8","pht"}, //EVOLQED - {"sng","g","v","v8","t3","t8","ds"}, //EVOLS - {"sng","g","v","v8","t3","t8","ds","pht"}, //EVOLSQED - {"sng","g","v","v8","t3","t8","ds"}, //NN30 - {"sng","g","v","v8","t3","t8","ds","pht"}, //NN30QED - {"g","u","ubar","d","dbar","s","sbar"}, //FLVR - {"g","u","ubar","d","dbar","s","sbar","pht"}, //FLVRQED - {"sng","g","v","t3","ds","sp","sm","cp"}, //NN30IC - {"sng","g","v","v3","v8","t3","t8","t15"}, //EVOLIC - {"sng","g","v","v3","v8","t3","t8","cp"}, //NN31IC - {"sng","g","v","v3","v8","t3","t8","cp"}, //LUX - {"sng","g","v","v3","v8","t3","t8","cp","pht"},//NN31ICQED - {"sng","g","v","v3","v8","t3","t8","cp"}, //NSR - {"sng","g","t8"}, //DISEVOL (Isoscalar) - {"sng","g","v","v3","t3","t8"} //PDF4LHC20 - }; - -/* Convert string to enum */ -minType NNPDFSettings::getFitMethod(string const& method) -{ - if (method.compare("GA") == 0) return MIN_GA; - if (method.compare("NGA") == 0) return MIN_NGA; - if (method.compare("NGAFT") == 0) return MIN_NGAFT; - if (method.compare("CMAES") == 0) return MIN_CMAES; - - cerr << "getFitMethod Error: Invalid fit method: "<(); - if ( theoryID < 0) throw RangeError("NNPDFSettings::NNPDFSettings", "Invalid Theory ID"); - - - stringstream td; - td << "theory_" << theoryID; - fTheoryDir = td.str(); - - // Check if theory uncertainties are used - if (Exists("theorycovmatconfig")) - { - fThUncertainties = true; - - // Check where theory uncertainties should be used - if (Get("theorycovmatconfig","use_thcovmat_in_sampling").as()) - fThCovSampling = true; - if (Get("theorycovmatconfig","use_thcovmat_in_fitting").as()) - fThCovFitting = true; - } - - // load theory map - IndexDB db(get_data_path() + "/theory.db", "theoryIndex"); - auto keys = APFEL::kValues; - keys.push_back("EScaleVar"); - db.ExtractMap(theoryID, keys, fTheory); - - cout << "==== Theory summary" << endl; - for (size_t i = 0; i < APFEL::kValues.size(); i++) - cout << "- " << APFEL::kValues[i] << " : " << fTheory.at(APFEL::kValues[i]) << endl; - - // check basis in yaml file - CheckBasis(); - - // Load GA parameters - LoadGA(); - - // Init Random Number generator - RandomGenerator::InitRNG(Get("fitting","rngalgo").as(), - Get("fitting","seed").as()); - - // Allocate Integrator workspace - // Error handling - if (Get("debug").as()) - fGSL_old_handler=gsl_set_error_handler (&nnpdf_GSLhandler); - else - fGSL_old_handler=gsl_set_error_handler_off(); - fGSLWork = gsl_integration_workspace_alloc (10000); - - // Load experiments - LoadExperiments(); - - // Load positivity sets - LoadPositivities(); -} - -/** - * Destroys the variables - */ -NNPDFSettings::~NNPDFSettings() -{ - gsl_integration_workspace_free (fGSLWork); - gsl_set_error_handler(fGSL_old_handler); -} - -YAML::Node NNPDFSettings::Get(const string& item) const -{ - if (!fConfig[item]) - { - cerr << Colour::FG_RED << "\nNNPDFSettings::Get error: item not available " << item << Colour::FG_DEFAULT << endl; - exit(EXIT_FAILURE); - } - return fConfig[item]; -} - -YAML::Node NNPDFSettings::Get(const string& node, const string& item) const -{ - if (!fConfig[node][item]) - { - cerr << Colour::FG_RED << "\nNNPDFSettings::Get error: item not available " << node << " " << item << Colour::FG_DEFAULT << endl; - exit(EXIT_FAILURE); - } - return fConfig[node][item]; -} - -bool NNPDFSettings::Exists(const string &item) const -{ - return !fConfig[item] ? false : true; -} - -bool NNPDFSettings::Exists(const string &node, const string &item) const -{ - return !fConfig[node][item] ? false : true; -} - -YAML::Node NNPDFSettings::GetPlotting(const string &item) const -{ - if (!fPlotting[item]) - { - cerr << Colour::FG_RED << "\nNNPDFSettings::Get error: item not available " << item << Colour::FG_DEFAULT << endl; - exit(EXIT_FAILURE); - } - return fPlotting[item]; -} - -/** - * @brief NNPDFSettings::GetdataInfo - * @param setname - * @return - */ -vector NNPDFSettings::GetDataInfo(const string &setname, filterType useFiltered) const -{ - // Target data directory, if useFiltered is false, read from global data - string targetpath; - if (!useFiltered) - targetpath = get_data_path() + "/commondata" ; - else - targetpath = fResultsDir + "/filter/" + setname ; - - vector basepath(2); - basepath[0] = targetpath + "/DATA_"+ setname + ".dat"; - basepath[1] = targetpath + "/systypes/SYSTYPE_"+ setname + "_" + - GetSetInfo(setname).tSysOpt + ".dat"; - - return basepath; -} - -/** - * @brief NNPDFSettings::GetdataInfo - * @param setname - * @return - */ -vector NNPDFSettings::GetDataMask(const string &setname, filterType useFiltered) const -{ - // Target data directory, if useFiltered is false, read from global data - vector mask; - if (useFiltered) - { - string targetpath = fResultsDir + "/filter/" + setname + "/FKMASK_" + setname + ".dat"; - ifstream f(targetpath, ios::in); - - if (f.good()) - { - cout << Colour::FG_YELLOW << "NNPDFSettings::GetDataMask: reading mask for " << setname << Colour::FG_DEFAULT << endl; - int v; - while(f >> v) mask.push_back(v); - f.close(); - } - else - cout << Colour::FG_YELLOW << "NNPDFSettings::GetDataMask warning: no filtered points for " << setname << Colour::FG_DEFAULT << endl; - } - return mask; -} - -/** - * \param setname the name of the dataset under search - */ -DataSetInfo const& NNPDFSettings::GetSetInfo(string const& setname) const -{ - return fDataSetInfo.at(setname); -} - -/** - * \param posname the name of the positivity set under search - */ -PosSetInfo const& NNPDFSettings::GetPosInfo(string const& posname) const -{ - return fPosSetInfo.at(posname); -} - -// Verify configuration file is unchanged w.r.t filter.log -void NNPDFSettings::VerifyConfiguration() const -{ - cout <> md5; - - MD5 targetHash; - targetHash.update(targetConfig); - targetHash.finalize(); - - cout << " Current Log MD5: "< 1e-8 ) - { - cerr << Colour::FG_RED << "NNPDFSettings::VerifyFK Error: FastKernel Table " - <<" does not satisfy global " <GetTag(TI, APFEL::kValues[i]) ) ); - - if (!pV) throw RuntimeException("NNPDFSettings::VerifyFK","mismatch between db and FKTable"); -} - -/** - * @brief NNPDFSettings::PrintConfiguration print the yaml file to disk - * @param filename - */ -void NNPDFSettings::PrintConfiguration(const string& filename) const -{ - fstream i( fFileName.c_str(), ios::in | ios::binary); - fstream f( (fResultsDir + "/" + filename).c_str(), ios::out | ios::binary); - if (i.fail() || f.fail()) { throw FileError("NNPDFSettings::PrintConfiguration","file failed."); } - f << i.rdbuf(); - f.close(); - i.close(); -} - -/** - * @brief NNPDFSettings::PrintConfiguration - * @param filename - */ -void NNPDFSettings::PrintTheory(const string& filename) const -{ - fstream f( (fResultsDir + "/" + filename).c_str(), ios::out | ios::binary); - if (f.fail()) { throw FileError("NNPDFSettings::PrintConfiguration","file failed."); } - for (size_t i = 0; i < APFEL::kValues.size(); i++) - f << APFEL::kValues[i] << "\t: " << fTheory.at(APFEL::kValues[i]) << endl; - f.close(); -} - -/** - * @brief NNPDFSettings::Splash print the NNPDF splash - */ -void NNPDFSettings::Splash() const -{ - cout << Colour::FG_BLUE << endl; - cout << " ███╗ ██╗███╗ ██╗██████╗ ██████╗ ███████╗ " << endl; - cout << " ████╗ ██║████╗ ██║██╔══██╗██╔══██╗██╔════╝ " << endl; - cout << " ██╔██╗ ██║██╔██╗ ██║██████╔╝██║ ██║█████╗ " << endl; - cout << " ██║╚██╗██║██║╚██╗██║██╔═══╝ ██║ ██║██╔══╝ " << endl; - cout << " ██║ ╚████║██║ ╚████║██║ ██████╔╝██║ " << endl; - cout << " ╚═╝ ╚═══╝╚═╝ ╚═══╝╚═╝ ╚═════╝ ╚═╝ 2012-2015" << Colour::FG_DEFAULT <()); - - // List of datasets in experiment - vector nsetname; - - if (exps[i]["datasets"].size() == 0) { - cerr << Colour::FG_RED - << "NNPDFSettings::LoadExperiments error: experiment " - << exps[i]["experiment"] << " has no datasets!" << Colour::FG_DEFAULT - << endl; - exit(EXIT_FAILURE); - } - - // loop over datasets - YAML::Node dsets = exps[i]["datasets"]; - for (const auto &ds : dsets) - { - const string setname = ds["dataset"].as(); - const real setfrac = ds["frac"].as(); - - // Read systematic type - string setsys; - if(ds["sys"]){ - setsys = ds["sys"].as(); - }else{ - setsys = "DEFAULT"; - } - - // Read C-factor sources - std::vector cfactors; - if(ds["cfac"]){ - auto cfac = ds["cfac"]; - for (size_t k = 0; k < cfac.size(); k++) { - std::stringstream cfs; - cfs << cfac[k]; - cfactors.push_back(cfs.str()); - } - } - - // Read weights - double weight; - if (ds["weight"]) { - weight = ds["weight"].as(); - }else{ - weight = 1; - } - - if (fDataSetInfo.count(setname) == 1) - throw RuntimeException("NNPDFSettings::LoadExperiments","Duplicate key: " + setname); - - DataSetInfo info = {setname, setsys, setfrac, cfactors, weight}; - fDataSetInfo.insert(make_pair(setname, info)); - - nsetname.push_back(setname); - fSetName.push_back(setname); - } - - fExpSetName.push_back(nsetname); - } -} - -/** - * @brief NNPDFSettings::LoadPositivities same as LoadExperiments but - * for positivity observables - */ -void NNPDFSettings::LoadPositivities() -{ - YAML::Node pos = fConfig["positivity"]["posdatasets"]; - - // loop over positivity obs - for (int i = 0; i < (int) pos.size(); i++) - { - const string posname = pos[i]["dataset"].as(); - const real poslambda = pos[i]["poslambda"].as(); - - if (fPosSetInfo.count(posname) == 1) - throw RuntimeException("NNPDFSettings::LoadPositivities","Duplicate key: " + posname); - - fPosName.push_back(posname); - PosSetInfo info = {posname, poslambda}; - fPosSetInfo.insert(make_pair(posname, info)); - } -} - -/** - * @brief NNPDFSettings::LoadPlotFile - * @param plotfile - */ -void NNPDFSettings::SetPlotFile(string const& plotfile) -{ - // read plotting options - try { - fPlotting = YAML::LoadFile(plotfile); - } catch(YAML::BadFile &) { - throw FileError("NNPDFSettings::SetPlotFile", "runcard not found: " + plotfile); - } -} - -bool NNPDFSettings::SavePseudodata() const -{ - if (NNPDFSettings::Exists("fitting", "savepseudodata")) - return Get("fitting", "savepseudodata").as(); - return false; -} - - -bool NNPDFSettings::IsQED() const -{ - const basisType isqed = NNPDFSettings::getFitBasisType(Get("fitting","fitbasis").as()); - if (isqed == BASIS_EVOLQED || isqed == BASIS_EVOLSQED || - isqed == BASIS_FLVRQED || isqed == BASIS_NN23QED || - isqed == BASIS_LUX || isqed == BASIS_NN31ICQED) - return true; - return false; -} - -bool NNPDFSettings::IsIC() const -{ - const basisType isic = NNPDFSettings::getFitBasisType(Get("fitting","fitbasis").as()); - if (isic == BASIS_EVOLIC || isic == BASIS_NN30IC || isic == BASIS_NN31IC || - isic == BASIS_LUX || isic == BASIS_NN31ICQED) - return true; - return false; -} - -void NNPDFSettings::CheckBasis() -{ - vector basis = basiselem[getFitBasisType(Get("fitting","fitbasis").as())]; - - if (basis.size() != Get("fitting","basis").size()) - { - cerr << Colour::FG_RED << "NNPDFSettings::CheckBasis error, mismatch between fitbasis and basis size" << Colour::FG_DEFAULT << endl; - exit(EXIT_FAILURE); - } - - // check order and names - for (int i = 0; i < (int) Get("fitting","basis").size(); i++) - if (basis[i].compare(Get("fitting","basis")[i]["fl"].as()) != 0) - { - cerr << Colour::FG_RED << "NNPDFSettings::CheckBasis error, mismatch between basis items, expected " - << basis[i] << ", received " << Get("fitting","basis")[i]["fl"].as() << Colour::FG_DEFAULT << endl; - exit(EXIT_FAILURE); - } -} - -int NNPDFSettings::GetNFL() const -{ - return (int) Get("fitting","basis").size(); -} - -void NNPDFSettings::LoadGA() -{ - // for each flavor check mutation array size and probability array size - for (int f = 0; f < GetNFL(); f++) - { - if (Get("fitting","basis")[f]["mutsize"].size() != Get("fitting","basis")[f]["mutprob"].size()) - { - cerr << Colour::FG_RED << "NNPDFSettings::LoadGA error, mismatch between mutsize and mutprob for flavor " - << Get("fitting","basis")[f]["fl"].as() << Colour::FG_DEFAULT << endl; - exit(EXIT_FAILURE); - } - else - { - FlMutProperty p = { Get("fitting","basis")[f]["mutsize"].as >(), Get("fitting","basis")[f]["mutprob"].as >()}; - fFlMutProperty.push_back(p); - } - } - - // Load architecture - fArch = Get("fitting","nnodes").as >(); -} diff --git a/nnpdfcpp/src/evolvefit/src/evolvefit.cc b/nnpdfcpp/src/evolvefit/src/evolvefit.cc deleted file mode 100644 index a628111594..0000000000 --- a/nnpdfcpp/src/evolvefit/src/evolvefit.cc +++ /dev/null @@ -1,149 +0,0 @@ -// $Id$ -// -// NNPDF++ 2016 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -#include -#include -#include "common.h" -#include "nnpdfsettings.h" -#include "exportgrid.h" -#include "evolgrid.h" -#include -using namespace NNPDF; -using std::cout; -using std::endl; -using std::cerr; -using std::string; -using std::stoi; - -// Create cascade of folders for output -void CreateResultsFolder(const NNPDFSettings &settings, const int theory_id) -{ - stringstream folder(""); - folder << settings.GetResultsDirectory() << "/evolvefit"; - int status = mkdir(folder.str().c_str(), 0777); - if (status == -1 && errno != EEXIST) - throw FileError("CreateResultsFolder", "Cannot create folder " + folder.str()); - folder << "/theory_" << theory_id << "-" << settings.GetPDFName(); - status = mkdir(folder.str().c_str(), 0777); - if (status == -1 && errno != EEXIST) - throw FileError("CreateResultsFolder", "Cannot create folder " + folder.str()); -} - -// Check if folder exists -bool CheckFolderExists(string const& folder) -{ - bool status = false; - struct stat s; - if (stat(folder.c_str(), &s) == 0) - if (s.st_mode & S_IFDIR) - status = true; - return status; -} - -// Compute average array -vector> ComputeAVGPDFgrid(vector>> eg) -{ - vector> result(eg[0].size(), array{}); - for (size_t row = 0; row < eg[0].size(); row++) - for (size_t rep = 0; rep < eg.size(); rep++) - for (size_t fl = 0; fl < 14; fl++) - result[row][fl] += eg[rep][row][fl]/eg.size(); - return result; -} - -/** - * This program: - * - takes as input a fit folder and a theoryID, - * - loads a vector of ExportGrid for all replicas generated by nnfit, - * - computes the DGLAP evolution operators for the theoryID - * - applies the evolution operators to the ExportGrid objects - * - outputs the evolved PDFs in the LHAPDF format to the fit folder. - */ -int main(int argc, char **argv) -{ - // Read configuration filename from arguments - if (argc != 3) - { - cerr << Colour::FG_RED << "\nusage: evolvefit [configuration folder] [theoryid]\n" << Colour::FG_DEFAULT << endl; - exit(EXIT_FAILURE); - } - - const string fit_path = argv[1]; - const int theory_id = stoi(argv[2]); - - // load settings from config folder - NNPDFSettings settings(fit_path); - - // check if user is not doing something stupid... - if (theory_id == stoi(settings.GetTheory("ID"))) - throw NNPDF::RuntimeException("main", "Same theory ID for the original fit and this evolvefit run."); - - // load theory from db - std::map theory_map; - NNPDF::IndexDB db(get_data_path() + "/theory.db", "theoryIndex"); - auto keys = APFEL::kValues; - keys.push_back("EScaleVar"); - db.ExtractMap(theory_id, keys, theory_map); - - // create output folder - CreateResultsFolder(settings, theory_id); - - // load grids - vector initialscale_grids; - int nrep; - for (nrep = 0;; nrep++) - { - const string folder = fit_path + "/postfit/replica_" + std::to_string(nrep+1); - bool status = CheckFolderExists(folder); - if (status) - { - const string path = folder + "/" + settings.GetPDFName() + ".exportgrid"; - cout << "- Reading exportgrid: " << path << endl; - initialscale_grids.emplace_back(path); - - // take first replica and duplicate entry, we will use it as baseline for replica 0 - if (nrep == 0) - initialscale_grids.emplace_back(path); - } - else - break; - } - cout << "- Detected " << nrep << " replicas (contiguous)." << endl; - - if (nrep == 0) - throw NNPDF::RuntimeException("main", "nrep = 0, check replica folder/files."); - - // compute avg over pdfgrid and set to replica 0 - if someone has a better idea let me know - vector>> pdfgridvectors(initialscale_grids.size()-1); - for (size_t i = 0; i < pdfgridvectors.size(); i++) - pdfgridvectors[i] = initialscale_grids[i+1].GetPDFgrid(); - const auto rep0pgrid = ComputeAVGPDFgrid(pdfgridvectors); - - // replace content of replica 0 - initialscale_grids[0].SetPDFgrid(rep0pgrid); - - string infofile = fit_path + "/evolvefit/theory_" + std::to_string(theory_id) - + "-" + settings.GetPDFName() + "/" + "theory_" + std::to_string(theory_id) - + "-" + settings.GetPDFName() + ".info"; - auto dglapg = EvolveGrid(initialscale_grids, theory_map); - dglapg.WriteInfoFile(infofile, initialscale_grids.size()); - - const auto outstream = dglapg.WriteLHAFile(); - for (size_t i = 0; i < outstream.size(); i++) - { - stringstream replica_file; - replica_file << fit_path - << "/evolvefit/theory_" << theory_id - << "-" << settings.GetPDFName() - << "/" << "theory_" << theory_id - << "-" << settings.GetPDFName() << "_" - << std::setfill('0') << std::setw(4) << i << ".dat"; - write_to_file(replica_file.str(), outstream[i].str()); - } - - return 0; -} diff --git a/nnpdfcpp/src/fiatlux/src/fiatlux.cc b/nnpdfcpp/src/fiatlux/src/fiatlux.cc deleted file mode 100644 index 355487c39a..0000000000 --- a/nnpdfcpp/src/fiatlux/src/fiatlux.cc +++ /dev/null @@ -1,479 +0,0 @@ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -/** - * @brief Interface with luxqed code. - * - * This code performs the following operations: - * - read input runcard and extract the name of input LHAPDF replica and theory id. - * - setup APFEL DIS module using theory id and caching - * - load APFEL evolution module with QCDxQED evolution - * - compute/cache structure functions using input LHAPDF partons with its DGLAP - * - generate photon PDF using libfiatlux at Q = 100 GeV and APFEL - * - back-evolve all partons to Q0 (see db) using QCDxQED evolution - * - override gluon and quarks with LHAPDF output at Q0 - * - compute MSR at Q0 and rescale gluon in order to reduce violation - * - dump replica with photon at Q0 using the original LHAPDF grid in x. - */ - -#include "nnpdfsettings.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -using namespace fiatlux; -using namespace std; - -double APFELF2(double const& x, double const& Q) -{ - return APFEL::StructureFunctionxQ("EM", "F2", "total", x, Q); -} - -double APFELFL(double const& x, double const& Q) -{ - return APFEL::StructureFunctionxQ("EM", "FL", "total", x, Q); -} - -class lux -{ -public: - lux(): - _addnoise(true) - { - // FiatLux setup - _lux = new FiatLux{get_config_path() + "fiatlux.yml"}; - _lux->PlugAlphaQED(APFEL::AlphaQED); // using default Qref = me - _lux->PlugStructureFunctions(APFELF2, APFELFL, APFEL::F2LO); - } - - void add_noise(bool add_noise) { _addnoise = add_noise; } - - ~lux() - { - delete _lux; - delete _pdf; - } - - void loadPDF(string const& pdfname, int const& replica, vector const& xgrid, double Q) - { - _pdf = LHAPDF::mkPDF(pdfname, replica); - const LHAPDF::GridPDF& pdf = *dynamic_cast(_pdf); - _xgrid = pdf.xKnots(); - if (_addnoise) generateErrors(replica, xgrid, Q); - } - - void generateErrors(int replica, vector const& xgrid, double Q) - { - cout << "Generating extra LUX17 errors for replica " << replica << endl; - auto set = LHAPDF::mkPDFs("LUXqed17_plus_PDF4LHC15_nnlo_100"); - - gsl_matrix *X = gsl_matrix_alloc(xgrid.size(), 7); - gsl_matrix *V = gsl_matrix_alloc(7, 7); - gsl_vector *s = gsl_vector_alloc(7); - gsl_vector *work = gsl_vector_alloc(7); - - // fill X matrix - for (int i = 0; i < (int) xgrid.size(); i++) - for (int rep = 101; rep < 108; rep++) - gsl_matrix_set(X, i, rep-101, set[rep]->xfxQ(22, xgrid[i], Q)-set[0]->xfxQ(22, xgrid[i], Q)); - - int status = gsl_linalg_SV_decomp(X, V, s, work); - if (status != GSL_SUCCESS) - throw NNPDF::RuntimeException("generateErrors", "SVD failed"); - - gsl_vector *r = gsl_vector_alloc(7); - for (int i = 0; i < 7; i++) - gsl_vector_set(r, i, NNPDF::RandomGenerator::GetRNG()->GetRandomGausDev(gsl_vector_get(s, i))); - - gsl_vector *result = gsl_vector_alloc(xgrid.size()); - status = gsl_blas_dgemv(CblasNoTrans, 1.0, X, r, 0.0, result); - if (status != GSL_SUCCESS) - throw NNPDF::RuntimeException("generateErrors", "A*x failed"); - - for (size_t i = 0; i < xgrid.size(); i++) - _noise[xgrid[i]] = gsl_vector_get(result, i); - - gsl_matrix_free(X); - gsl_matrix_free(V); - gsl_vector_free(s); - gsl_vector_free(work); - gsl_vector_free(r); - gsl_vector_free(result); - } - - FiatLux const& getLux() const { return *_lux; } - vector const& getXgrid() const { return _xgrid; } - - double xfxQ(int const& id, double const& x, double const& Q) const - { - if (id != 22) - return _pdf->xfxQ(id, x, Q); - else - { - cout << setprecision(15) << scientific; - const auto pht = _lux->EvaluatePhoton(x, Q*Q); - cout << x << "\t" - << Q << "\t" - << pht.elastic << "\t" - << pht.inelastic_pf << "\t" - << pht.msbar_pf << "\t" - << pht.total << "\t"; - if (_addnoise) - { - const double r = pht.total + _noise.at(x); - cout << r << endl; - return r; - } - else - { - cout << endl; - return pht.total; - } - } - } - -private: - FiatLux* _lux; - LHAPDF::PDF* _pdf; - vector _xgrid; - bool _addnoise; - map _noise; -}; - -lux& luxInstance() -{ - static lux l; - return l; -} - -extern "C" void externalsetapfel_(const double& x, const double& Q, double *xf) -{ - for (int i = 0; i < 13; i++) - xf[i] = luxInstance().xfxQ(i-6, x, Q); - xf[13] = luxInstance().xfxQ(22, x, Q); -} - -struct param {double Q;}; - -double xphoton(double x, void *p) -{ - return APFEL::xgammaj(x); -} - -double xgluon(double x, void *p) -{ - struct param * par = (struct param *) p; - return luxInstance().xfxQ(21, x, par->Q); -} - -double xsinglet(double x, void *p) -{ - struct param * par = (struct param *) p; - double sum = 0; - for (int i = 1; i < 7; i++) - sum += luxInstance().xfxQ(i, x, par->Q)+luxInstance().xfxQ(-i, x, par->Q); - return sum; -} - -double SR(double (*f)(double,void*), double const& q) -{ - //size_t neval; - gsl_function F; - F.function = f; - struct param o = {q}; - F.params = &o; - - gsl_integration_workspace * w = gsl_integration_workspace_alloc (10000); - - double int_res, int_err; - int status = gsl_integration_qags (&F, 1e-9, 1, 0, 1E-4, 10000, w, &int_res, &int_err); - if (status == GSL_EDIVERGE || status == GSL_ESING || status == GSL_EROUND) - cout << "integration error" << endl; - - gsl_integration_workspace_free (w); - cout << "Final integral: " << int_res << " +/- " << int_err << endl; - - return int_res; -} - -// Set the RNG seed from replica id -void SetSeed(int const& replica) -{ - unsigned long int seed = 0; - for (int i = 0; i < replica; i++) - seed = RandomGenerator::GetRNG()->GetRandomInt(); - RandomGenerator::GetRNG()->SetSeed(seed); -} - -int main(int argc, char **argv) -{ - // Read configuration filename from arguments - int replica = 0; - bool noise_status = false; - string folder = ""; - if (argc > 2) - { - replica = atoi(argv[1]); - folder.assign(argv[2]); - if (folder == "--help") - { - cout << "\nusage: fiatlux [replica] [configuration folder] [add_noise (default 0)]\n" << endl; - exit(-1); - } - if (argc == 4) - noise_status = atoi(argv[3]); - - cout << "Add LUX noise " << noise_status << endl; - } - else - { - cerr << Colour::FG_RED << "\nusage: fiatlux [replica] [configuration folder] [add_noise (default 0)]\n" << endl; - exit(-1); - } - - // Creates the configuration class - NNPDFSettings settings(folder); - settings.VerifyConfiguration(); - - SetSeed(replica); - const double q0 = 100.0, q = stod(settings.GetTheory(APFEL::kQ0)); - - // write grid to disk - mkdir(settings.GetResultsDirectory().c_str(),0777); - mkdir((settings.GetResultsDirectory() + "/fiatlux").c_str(),0777); - - // APFEL setup - APFEL::SetParam(settings.GetTheoryMap()); - APFEL::SetTheory("QUniD"); - APFEL::EnableNLOQEDCorrections(true); - // if the input set comes from pure QCD fit disable NLO QED corrections to SF. - if (!stoi(settings.GetTheory(APFEL::kQED))) APFEL::EnableSFNLOQEDCorrections(false); - - APFEL::EnableTargetMassCorrections(false); - APFEL::SetAlphaQEDRef(1/137.035999074, 0.000510998946); - APFEL::SetPDFSet(settings.GetPDFName() + ".LHgrid"); - APFEL::SetReplica(replica); - APFEL::SetQLimits(1,1e7); - APFEL::SetQGridParameters(50, 3); - - // same as subgrids but placed in a single external grid - double X1[116] = - { - 9.899999999999958e-10, - 1.538963162368109e-09, - 2.392330902522641e-09, - 3.718898025545315e-09, - 5.781057379904881e-09, - 8.986700644574379e-09, - 1.396989838731223e-08, - 2.171631753325463e-08, - 3.375818301310580e-08, - 5.247734521816752e-08, - 8.157639593728360e-08, - 1.268110100678136e-07, - 1.971283480837295e-07, - 3.064366425462070e-07, - 4.763558669302165e-07, - 7.404932670225911e-07, - 1.151088728733395e-06, - 1.789342686820711e-06, - 2.781465217412775e-06, - 4.323610650625180e-06, - 6.720605219458292e-06, - 1.044606883713134e-05, - 1.623568020739690e-05, - 2.523168870470714e-05, - 3.920642833320926e-05, - 6.090705255591768e-05, - 9.458490613496754e-05, - 1.468028662326850e-04, - 2.276534223068800e-04, - 3.525654590937107e-04, - 5.449124639903834e-04, - 8.396149234448354e-04, - 1.287758421500100e-03, - 1.961760450389215e-03, - 2.959633215409777e-03, - 4.405479975417163e-03, - 6.442398615320905e-03, - 9.215357825053531e-03, - 1.284673206226925e-02, - 1.741349919922833e-02, - 2.293630217252164e-02, - 2.938398329833947e-02, - 3.668867736744394e-02, - 4.476330331347286e-02, - 5.351572018455984e-02, - 6.285774096932660e-02, - 7.270969525632964e-02, - 8.300200380613353e-02, - 9.367506859367310e-02, - 1.046783649251725e-01, - 1.159692527600810e-01, - 1.275117745744105e-01, - 1.392755600338532e-01, - 1.512348790117338e-01, - 1.633678459291956e-01, - 1.756557616739730e-01, - 1.880825737568863e-01, - 2.006344350346304e-01, - 2.132993432171680e-01, - 2.260668459810459e-01, - 2.389277991286851e-01, - 2.518741675818686e-01, - 2.648988609864454e-01, - 2.779955973407747e-01, - 2.911587893792059e-01, - 3.043834494966380e-01, - 3.176651098387290e-01, - 3.309997548463871e-01, - 3.443837640713426e-01, - 3.578138634973091e-01, - 3.712870839345790e-01, - 3.848007253213593e-01, - 3.983523259777089e-01, - 4.119396360286274e-01, - 4.255605943503859e-01, - 4.392133085055285e-01, - 4.528960372223459e-01, - 4.666071750483102e-01, - 4.803452388673540e-01, - 4.941088560202809e-01, - 5.078967538086411e-01, - 5.217077501960928e-01, - 5.355407455493032e-01, - 5.493947152842907e-01, - 5.632687033027757e-01, - 5.771618161206929e-01, - 5.910732176039145e-01, - 6.050021242383937e-01, - 6.189478008716938e-01, - 6.329095568712604e-01, - 6.468867426520657e-01, - 6.608787465321646e-01, - 6.748849918802018e-01, - 6.889049345232205e-01, - 7.029380603869978e-01, - 7.169838833448358e-01, - 7.310419432528599e-01, - 7.451118041533703e-01, - 7.591930526291872e-01, - 7.732852962942366e-01, - 7.873881624071671e-01, - 8.015012965962607e-01, - 8.156243616851753e-01, - 8.297570366101771e-01, - 8.438990154205103e-01, - 8.580500063544185e-01, - 8.722097309841030e-01, - 8.863779234235901e-01, - 9.005543295940557e-01, - 9.147387065417398e-01, - 9.289308218040089e-01, - 9.431304528195833e-01, - 9.573373863793093e-01, - 9.715514181142016e-01, - 9.857723520177802e-01, - 1.000000000000000e+00 - }; - - APFEL::SetNumberOfGrids(1); - APFEL::SetExternalGrid(1, 115, 3, X1); - APFEL::SetFastEvolution(false); - APFEL::LockGrids(true); - APFEL::InitializeAPFEL_DIS(); - APFEL::CacheStructureFunctionsAPFEL(-1); - APFEL::CachePDFsAPFEL(-1); - - luxInstance().add_noise(noise_status); - luxInstance().loadPDF(settings.GetPDFName(), replica, vector(X1, X1 + sizeof X1 / sizeof X1[0]), q0); - const int nfmax = stoi(settings.GetTheory(APFEL::kMaxNfPdf)); - const double mb = stod(settings.GetTheory(APFEL::kmb)); - const double mt = stod(settings.GetTheory(APFEL::kmt)); - if (nfmax == 5) - luxInstance().getLux().InsertInelasticSplitQ({mb, 1e100}); - else if (nfmax == 6) - luxInstance().getLux().InsertInelasticSplitQ({mb,mt}); - - cout << "Computing photon..." << endl; - APFEL::SetPDFSet("external"); - APFEL::EvolveAPFEL(q0, q); - - cout << "\nPhoton at input scale:" << endl; - for (auto const& x: luxInstance().getXgrid()) - cout << "x=" << x << " Q=" << q << " xpht=" << APFEL::xgammaj(x) << endl; - - cout << "\nComputing MSR correction for gluon:" << endl; - cout << "xphoton:"<< endl; - const double xpht = SR(xphoton, q); - cout << "xgluon:"<< endl; - const double xglu = SR(xgluon, q); - cout << "xsinglet:"<< endl; - const double xsin = SR(xsinglet, q); - cout << "Total: " << xpht+xglu+xsin << endl; - const double Ng = (1-xsin-xpht)/xglu; - cout << "New gluon normalization: " << Ng << endl; - cout << "Final sum rule: " << xpht + xsin + Ng*xglu << endl; - - // Settings - cout << "- Printing grid to grid file..." << endl; - const int nf = std::max(stoi(settings.GetTheory(APFEL::kMaxNfPdf)), - stoi(settings.GetTheory(APFEL::kMaxNfAs))); - const auto& xgrid = luxInstance().getXgrid(); - const int nx = xgrid.size(); - - // print the replica - stringstream ofilename; - ofilename << settings.GetResultsDirectory() - << "/fiatlux/replica_" << replica << ".dat"; - fstream lhaout; - lhaout.open(ofilename.str().c_str(), ios::out); - lhaout << scientific << setprecision(7); - lhaout << "PdfType: replica\nFormat: lhagrid1\n---" << std::endl; - - for (int ix = 0; ix < nx; ix++) - lhaout << xgrid[ix] << " "; - lhaout << endl; - - // 2 nodes to make LHAPDF happy - lhaout << q << " " << q+1e-2 << endl; - - for (int i = -nf; i <= nf+1; i++) - if (i == 0) lhaout << 21 << " "; - else if (i == nf+1) lhaout << 22 << " "; - else lhaout << i << " "; - lhaout << endl; - - for (int ix = 0; ix < nx; ix++) - { - for (int j = 0; j < 2; j++) - { - lhaout << " "; - for (int fl = -nf; fl <= nf; fl++) - { - if (fl == 0) - lhaout << setw(14) << Ng*luxInstance().xfxQ(fl, xgrid[ix], q) << " "; - else - lhaout << setw(14) << luxInstance().xfxQ(fl, xgrid[ix], q) << " "; - } - - lhaout << setw(14) << APFEL::xgammaj(xgrid[ix]) << " "; - lhaout << endl; - } - } - lhaout << "---" << endl; - - lhaout.close(); - - return 0; -} diff --git a/nnpdfcpp/src/filter/inc/filter.h b/nnpdfcpp/src/filter/inc/filter.h deleted file mode 100644 index 9db45fb79b..0000000000 --- a/nnpdfcpp/src/filter/inc/filter.h +++ /dev/null @@ -1,27 +0,0 @@ -// $Id: filter.h 1199 2013-10-04 13:49:30Z s0673800 $ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -#include -#include -#include -#include - -#include "nnpdfsettings.h" -#include "kincuts.h" -#include "loadutils.h" - -// Export FK Table Mask -void ExportMask(string path, vector mask); - -// Randomly cut data -void RandomCut(NNPDFSettings const& settings, vector& datamask); - -// Build output directory -string BuildResultsFolder(string const& filename); - -// Store md5 in the output directory -void StoreMD5(string const& resultsdir); diff --git a/nnpdfcpp/src/filter/inc/kincuts.h b/nnpdfcpp/src/filter/inc/kincuts.h deleted file mode 100644 index a5b17ccb36..0000000000 --- a/nnpdfcpp/src/filter/inc/kincuts.h +++ /dev/null @@ -1,18 +0,0 @@ -// $Id$ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -#include -#include -#include -#include - -#include "nnpdfsettings.h" -#include -using NNPDF::DataSet; - -// Kinematical cuts -bool passKinCuts(NNPDFSettings const& settings,DataSet const& set, int const& idat); diff --git a/nnpdfcpp/src/filter/src/filter.cc b/nnpdfcpp/src/filter/src/filter.cc deleted file mode 100644 index 27870db6dc..0000000000 --- a/nnpdfcpp/src/filter/src/filter.cc +++ /dev/null @@ -1,333 +0,0 @@ -// $Id: filter.cc 1959 2014-07-22 13:21:38Z s0673800 $ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -/** - * Apply kinematical cuts to data, produce cut data files, T0 predictions and FK table masks - */ - -#include "filter.h" -#include -#include -#include -#include -#include -#include -#include -#include - -#include "kincuts.h" -using namespace NNPDF; - -/** - * \param argv the filename containing the configuration - */ -int main(int argc, char **argv) -{ - // Read configuration filename from arguments - string filename; - if (argc > 1) - { - filename.assign(argv[1]); - if (filename == "--help") { cout << "\nusage: filter [configuration filename]\n" << endl; exit(-1); } - } - else { cerr << Colour::FG_RED << "\nusage: filter [configuration filename]\n" << Colour::FG_DEFAULT << endl; exit(-1); } - - // Creates the configuration class - - const string folder = BuildResultsFolder(filename); - NNPDFSettings settings(folder); - - cout << "\n- Data cuts:" << endl; - cout << Colour::FG_YELLOW << " ----------------- Selected Cuts -----------------" << Colour::FG_DEFAULT << endl; - cout << " DIS: Q2Min="<(), PDFSet::erType::ER_MCT0); - delete T0Set; - - // Load FakeData PDF Set for closure test - LHAPDFSet* FakeSet = NULL; - if (settings.Get("closuretest","fakedata").as()) - FakeSet = new LHAPDFSet(settings.Get("closuretest","fakepdf").as(), LHAPDFSet::erType::ER_MCT0); - - // RNG Seed for Fake Data - RandomGenerator::GetRNG()->SetSeed(settings.Get("closuretest","filterseed").as()); - - // Filter experiments - cout << "- Filtering experimental points\n" << endl; - for (int i=0; i datasets; - - for (int j = 0; j < Nsets; j++) - datasets.push_back(LoadDataSet(settings, settings.GetExpSets(i)[j], DATA_UNFILTERED)); - - Experiment uncutExp(datasets, settings.GetExpName(i)); - - if (settings.Get("closuretest","fakedata").as()) - { - cout << Colour::FG_YELLOW <<"\n----------------- CLOSURE TEST ----------------- " << Colour::FG_DEFAULT << endl; - uncutExp.MakeClosure(FakeSet, settings.Get("closuretest","fakenoise").as()); - cout << Colour::FG_YELLOW << " -------------------------------------------------\n" << Colour::FG_DEFAULT << endl; - } - - vector cutsets; - vector< vector > cutmasks; - - cout << endl; - // Process sets in experiment - for (int j=0; j< uncutExp.GetNSet(); j++) - { - const DataSet& uncut = uncutExp.GetSet(j); - - // Calculating data mask - vector datamask; - for (int i=0; i() != 0) - { - if (settings.Get("closuretest","fakedata").as()) RandomCut(settings,datamask); - else - { - cerr << Colour::FG_RED << "Filter::main error: Random cuts disabled in real data fits to prevent accidental use." << Colour::FG_DEFAULT <() != 1.0) - { - cout << "\n Rescaling uncertainties by " << settings.Get("closuretest","errorsize").as() << endl; - for (int j=0; j< uncutExp.GetNSet(); j++) - cutsets[j].RescaleErrors(settings.Get("closuretest","errorsize").as()); - } - - // cut experiment - Experiment cutExp(cutsets, settings.GetExpName(i)); - - // Write filtered data to file - cout << "\n- Exporting filtered data\n" << endl; - for (int j=0; j< cutExp.GetNSet(); j++) - { - const DataSet &cut = cutExp.GetSet(j); - const DataSet &uncut = uncutExp.GetSet(j); - - // output directory for filter data - const string targetPath = settings.GetResultsDirectory() + "/filter/"+cut.GetSetName(); - const string maskPath = targetPath +"/FKMASK_"+ cut.GetSetName()+".dat"; - - mkdir(targetPath.c_str(),0777); - - // Export cut dataset - cut.Export(targetPath); - - // Export FK table mask - if (cut.GetNData() != uncut.GetNData()) - { - cout << Colour::FG_YELLOW << "-- Exporting FK table mask to "<< maskPath << Colour::FG_DEFAULT << endl; - ExportMask(maskPath, cutmasks[j]); - } - } - - cutsets.clear(); - cutmasks.clear(); - - } // End experiment loop - - // Positivity sets - if(settings.Get("positivity","posdatasets").size() > 0) - { - cout << "\n- Verifying Positivity tables:" << endl; - // Load Positivity sets - for (int i = 0; i < settings.GetNPos(); i++) - { - cout << Colour::FG_BLUE << "\n- Loading: " << Colour::FG_DEFAULT << settings.GetPosName(i) << endl; - LoadPositivitySet(settings,settings.GetPosName(i),settings.GetPosInfo(settings.GetPosName(i)).tLambda); - } - } - - if (FakeSet) delete FakeSet; - - // stores md5 - StoreMD5(folder); - - cout << Colour::FG_GREEN << endl; - cout << " -------------------------------------------------\n"; - cout << " - Filter completed with success" << endl; - cout << " - please go "<< settings.GetResultsDirectory() << "/filter \n"; - cout << " -------------------------------------------------\n"; - cout << Colour::FG_DEFAULT << endl; - - return 0; -} - -// Export FK table mask -void ExportMask(string path, vector mask) -{ - fstream g(path.c_str(),ios::out); - for (size_t i=0; i& datamask) -{ - double p = settings.Get("closuretest","rancutprob").as(); - vector valdatamask; - - cout << "- Applying random cuts to data using method " << settings.Get("closuretest", "rancutmethod") << endl; - cout << "- Cutting to " << settings.Get("closuretest", "rancutprob").as()*100 << "%" << endl; - - if (settings.Get("closuretest","rancutmethod").as() == 1) // Option 1: Pure random - { - for (size_t i=0; iGetRandomUniform()>p && datamask.size()>2) - { - valdatamask.push_back(datamask[i]); - datamask.erase(datamask.begin()+i); - i--; - } - } - else if (settings.Get("closuretest","rancutmethod").as() == 2) // Option 2: Evenly spread points (non-random) - { - double counter = 0.0; - for (size_t i=0; i= 1 && datamask.size()>2) - { - valdatamask.push_back(datamask[i]); - datamask.erase(datamask.begin()+i); - i--; - counter--; - } - } - } - else if (settings.Get("closuretest","rancutmethod").as() == 3) // Option 3: Random w/ exact 50:50 split - { - int Ndatremove = (int) std::min(datamask.size()*(1.0-p),datamask.size()-2.0); - for (int i=0; iGetRandomUniform(datamask.size()); - valdatamask.push_back(datamask[position]); - datamask.erase(datamask.begin()+position); - } - } - - if (settings.Get("closuretest","rancuttrnval").as() == true) datamask = valdatamask; - - valdatamask.clear(); -} - -string BuildResultsFolder(string const& filename) -{ - // Understand if filename string is file or directory - struct stat s; - string resultsdir; - if(stat(filename.c_str(), &s) == 0) - { - if( s.st_mode & S_IFREG) - { - // Get file name without path - const int firstindex = (int) filename.find_last_of("/") + 1; - const string file = filename.substr(firstindex, filename.size()-firstindex); - - // Check runcard name contains an extension - if (count(file.begin(), file.end(), '.') == 0) - throw NNPDF::FileError("BuildResultsFolder", "This program does not accept a configuration file without extension."); - - // Remove extension from runcard name - const int lastindex = (int) filename.find_last_of(".") - firstindex; - resultsdir = filename.substr(firstindex, lastindex); - - // Check name is valid (not empty and contains only alphanum chars) - if (!resultsdir.size()) - throw NNPDF::FileError("BuildResultsFolder", "Configuration file name is empty"); - - auto is_valid = [](unsigned char c) { return std::isalnum(c) || c == '_' || c == '-'; }; - if (!std::all_of(resultsdir.begin(), resultsdir.end(), is_valid)) - throw NNPDF::FileError("BuildResultsFolder", "Configuration file name is invalid. Only alphanum characters and one extension are allowed."); - - } - else if (s.st_mode & S_IFDIR) - throw NNPDF::FileError("BuildResultsFolder", - "This program takes a configuration file instead of a folder!"); - else - throw NNPDF::FileError("BuildResultsFolder", - "Configuration file not recognized."); - } - else - throw NNPDF::FileError("BuildResultsFolder", - "Configuration file not found: " + filename); - - // check if result folder exists - if (stat(resultsdir.c_str(), &s) == 0) - { - if (s.st_mode & S_IFDIR) - cout << Colour::FG_YELLOW << "Warning: output folder already exists!" << Colour::FG_DEFAULT << endl; - else - throw NNPDF::RuntimeException("BuildResultsFolder", "cannot create output folder: " + resultsdir); - } - else if(mkdir(resultsdir.c_str(), 0755) != 0) - throw NNPDF::RuntimeException("BuildResultsFolder", "cannot create output directory: " + resultsdir); - - // place a copy of configuration file - fstream inputfile(filename.c_str(), ios::in | ios::binary); - fstream copyfile( (resultsdir + "/filter.yml").c_str(), ios::out | ios::binary); - if (inputfile.fail() || copyfile.fail()) - throw NNPDF::FileError("BuildResultsFolder","file failed."); - - copyfile << inputfile.rdbuf(); - inputfile.close(); - copyfile.close(); - - return resultsdir; -} - -void StoreMD5(string const& resultsdir) -{ - // going to the begin of the file again - fstream inputfile(resultsdir + "/filter.yml"); - if (inputfile.fail()) - throw NNPDF::FileError("StoreMD5", "file filter.yml failed"); - - // store the md5 of the configuration file - MD5 targetHash; - targetHash.update(inputfile); - targetHash.finalize(); - - fstream outputMD5; - outputMD5.open(resultsdir + "/md5", ios::out); - if (!outputMD5.good()) - throw NNPDF::FileError("BuildResultsFolder", "Cannot create md5 file!"); - - outputMD5 << targetHash.hexdigest() << endl; - outputMD5.close(); - inputfile.close(); -} diff --git a/nnpdfcpp/src/filter/src/kincuts.cc b/nnpdfcpp/src/filter/src/kincuts.cc deleted file mode 100644 index a235a8a0cb..0000000000 --- a/nnpdfcpp/src/filter/src/kincuts.cc +++ /dev/null @@ -1,415 +0,0 @@ -// $Id$ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -/** - * Kinematical cuts function - */ - -#include "kincuts.h" - - -bool passKinCuts(NNPDFSettings const& settings, DataSet const& set, int const& idat) -{ - /** - * Special set of cuts, for full documentation and explanation look at: - * trunk/nnpdfcpp/doc/cuts/NNPDF30 - * - */ - - - /** - * Cuts on small x (specific of NNPDF31sx combo) - * */ - if ( settings.Get("datacuts","combocuts").as().compare(string("NNPDF31sx")) == 0 ) - { - - // x,Q^2 are computed for all non-DIS processes - // in a LO kinematic approximation - // - // common cut to all non-DIS experiments - // x^(b0/c) Q^2 >= Lam^2 - // where Lam=88 MeV and b0 = 0.61. - // - // this corresponds to cut all non-DIS points - // below a line in the x-Q^2 plane - // - // The value of c tunes the slope - // of the line and can be modified to make - // the cut tight or loose - // c = 0.5 corresponds to a tight cut - - const real b0 = 0.61; - const real c = 1./2.; - const real exponent = 1./(b0*c); - const real Lam2 = pow(0.088,2); - - - // For DY-like proces two values of x are computed - if (set.GetProc(idat).compare(0,3, string("DYP")) == 0 || - set.GetProc(idat).compare(0,7, string("EWJ_RAP")) == 0 || - set.GetProc(idat).compare(0,9, string("EWK_PTRAP")) == 0 || - set.GetProc(idat).compare(0,7,string("EWK_RAP")) == 0 || - set.GetProc(idat).compare(0,7,string("HQP_YQQ")) == 0) - { - const real y = set.GetKinematics(idat,0); - const real Q2 = set.GetKinematics(idat,1); - const real sqrts = set.GetKinematics(idat,2); - const real STAUdat = sqrt(Q2)/sqrts; - - const real x1 = STAUdat * exp(y); - const real x2 = STAUdat * exp(-y); - - // Cut - if (pow(x1,exponent)*Q2 <= Lam2 || pow(x2,exponent)*Q2 <= Lam2) return false; - } - - // for the following class of processes LO kinematics is the same - if (set.GetProc(idat).compare(0,7,string("EWK_MLL")) == 0 || - set.GetProc(idat).compare(0,7,string("HQP_MQQ")) == 0 || - set.GetProc(idat).compare(0,3,string("INC")) == 0) - { - const real Q2 = set.GetKinematics(idat,1); - const real sqrts = set.GetKinematics(idat,2); - const real x = sqrt(Q2)/sqrts; - - // Cut - if (pow(x,exponent)*Q2 <= Lam2) return false; - } - - // Jets and ttbar production (one top is tagged) cut - if (set.GetProc(idat).compare(0,3,string("JET")) == 0 || - set.GetProc(idat).compare(0,6,string("HQP_YQ")) == 0) - { - const real y = set.GetKinematics(idat,0); - const real Q2 = set.GetKinematics(idat,1); - const real sqrts = set.GetKinematics(idat,2); - const real STAUdat = sqrt(Q2)/sqrts; - - const real x = STAUdat*(exp(y)+exp(-y)); - - // Cut - if (pow(x,exponent)*Q2 <= Lam2) return false; - } - - // ttbar production (pT distribution) cut, single top tagged - if (set.GetProc(idat).compare(0,7,string("HQP_PTQ")) == 0 ) - { - - const real tmass = 173.3; //top mass should be taken from fit settings - const real qmass2 = pow(tmass,2); - - const real pT = set.GetKinematics(idat,0); - const real Q = sqrt(qmass2+pT*pT)+pT; - const real sqrts = set.GetKinematics(idat,2); - - - const real x = Q/sqrts; - const real Q2 = pow(Q,2); - - // Cut - if (pow(x,exponent)*Q2 <= Lam2) return false; - } - - // ttbar production (pT distribution) cut, ttbar pair tagged - if (set.GetProc(idat).compare(0,8,string("HQP_PTQQ")) == 0 ) - { - - const real tmass = 173.3; - const real qqmass2 = pow(2*tmass,2); - - const real pT = set.GetKinematics(idat,0); - const real Q = sqrt(qqmass2+pT*pT)+pT; - const real sqrts = set.GetKinematics(idat,2); - - const real x = Q/sqrts; - const real Q2 = pow(Q,2); - - // Cut - if (pow(x,exponent)*Q2 <= Lam2) return false; - } - - // Zpt cut - if (set.GetProc(idat).compare(0,6,string("EWK_PT")) == 0 ) - { - - const real Zmass = 91.1876; - const real Zmass2 = pow(2*Zmass,2); - - const real pT = set.GetKinematics(idat,0); - const real Q = sqrt(Zmass2+pT*pT)+pT; - const real mu = sqrt(Zmass2+pT*pT); //factorization scale used - const real sqrts = set.GetKinematics(idat,2); - - const real x = Q/sqrts; - const real Q2 = pow(mu,2); - - // Cut - if (pow(x,exponent)*Q2 <= Lam2) return false; - } - - } - - - /** - * Cuts only available in the NNPDF30 combo. - */ - if (settings.Get("datacuts","combocuts").as().compare(string("NNPDF30")) == 0) - if (set.GetProc(idat).compare(0,3, string("JET")) == 0 && - stoi(settings.GetTheory(APFEL::kPTO)) == 2) - { - // building rapidity and pT or Mll - const real y = set.GetKinematics(idat,0); - - // Generalized cuts - const real maxCDFy = 1.6; - const real maxATLAS7y = 0.8; - const real maxATLAS2y = 0.3; - const real maxCMSy = 1.5; - - // NNLO Jets first - if (set.GetSetName().compare(string("CDFR2KT")) == 0) - { - if ( (idat > 49 && idat < 60) || idat > 61 || y > maxCDFy) - return false; - return true; // avoid other cuts - } - - if (set.GetSetName().compare(string("ATLASR04JETS2P76TEV")) == 0) - { - if (idat < 8 || idat > 10 || y > maxATLAS2y) - return false; - return true; // avoid other cuts - } - - if (set.GetSetName().compare(string("ATLASR04JETS36PB")) == 0) - { - if (idat < 10 || (idat > 15 && idat < 29) || y > maxATLAS7y) - return false; - return true; // avoid other cuts - } - - if(set.GetSetName().compare(string("ATLASR06JETS36PB")) == 0) - { - if (idat < 5 || (idat > 15 && idat < 21) || - (idat > 31 && idat < 39) || idat > 47) - return false; - return true; // avoid other cuts - } - - if (set.GetSetName().compare(string("CMSJETS11")) == 0) - { - if ((idat > 62 && idat < 70) || y > maxCMSy) - return false; - return true; // avoid other cuts - } - - // ATLAS W&Z pT, minimum pT cut - if( set.GetSetName().compare(string("ATLASWPT31PB")) == 0) - return set.GetKinematics(idat,0) > 25; - - throw RuntimeException("passKinCuts", "NNPDF3.0 NNLO combocuts for set " + set.GetSetName() + " are not coded"); - } - - /** - * Cuts only available in the NNPDF31 combo and NNPDF31sx combo - * */ - if ( settings.Get("datacuts","combocuts").as().compare(string("NNPDF31")) == 0 || - settings.Get("datacuts","combocuts").as().compare(string("NNPDF31sx")) == 0) - { - // NNPDF3.1 cut, allowing only first rapidity bin of ATLAS1JET11 - if (set.GetSetName().compare(0,11, string("ATLAS1JET11")) == 0) - return set.GetKinematics(idat,0) < 0.3; - - if (set.GetSetName().compare(string("LHCBWZMU8TEV")) == 0 || - set.GetSetName().compare(string("LHCBWZMU7TEV")) == 0) - { - // cut at NNLO if rapidity is < 2.25 - if (stoi(settings.GetTheory(APFEL::kPTO)) == 2) - return set.GetKinematics(idat,0) >= 2.25; - } - - if (set.GetSetName().compare(string("D0WMASY")) == 0 || - set.GetSetName().compare(string("D0WEASY")) == 0) - { - // cut at NNLO is central value is < 0.03 - if (stoi(settings.GetTheory(APFEL::kPTO)) == 2) - return set.GetData(idat) >= 0.03; - } - - if (set.GetSetName().compare(string("ATLASZPT7TEV")) == 0 ) - { - const double pt = sqrt(set.GetKinematics(idat, 1)); - if (pt < 30 || pt > 500) - return false; - return true; - } - - if (set.GetSetName().compare(string("ATLASZPT8TEVMDIST")) == 0 ) - return set.GetKinematics(idat, 0) >= 30; - - if (set.GetSetName().compare(string("ATLASZPT8TEVYDIST")) == 0 ) - { - const double pt = sqrt(set.GetKinematics(idat, 1)); - if (pt < 30 || pt > 150) - return false; - return true; - } - - if(set.GetSetName().compare(string("CMSZDIFF12")) == 0) - { - const double pt = sqrt(set.GetKinematics(idat, 1)); - const double y = set.GetKinematics(idat, 0); - if (pt < 30 || pt > 170 || y > 1.6) - return false; - return true; - } - - // ATLAS W&Z pT, minimum pT cut - if(set.GetSetName().compare(string("ATLASWPT31PB")) == 0) - return set.GetKinematics(idat,0) > 30; - } - - /** - * shared cuts between NNPDF30 and NNPDF31 and NNPDF31sx - */ - if (settings.Get("datacuts","combocuts").as().compare(string("NNPDF30")) == 0 || - settings.Get("datacuts","combocuts").as().compare(string("NNPDF31")) == 0 || - settings.Get("datacuts","combocuts").as().compare(string("NNPDF31sx")) == 0 ) - if (set.GetProc(idat).compare(0,3, string("EWK")) == 0 || - set.GetProc(idat).compare(0,3, string("DYP")) == 0 ) - { - // building rapidity and pT or Mll - const real y = set.GetKinematics(idat,0); - const real pTmv = sqrt(set.GetKinematics(idat,1)); - - // Generalized cuts - const real maxCMSDY2Dy = 2.2; - const real maxCMSDY2Dminv = 200.0; - const real minCMSDY2Dminv = 30.0; - const real maxTau = 0.080; - const real maxY = 0.663; - - if (set.GetSetName().compare(string("CMSDY2D11")) == 0) - { - if (stoi(settings.GetTheory(APFEL::kPTO)) == 0 || stoi(settings.GetTheory(APFEL::kPTO)) == 1) - if (pTmv > maxCMSDY2Dminv || pTmv < minCMSDY2Dminv || y > maxCMSDY2Dy) - return false; - - if (stoi(settings.GetTheory(APFEL::kPTO)) == 2) - if (pTmv > maxCMSDY2Dminv || y > maxCMSDY2Dy) - return false; - - return true; // avoid other cuts - } - - if (set.GetSetName().compare(string("CMSDY2D12")) == 0) - { - - if (stoi(settings.GetTheory(APFEL::kPTO)) == 0 || stoi(settings.GetTheory(APFEL::kPTO)) == 1) - if (pTmv > maxCMSDY2Dminv || pTmv < minCMSDY2Dminv || y > maxCMSDY2Dy) - return false; - - if (stoi(settings.GetTheory(APFEL::kPTO)) == 2) - if (pTmv > maxCMSDY2Dminv || y > maxCMSDY2Dy) - return false; - - return true; // avoid other cuts - } - - if (set.GetSetName().compare(string("ATLASZHIGHMASS49FB")) == 0 || - set.GetSetName().compare(string("LHCBLOWMASS37PB")) == 0 ) - { - if (pTmv > maxCMSDY2Dminv) - return false; - return true; - } - - if (set.GetSetName().compare(string("ATLASLOMASSDY11")) == 0 ) - { - if (stoi(settings.GetTheory(APFEL::kPTO)) == 0 || stoi(settings.GetTheory(APFEL::kPTO)) == 1) - if (idat < 6 ) - return false; - - return true; // avoid other cuts - } - - if (set.GetSetName().compare(string("ATLASLOMASSDY11EXT")) == 0 ) - { - if (stoi(settings.GetTheory(APFEL::kPTO)) == 0 || stoi(settings.GetTheory(APFEL::kPTO)) == 1) - if (idat < 2 ) - return false; - - return true; // avoid other cuts - } - - //*********************************************************** - // New cuts to the fixed target Drell-Yan data - if ( (set.GetSetName().compare(string("DYE886P")) == 0) || - (set.GetSetName().compare(string("DYE605")) == 0) ) - { - const real rapidity = set.GetKinematics(idat,0); - const real invM2 = set.GetKinematics(idat,1); - const real sqrts = set.GetKinematics(idat,2); - const real tau = invM2 / ( sqrts * sqrts ); - const real ymax = -0.5 * log(tau); - - if(tau > maxTau) return false; - - if( fabs(rapidity/ymax) > maxY) return false; - - return true; - } - } - - - - // DIS cuts - if (set.GetProc(idat).compare(0,3,string("DIS")) == 0) - { - // Kinematics - const real x = set.GetKinematics(idat,0); - const real Q2 = set.GetKinematics(idat,1); - const real W2 = Q2*(1-x)/x; - - const real Q2cut = settings.Get("datacuts","q2min").as(); - const real W2cut = settings.Get("datacuts","w2min").as(); - const string VFNS = settings.GetTheory(APFEL::kFNS); - - // Basic cuts - if (W2 <= W2cut) return false; - if (Q2 <= Q2cut) return false; - - if( set.GetSetName().compare(string("EMCF2P")) == 0 || set.GetSetName().compare(string("EMCF2D")) == 0 ) - return (x>0.1); - - // Additional F2C cuts in case of FONNLA - if (set.GetProc(idat) == "DIS_NCP_CH" && VFNS == "FONLL-A") - { - // Maybe these shouldnt be hardcoded? - const real Q2cut1_f2c = 4; - const real Q2cut2_f2c = 10; - const real xcut_f2c = 1e-3; - - if (Q2 <= Q2cut1_f2c) // cut if Q2 <= 4 - return false; - - if ( Q2 <= Q2cut2_f2c && x <= xcut_f2c ) // cut if Q2 <= 10 and x <= 10^-3 - return false; - } - - // Additional F2C cut in case of FONLLC + IC - if (set.GetProc(idat) == "DIS_NCP_CH" && VFNS == "FONLL-C" && settings.IsIC()) - { - const real Q2cut1_f2c = 8; - if (Q2 <= Q2cut1_f2c) return false; - } - - } - - // Passes kinematical cuts - return true; -} diff --git a/nnpdfcpp/src/nnfit/inc/fastaddchi2.h b/nnpdfcpp/src/nnfit/inc/fastaddchi2.h deleted file mode 100644 index bb646c88da..0000000000 --- a/nnpdfcpp/src/nnfit/inc/fastaddchi2.h +++ /dev/null @@ -1,19 +0,0 @@ -// $Id$ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -#include "common.h" -#include -#include -#include -using NNPDF::PDFSet; -using NNPDF::DataSet; -using NNPDF::Experiment; - -// Fast methods for the computation of chi2s. -void Convolute(const PDFSet* pdf, const Experiment*, real *); -void FastAddChi2(const PDFSet*, const DataSet*, real* chi2); -void FastAddChi2(const PDFSet*, const Experiment*, real* chi2); diff --git a/nnpdfcpp/src/nnfit/inc/fitbases.h b/nnpdfcpp/src/nnfit/inc/fitbases.h deleted file mode 100644 index 8af64b7163..0000000000 --- a/nnpdfcpp/src/nnfit/inc/fitbases.h +++ /dev/null @@ -1,326 +0,0 @@ -// $Id$ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -#pragma once - -#include "common.h" -#include "pdfbasis.h" - -namespace NNPDF { - class LHAPDFSet; -} - -/** - * Return an initialised fitting basis - */ -class FitBasis; -FitBasis* getFitBasis(NNPDFSettings const& settings, basisType btype, int const& rep = 0); - -/** - * \class FitBasis - * \brief Base class for all Fitting PDF basis definitions - */ -class FitBasis: public PDFBasis -{ -public: - FitBasis(NNPDFSettings const&, string name, int nPDF); //!< FitBasis constructor - ~FitBasis(); //!< FitBasis destructor - - virtual void BASIS2EVLN(real const* basis, real* evln) const = 0; - virtual void EVLN2BASIS(real const* evln, real* basis) const = 0; - - // Compute associated sum rules - virtual real ComputeSumRules(sumRule, int mem, PDFSet*, bool&) const = 0; - - // Preprocessing - virtual void ComputeParam(PDFSet*, int mem, PreprocParam&, bool&) const = 0; - virtual void Preprocess(real const& x, int const& fl, real& pdf, PreprocParam const&); - virtual void Preprocess(real const& x, real* pdf, PreprocParam const&); - virtual void NetTransform(int const& fl, int const& nfl, int*); - - real const& GetAlpha(int const& fl) const { return fAlpha[fl]; } - real const& GetBeta(int const& fl) const { return fBeta[fl]; } - void SetAlpha(int const& fl, real const& v) { fAlpha[fl] = v; } - void SetBeta(int const& fl, real const& v) { fBeta[fl] = v; } - - bool const& GetPDFSqrPos(int const& fl) const { return fPDFSqrPos[fl]; } - - double* fArcDampFactor; -protected: - // Basic Preprocessing Constants - bool* const fPDFSqrPos; //!< Is the PDF to be squared? - real* const fAlpha; //!< Low-x Preprocessing exponents - real* const fBeta; //!< High-x Preprocessing exponents - real fQ2; //!< Fit initial scale for integration - gsl_integration_workspace* fGSLWork; //!< workspace for integration -}; - - -/** - * \class NN23FitBasis - * \brief Fit basis used in NNPDF releases 2.3 and below - */ -class NN23FitBasis: public FitBasis -{ -public: - NN23FitBasis(NNPDFSettings const&); - - enum fitBasis {FIT_SNG, FIT_GLU, FIT_VAL, FIT_T3, FIT_DS, FIT_SP, FIT_SM, FIT_GAM }; - - void BASIS2EVLN(real const* basis, real* evln) const; - void EVLN2BASIS(real const* evln, real* basis) const; - - real ComputeSumRules(sumRule, int mem, PDFSet*, bool&) const; - - // Preprocessing - void ComputeParam(PDFSet*, int mem, PreprocParam&, bool&) const; - void Preprocess(real const& x, int const& fl, real& pdf, PreprocParam const&); - -private: - const bool fQED; - - // Strange Auxilliary terms - real fSauxAlpha; - real fSauxBeta; - real fSauxGamma; -}; - -/** - * \class EvolFitBasis - * \brief Evol basis for fitting - */ -class EvolFitBasis: public FitBasis -{ -public: - EvolFitBasis(NNPDFSettings const&); - - // Σ, g, V, V3, V8, V15, V24, V35, T3, T8, T15, T24, T35, γ - - enum fitBasis {FIT_SNG, FIT_GLU, FIT_VAL, FIT_V3, FIT_V8, FIT_T3, FIT_T8, FIT_GAM }; - - void BASIS2EVLN(real const* basis, real* evln) const; - void EVLN2BASIS(real const* evln, real* basis) const; - - real ComputeSumRules(sumRule, int mem, PDFSet*, bool&) const; - - // Preprocessing - void ComputeParam(PDFSet*, int mem, PreprocParam&, bool&) const; - -protected: - bool fQED; -}; - -/** - * \class PDF4LHC20FitBasis - * \brief PDF4LHC20 basis for fitting - */ -class PDF4LHC20FitBasis: public FitBasis -{ -public: - PDF4LHC20FitBasis(NNPDFSettings const&); - - // Σ, g, V, V3, T3, T8, γ - - enum fitBasis {FIT_SNG, FIT_GLU, FIT_VAL, FIT_V3, FIT_T3, FIT_T8, FIT_GAM }; - - void BASIS2EVLN(real const* basis, real* evln) const; - void EVLN2BASIS(real const* evln, real* basis) const; - - real ComputeSumRules(sumRule, int mem, PDFSet*, bool&) const; - - // Preprocessing - void ComputeParam(PDFSet*, int mem, PreprocParam&, bool&) const; - -protected: - bool fQED; -}; - -/** - * \class DISEvolFitBasis - * \brief DIS Evol basis for fitting - */ -class DISEvolFitBasis: public FitBasis -{ -public: - DISEvolFitBasis(NNPDFSettings const&); - - // Σ, g, V, V3, V8, V15, V24, V35, T3, T8, T15, T24, T35, γ - - enum fitBasis {FIT_SNG, FIT_GLU, FIT_T8}; - - void BASIS2EVLN(real const* basis, real* evln) const; - void EVLN2BASIS(real const* evln, real* basis) const; - - real ComputeSumRules(sumRule, int mem, PDFSet*, bool&) const; - - // Preprocessing - void ComputeParam(PDFSet*, int mem, PreprocParam&, bool&) const; - -}; - -/** - * @brief The LuxBasis class - */ -class LuxBasis: public FitBasis -{ -public: - LuxBasis(NNPDFSettings const&set, int const& replica); - ~LuxBasis(); - - enum fitBasis { FIT_SNG, FIT_GLU, FIT_VAL, FIT_V3, FIT_V8, FIT_T3, FIT_T8, FIT_CP, FIT_GAM }; - - void BASIS2EVLN(real const* basis, real* evln) const; - void EVLN2BASIS(real const* evln, real* basis) const; - - real ComputeSumRules(sumRule, int mem, PDFSet*, bool&) const; - - // Preprocessing - void ComputeParam(PDFSet*, int mem, PreprocParam&, bool&) const; - - void Preprocess(real const& x, int const& fl, real& pdf, PreprocParam const&); - void Preprocess(real const& x, real* pdf, PreprocParam const& par); - -private: - double fQ0; - NNPDF::LHAPDFSet* fPhotonSet; -}; - - -/** - * \class EvolSFitBasis - * \brief Evol Fit basis for strangeness, otherwise NN23 - */ -class EvolSFitBasis: public FitBasis -{ -public: - EvolSFitBasis(NNPDFSettings const&); - - enum fitBasis {FIT_SNG, FIT_GLU, FIT_VAL, FIT_V8, FIT_T3, FIT_T8, FIT_DS, FIT_GAM }; - - void BASIS2EVLN(real const* basis, real* evln) const; - void EVLN2BASIS(real const* evln, real* basis) const; - - real ComputeSumRules(sumRule, int mem, PDFSet*, bool&) const; - - // Preprocessing - void ComputeParam(PDFSet*, int mem, PreprocParam&, bool&) const; - -private: - const bool fQED; - -}; - -class NN30FitBasis: public EvolFitBasis -{ -public: - NN30FitBasis(NNPDFSettings const&); - - enum netBasis {NET_SNG, NET_GLU, NET_VAL, NET_T3, NET_DS, NET_SP, NET_SM, NET_GAM }; - - void NetTransform(int const& fl, int const& nfl, int*); - void Preprocess(real const& x, real* pdf, PreprocParam const&); -}; - -class FLVRFitBasis: public EvolFitBasis -{ -public: - FLVRFitBasis(NNPDFSettings const&); - - enum netBasis {NET_GLU, NET_U, NET_UBAR, NET_D, NET_DBAR, NET_S, NET_SBAR, NET_GAM }; - - void NetTransform(int const& fl, int const& nfl, int*); - void Preprocess(real const& x, real* pdf, PreprocParam const&); -}; - -/** - * \class EvolICFitBasis - * \brief Evol basis for fitting intrinsic charm - */ -class EvolICFitBasis: public FitBasis -{ -public: - EvolICFitBasis(NNPDFSettings const&); - - // γ, Σ, g, V, V3, V8, V15, V24, V35, T3, T8, T15, T24, T35 - - enum fitBasis {FIT_SNG, FIT_GLU, FIT_VAL, FIT_V3, FIT_V8, FIT_T3, FIT_T8, FIT_T15, FIT_GAM }; - - void BASIS2EVLN(real const* basis, real* evln) const; - void EVLN2BASIS(real const* evln, real* basis) const; - - real ComputeSumRules(sumRule, int mem, PDFSet*, bool&) const; - - // Preprocessing - void ComputeParam(PDFSet*, int mem, PreprocParam&, bool&) const; - -protected: - const bool fQED; - -}; - -/** - * @brief The NN30ICFitBasis class - */ -class NN30ICFitBasis: public EvolICFitBasis -{ -public: - NN30ICFitBasis(NNPDFSettings const&); - - //enum netBasis {NET_SNG, NET_GLU, NET_VAL, NET_T3, NET_DS, NET_SP, NET_SM, NET_CP, NET_CM, NET_GAM }; - enum netBasis {NET_SNG, NET_GLU, NET_VAL, NET_T3, NET_DS, NET_SP, NET_SM, NET_CP, NET_GAM }; // c- = 0 - - void NetTransform(int const& fl, int const& nfl, int*); - void Preprocess(real const& x, real* pdf, PreprocParam const&); -}; - -/** - * \class NN31ICFitBasis - * \brief Evol basis for fitting intrinsic charm - */ -class NN31ICFitBasis: public FitBasis -{ -public: - NN31ICFitBasis(NNPDFSettings const&); - - // Σ, g, V, V3, V8, T3, T8, c+, (γ) - - enum fitBasis {FIT_SNG, FIT_GLU, FIT_VAL, FIT_V3, FIT_V8, FIT_T3, FIT_T8, FIT_CP, FIT_GAM }; - - void BASIS2EVLN(real const* basis, real* evln) const; - void EVLN2BASIS(real const* evln, real* basis) const; - - real ComputeSumRules(sumRule, int mem, PDFSet*, bool&) const; - - // Preprocessing - void ComputeParam(PDFSet*, int mem, PreprocParam&, bool&) const; - -protected: - const bool fQED; - -}; - -/** - * \class NoSumRuleBasis - * \brief Test basis, identical to NN31ICFitBasis but with no sum rules applied - */ -class NoSumRuleBasis: public FitBasis -{ -public: - NoSumRuleBasis(NNPDFSettings const&); - - // Σ, g, V, V3, V8, T3, T8, c+ - - enum fitBasis {FIT_SNG, FIT_GLU, FIT_VAL, FIT_V3, FIT_V8, FIT_T3, FIT_T8, FIT_CP}; - - void BASIS2EVLN(real const* basis, real* evln) const; - void EVLN2BASIS(real const* evln, real* basis) const; - - real ComputeSumRules(sumRule, int mem, PDFSet*, bool&) const; - - // Preprocessing - void ComputeParam(PDFSet*, int mem, PreprocParam&, bool&) const; -}; diff --git a/nnpdfcpp/src/nnfit/inc/fitpdfset.h b/nnpdfcpp/src/nnfit/inc/fitpdfset.h deleted file mode 100644 index f7d7eed8bf..0000000000 --- a/nnpdfcpp/src/nnfit/inc/fitpdfset.h +++ /dev/null @@ -1,101 +0,0 @@ -// $Id: fitpdfset.h 1506 2014-01-15 11:26:09Z s0673800 $ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -#pragma once - -#include -#include - -#include "common.h" -#include "fitbases.h" -#include -#include -#include -#include - -using std::vector; -using std::pair; -using NNPDF::PDFSet; -using NNPDF::Parametrisation; -class PreprocParam; - -/** - * \class NNPDFSet - * \brief Neural Network PDFSet to be minimized - */ - -class FitPDFSet : public PDFSet -{ -public: - ~FitPDFSet(); - - template static FitPDFSet* Generate(NNPDFSettings const& settings, FitBasis* basis) - { - const int nfl = basis->GetNPDF(); - FitPDFSet* ns = new FitPDFSet(settings, basis); - - Parametrisation** newpdf = new Parametrisation*[nfl]; - for (int i=0; i(np); - } - - ns->fBestFit=newpdf; - return ns; - } - - void InitPDFSet() const; - void ExportMeta(int const& rep, real const& erf_val, real const& erf_trn, real const& chi2, bool posVeto); - - bool ComputeIntegrals( int const& mem ); //!< Compute all associated integrals and sum rules - void ComputeSumRules(); //!< Compute preprocessing sum rule constraints over all members - void ValidateStartingPDFs(); //!< Validate initial PDFs - - void SetNMembers(int const& mem) {fMembers = mem; ExpandMembers();} - - vector& GetPDFs() {return fPDFs;} - Parametrisation** GetBestFit() {return fBestFit;} - void SortMembers(real*); - - void SetBestFit(int const&); - real GetEbf() { return fEbf; } - void SetEbf( real const& e) {fEbf = e;} //!< Sets the new best fit error function - - int GetNIte() const { return fNIte; } - void SetNIte( int const& newIte) { fNIte = newIte; } - void Iterate() { fNIte++; } - - void GetPDF (real const& x, real const& Q2, int const& n, real* pdf) const; //!< Get evolution basis PDF - real GetPDF (real const& x, real const& Q2, int const& n, int const& fl) const; //!< Get preprocessed Fit basis PDF - - real CalculateArcLength(int const& mem, int const& fl, real const& dampfact, real xmin = 1e-15, real xmax = 1.0) const; - - real GetQ20() const { return fQ20; } - -private: - FitPDFSet(NNPDFSettings const&, FitBasis*); - - void ExpandMembers(); //!< Expand internal vectors to fMembers - void DisableMember(int mem); //!< Disable a member PDF by moving it to the end of the vector and decrementing fMembers - - NNPDFSettings const& fSettings; - - FitBasis* fFitBasis; //!< Fitting basis for PDF - - const int fNfl; - const real fQ20; - vector fPreprocParam; //!< PDF preprocessing parameters by member - - Parametrisation** fBestFit; //!< Best fit PDF - vector fPDFs; //!< Vector of PDF members - real fEbf; //!< Figure of merit for best fit PDF - int fNIte; //!< Counts the number of fit iterations - basisType fbtype; //!< store the basis type - - friend class Minimizer; -}; diff --git a/nnpdfcpp/src/nnfit/inc/minimizer.h b/nnpdfcpp/src/nnfit/inc/minimizer.h deleted file mode 100644 index 7266cb742c..0000000000 --- a/nnpdfcpp/src/nnfit/inc/minimizer.h +++ /dev/null @@ -1,165 +0,0 @@ -// $Id: minimizer.h 1286 2013-10-28 11:54:20Z s0673800 $ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -#pragma once - -#include -#include -#include -#include - -#include "common.h" -#include "fitpdfset.h" -using std::vector; - -#include -#include -#include -#include -#include - -#include -#include -using NNPDF::Experiment; -using NNPDF::PositivitySet; - -class NNPDFSettings; -/** - * \class Minimizer - * \brief Virtual minimisation base class - */ -class Minimizer -{ -public: - Minimizer(NNPDFSettings const&); - virtual ~Minimizer(); - - enum Mode { - SetMode, - ExpMode - }; //!< Minimisation mode - - enum SortPDF { - PDF_SORT, - PDF_NOSORT - }; //!< PDF sorting - - virtual void Init(FitPDFSet*, vector const&, vector const&); - virtual void Iterate(FitPDFSet*, vector const&, vector const&) = 0; //!< Perform an iteration of the minimisation - -protected: - virtual void ComputeErf(FitPDFSet*, - vector const&, - vector const&, - Minimizer::Mode, - Minimizer::SortPDF); //!< Compute fChi2Mem - - real* fChi2Mem; - - const NNPDFSettings& fSettings; -}; - -/** - * \class GAMinimizer - * \brief Basic Single Epoch Genetic Algorithm Minimizer - */ - -class GAMinimizer : public Minimizer -{ -public: - GAMinimizer(NNPDFSettings const&); - - virtual void Iterate(FitPDFSet*, vector const&, vector const&); - -protected: - virtual void Mutation(FitPDFSet*, int const& nmut); - int Selection(FitPDFSet*); -}; - -/** - * \class NGAMinimiser - * \brief GA minimiser with nodal mutations - */ - -class NGAMinimizer : public GAMinimizer -{ -public: - NGAMinimizer(NNPDFSettings const&); - -protected: - virtual void Mutation(FitPDFSet*, int const& nmut); -}; - -/*! - * \brief The NGAFTMinimizer class - * A NGA which fixes the threshold term so NN(x) = NN(x)-NN(1). - */ -class NGAFTMinimizer : public GAMinimizer -{ -public: - NGAFTMinimizer(NNPDFSettings const&); - -protected: - virtual void Mutation(FitPDFSet*, int const& nmut); -}; - - -// ************************************************************************************* - -class CMAESParam -{ -public: - CMAESParam(size_t const& _n, size_t const& _lambda); - const size_t lambda; - const size_t mu; - const size_t n; - size_t eigenInterval; - double expN; - double mu_eff; - double csigma; - double dsigma; - double cc; - double c1; - double cmu; - std::vector wgts; -}; - -/** - * \class CMAESMinimizer - * \brief CMA-ES minimiser - */ - -class CMAESMinimizer : public Minimizer -{ -public: - CMAESMinimizer(NNPDFSettings const&); - ~CMAESMinimizer(); - - virtual void Init(FitPDFSet*, vector const&, vector const&); - virtual void Iterate(FitPDFSet*, vector const&, vector const&); - -private: - std::vector Mutation(FitPDFSet* pdf) const; - gsl_vector* Recombination(FitPDFSet* pdf, vector const& rank, std::vector const& yvals) const; - - void CSA(gsl_vector const* yavg); - void CMA(FitPDFSet*, vector const& rank, std::vector const& yvals, gsl_vector const* yavg); - - void GetParam(Parametrisation** const, gsl_vector*) const; - void SetParam(gsl_vector* const, Parametrisation**) const; - - void NormVect(gsl_vector*) const; //!< Normally distributed random vector - void ComputeEigensystem(); - -protected: - size_t fNTparam; - double fSigma; - CMAESParam* fCMAES; - gsl_vector *fpsigma, *fpc; - gsl_matrix *fC, *fBD, *finvC; - gsl_eigen_symmv_workspace *fwrkspc; -}; diff --git a/nnpdfcpp/src/nnfit/inc/nnfit.h b/nnpdfcpp/src/nnfit/inc/nnfit.h deleted file mode 100644 index c254b15897..0000000000 --- a/nnpdfcpp/src/nnfit/inc/nnfit.h +++ /dev/null @@ -1,65 +0,0 @@ -// $Id: nnfit.h 1333 2013-11-20 16:46:42Z stefano.carrazza@mi.infn.it $ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "nnpdfsettings.h" -#include -#include - -using std::unique_ptr; -class FitPDFSet; - -// Fit status -enum fitStatus {FIT_INIT, FIT_END, FIT_ITER, FIT_ABRT}; -fitStatus state(FIT_INIT); - -/** - * @brief CreateResultsFolder - * @param settings - * @param replica - */ -void CreateResultsFolder(const NNPDFSettings &settings, const int replica) -{ - stringstream folder(""); - folder << settings.GetResultsDirectory() << "/nnfit"; - int status = mkdir(folder.str().c_str(), 0777); - if (status == -1 && errno != EEXIST) - throw FileError("CreateResultsFolder", "Cannot create folder " + folder.str()); - folder << "/replica_" << replica; - status = mkdir(folder.str().c_str(), 0777); - if (status == -1 && errno != EEXIST) - throw FileError("CreateResultsFolder", "Cannot create folder " + folder.str()); -} - -// Load data and perform trainng validation split -void LoadAllDataAndSplit(NNPDFSettings const& settings, - vector & training, - vector & validation, - vector & pos, - int const& replica); - -void TrainValidSplit(const NNPDFSettings &settings, Experiment* const& exp, Experiment *&tr, Experiment *&val, int const& replica); - - -// Add chi^2 results to fit log -void LogChi2(const FitPDFSet* pdf, - vector const& pos, - vector const& train, - vector const& valid); - -void LogPDF(NNPDFSettings const& settings, - FitPDFSet* pdf, - int replica); diff --git a/nnpdfcpp/src/nnfit/inc/pdfbasis.h b/nnpdfcpp/src/nnfit/inc/pdfbasis.h deleted file mode 100644 index 60bc92416a..0000000000 --- a/nnpdfcpp/src/nnfit/inc/pdfbasis.h +++ /dev/null @@ -1,101 +0,0 @@ -// $Id$ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -#pragma once - -#include "common.h" -#include -using std::vector; - -#include -using NNPDF::PDFSet; -class NNPDFSettings; - -/** - * \class PDFBasis - * \brief Base class for the storage of preprocessing factors - */ -class PreprocParam -{ -public: - PreprocParam(const int npdf): - fNPDF(npdf), - fPDFNorm(new real[fNPDF]), - fPDFAux(new real[fNPDF]) - { - for (int i=0; iLHA - void BASIS2LHA(real const* basis, real* lha) const; - void LHA2BASIS(real const* lha, real* basis) const; - - // Basis to EVLN and back - virtual void BASIS2EVLN(real const* basis, real* evln) const = 0; - virtual void EVLN2BASIS(real const* evln, real* basis) const = 0; - - // Compute associated sum rules - virtual real ComputeSumRules(sumRule, int mem, PDFSet*, bool&) const = 0; - -protected: - const string fBasisName; //!< Name of the basis - string* const fPDFNames; //!< Names of the PDFs in the basis (for plotting) - - const int fNPDF; //!< Number of PDFs in the basis -}; diff --git a/nnpdfcpp/src/nnfit/inc/stopping.h b/nnpdfcpp/src/nnfit/inc/stopping.h deleted file mode 100644 index df3186cb8d..0000000000 --- a/nnpdfcpp/src/nnfit/inc/stopping.h +++ /dev/null @@ -1,60 +0,0 @@ -// $Id: stopping.h 1760 2014-05-06 14:56:31Z s0673800 $ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -#pragma once - -#include "common.h" - -#include "fitpdfset.h" -using std::vector; - -#include -#include -using NNPDF::Experiment; -using NNPDF::PositivitySet; - -class NNPDFSettings; - -/** - * \class StoppingCriterion - * \brief Abstract class defining the interface for a stopping criterion - */ -class StoppingCriterion -{ -public: - StoppingCriterion(NNPDFSettings const&); - virtual ~StoppingCriterion(){}; - - virtual bool Stop(FitPDFSet* pdfset, - vector& training, - vector& validation, - vectorconst& positivity); - -protected: - const NNPDFSettings& fSettings; -}; - -/** - * \class LookBackCV - * \brief Look back cross validation stopping - */ -class LookBackCV : public StoppingCriterion -{ -public: - LookBackCV(NNPDFSettings const&); - ~LookBackCV(); - - bool Stop( FitPDFSet* pdfset, - vector& training, - vector& validation, - vectorconst& positivity); - -private: - Parametrisation** fCurrentBest; - float fCurrentValidErf; - int fBestGeneration; -}; diff --git a/nnpdfcpp/src/nnfit/src/fastaddchi2.cc b/nnpdfcpp/src/nnfit/src/fastaddchi2.cc deleted file mode 100644 index bd061a79f7..0000000000 --- a/nnpdfcpp/src/nnfit/src/fastaddchi2.cc +++ /dev/null @@ -1,51 +0,0 @@ -// $Id$ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -#include "fastaddchi2.h" -#include "datautils.h" -#include -#include - -using NNPDF::ThPredictions; - -void Convolute(const PDFSet* pdf, const Experiment* exp, real * theory) -{ - int index = 0; - for (int i = 0; i < exp->GetNSet(); i++) - { - ThPredictions::Convolute(pdf,&exp->GetSet(i),theory+index); - index += pdf->GetMembers()*exp->GetSet(i).GetNData(); - } -} - -void FastAddChi2(const PDFSet* pdf, const DataSet* set, real* chi2) -{ - // Set up theory array - const int nMem = pdf->GetMembers(); - real* theory = new real[set->GetNData()*nMem]; - - // Perform convolution and chi^2 calculation - ThPredictions::Convolute(pdf,set,theory); - - // Compute chi2 - NNPDF::ComputeChi2(set,nMem,theory,chi2); - - delete[] theory; -} - -void FastAddChi2(const PDFSet* pdf, const Experiment* exp, real* chi2) -{ - // Set up theory array - const int nMem = pdf->GetMembers(); - real *theory = new real[exp->GetNData()*nMem]; - - // Perform convolution and chi^2 calculation - Convolute(pdf,exp,theory); - NNPDF::ComputeChi2(exp,nMem,theory,chi2); - - delete[] theory; -} diff --git a/nnpdfcpp/src/nnfit/src/fitbases.cc b/nnpdfcpp/src/nnfit/src/fitbases.cc deleted file mode 100644 index 623a519c90..0000000000 --- a/nnpdfcpp/src/nnfit/src/fitbases.cc +++ /dev/null @@ -1,2363 +0,0 @@ -// $Id$ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -#include "fitbases.h" -#include "nnpdfsettings.h" - -#include -#include -#include - -// Initialise a fit basis -FitBasis* getFitBasis(NNPDFSettings const& settings, basisType btype, const int &rep) -{ - // Fit Basis - FitBasis* fitbasis = NULL; - switch ( btype ) { - - case BASIS_NN23: - case BASIS_NN23QED: - { - fitbasis = new NN23FitBasis(settings); - cout << Colour::FG_BLUE << "Selecting FitBasis: NN23" << Colour::FG_DEFAULT << endl; - break; - } - - case BASIS_EVOL: - case BASIS_EVOLQED: - { - fitbasis = new EvolFitBasis(settings); - cout << Colour::FG_BLUE << "Selecting FitBasis: EVOL" << Colour::FG_DEFAULT << endl; - break; - } - - case BASIS_DISEVOL: - { - fitbasis = new DISEvolFitBasis(settings); - cout << Colour::FG_BLUE << "Selecting FitBasis: DISEVOL" << Colour::FG_DEFAULT << endl; - break; - } - case BASIS_LUX: - { - fitbasis = new LuxBasis(settings, rep); - cout << Colour::FG_BLUE << "Selecting FitBasis: LUX" << Colour::FG_DEFAULT << endl; - break; - } - - case BASIS_EVOLS: - case BASIS_EVOLSQED: - { - fitbasis = new EvolSFitBasis(settings); - cout << Colour::FG_BLUE <<"Selecting FitBasis: EVOLS" << Colour::FG_DEFAULT << endl; - break; - } - - case BASIS_NN30: - case BASIS_NN30QED: - { - fitbasis = new NN30FitBasis(settings); - cout << Colour::FG_BLUE << "Selecting FitBasis: NN30" << Colour::FG_DEFAULT << endl; - break; - } - - case BASIS_FLVR: - case BASIS_FLVRQED: - { - fitbasis = new FLVRFitBasis(settings); - cout << Colour::FG_BLUE << "Selecting FitBasis: FLVR" << Colour::FG_DEFAULT << endl; - break; - } - - case BASIS_NN30IC: - { - fitbasis = new NN30ICFitBasis(settings); - cout << Colour::FG_BLUE << "Selecting FitBasis: NN30IC" << Colour::FG_DEFAULT << endl; - break; - } - - case BASIS_EVOLIC: - { - fitbasis = new EvolICFitBasis(settings); - cout << Colour::FG_BLUE << "Selecting FitBasis: EVOLIC" << Colour::FG_DEFAULT << endl; - break; - } - - case BASIS_NN31IC: - case BASIS_NN31ICQED: - { - fitbasis = new NN31ICFitBasis(settings); - cout << Colour::FG_BLUE << "Selecting FitBasis: NN31IC" << Colour::FG_DEFAULT << endl; - break; - } - - case BASIS_NSR: - { - fitbasis = new NoSumRuleBasis(settings); - cout << Colour::FG_BLUE << "Selecting FitBasis: NSR" << Colour::FG_DEFAULT << endl; - break; - } - - case BASIS_PDF4LHC20: - { - fitbasis = new PDF4LHC20FitBasis(settings); - cout << Colour::FG_BLUE << "Selecting FitBasis: EVOL" << Colour::FG_DEFAULT << endl; - break; - } - - default: - cerr << Colour::FG_RED << "[getFitBasis] error: Invalid Fitting Basis" << Colour::FG_DEFAULT << endl; - exit(-1); - break; - } - - return fitbasis; - -} - -/** - * Basic FitBasis constructor - * Common attributes for all fit bases - **/ -FitBasis::FitBasis(NNPDFSettings const& nnset, string name, int nPDF): -PDFBasis(name, nPDF), -fArcDampFactor(new double[fNPDF]), -fPDFSqrPos(new bool[fNPDF]), -fAlpha(new real[fNPDF]), -fBeta(new real[fNPDF]), -fQ2( static_cast(pow(stod(nnset.GetTheory(APFEL::kQ0)),2))), -fGSLWork(nnset.GetGSLWorkspace()) -{ - // Squared Positivity - for (int i = 0; i < fNPDF; i++) - fPDFSqrPos[i] = nnset.Get("fitting","basis")[i]["pos"].as(); - - // Preprocessing constants - RandomGenerator* rg = RandomGenerator::GetRNG(); - - for (int i = 0; i < fNPDF; i++) - { - // Small x exponents - fAlpha[i] = -rg->GetRandomUniform(nnset.Get("fitting","basis")[i]["smallx"][0].as(), - nnset.Get("fitting","basis")[i]["smallx"][1].as()); - - // Large x exponents - fBeta[i] = rg->GetRandomUniform(nnset.Get("fitting","basis")[i]["largex"][0].as(), - nnset.Get("fitting","basis")[i]["largex"][1].as()); - } - - return; -} - -/** - * @brief The FitBasis destructor - */ -FitBasis::~FitBasis() -{ - delete[] fArcDampFactor; - delete[] fPDFSqrPos; - delete[] fAlpha; - delete[] fBeta; -} - -// Preprocess a supplied PDF -void FitBasis::Preprocess(real const& x, int const& fl, real& pdf, PreprocParam const& par) -{ - //Preprocessing and normalisation - pdf *= par.fPDFNorm[fl]*pow(1-x,fBeta[fl])*pow(x,fAlpha[fl]+1); - - return; -} - -void FitBasis::Preprocess(real const& x, real* pdf, PreprocParam const& par) -{ - for (int i = 0; i < fNPDF; i++) - { - // Positive definite PDFs - if (fPDFSqrPos[i]) - pdf[i] *= pdf[i]; - - Preprocess(x,i,pdf[i],par); - } - - return; -} - -void FitBasis::NetTransform(int const& fl, int const& nfl, int* transform) -{ - for (int i = 0; i < nfl; i++) - transform[i] = 0; - transform[fl] = 1; -} - -/** - * NNPDF2.3 Fit Basis - **/ - -NN23FitBasis::NN23FitBasis(NNPDFSettings const& nnset): -FitBasis(nnset, "NN23FitBasis", 7+nnset.IsQED()), -fQED(nnset.IsQED()) -{ - // PDF Names for plotting - fPDFNames[FIT_SNG] = "Singlet"; - fPDFNames[FIT_GLU] = "Gluon"; - fPDFNames[FIT_VAL] = "Valence"; - fPDFNames[FIT_T3] = "Triplet"; - fPDFNames[FIT_DS] = "Sea Asymmetry"; - fPDFNames[FIT_SP] = "Strange Sea"; - fPDFNames[FIT_SM] = "Strange Valence"; - if (fQED) - fPDFNames[FIT_GAM] = "Photon"; - - // Damping factor for arclengths - fArcDampFactor[FIT_SNG] = 1; - fArcDampFactor[FIT_GLU] = 1; - fArcDampFactor[FIT_VAL] = 0; - fArcDampFactor[FIT_T3] = 1; - fArcDampFactor[FIT_DS] = 1; - fArcDampFactor[FIT_SP] = 1; - fArcDampFactor[FIT_SM] = 0; - if (fQED) - fArcDampFactor[FIT_GAM] = 1; - - RandomGenerator* rg = RandomGenerator::GetRNG(); - fSauxBeta = 3.5 + rg->GetRandomUniform(0.0,1.0); - fSauxAlpha = fSauxBeta/2; - fSauxGamma = gsl_sf_gamma(fSauxBeta + fSauxAlpha + 2)/(gsl_sf_gamma(fSauxAlpha+1)*gsl_sf_gamma(fSauxBeta+1)); -} - -void NN23FitBasis::ComputeParam(PDFSet* pdf, int mem, PreprocParam& param, bool &status) const -{ - // status - status = false; - - // Clear old normalisations - for (int i=0; iIntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); // Total valence - norm[ FIT_DS] = (1-pdf->IntegratePDF(mem,FIT_T3,fQ2, PDFSet::FX,status,fGSLWork))/ - (2*pdf->IntegratePDF(mem,FIT_DS,fQ2, PDFSet::FX,status,fGSLWork)); // D_S - 1-t3/2d_s - - // Strange valence sum rule - param.fPDFAux[FIT_SM] = pdf->IntegratePDF(mem,FIT_SM,fQ2,PDFSet::FX,status,fGSLWork)*fSauxGamma; - - // ************ QED dependent normalisations ************** - if (fQED) - { - norm[FIT_GLU] = (1-pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork) - pdf->IntegratePDF(mem,FIT_GAM,fQ2,PDFSet::XFX,status,fGSLWork)) - / pdf->IntegratePDF(mem,FIT_GLU,fQ2,PDFSet::XFX,status,fGSLWork); - } - else - { - norm[FIT_GLU] = (1-pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork))/ - pdf->IntegratePDF(mem,FIT_GLU,fQ2,PDFSet::XFX,status,fGSLWork); - } - - return; - -} - -// Preprocess a supplied PDF -void NN23FitBasis::Preprocess(real const& x, int const& fl, real& pdf, PreprocParam const& par) -{ - // Basic Preprocessing - FitBasis::Preprocess(x,fl,pdf,par); - - // Strange auxilliary term - if (fl == FIT_SM) - pdf -= par.fPDFAux[FIT_SM]*pow(1-x,fSauxBeta)*pow(x,fSauxAlpha+1); - - return; -} - -/** - * @brief NN23FitBasis::BASIS2EVLN - * @param FIT - * @param EVLN - */ -void NN23FitBasis::BASIS2EVLN(const real *FIT, real *EVLN) const -{ - if ( fQED ) - EVLN[EVLN_GAM] = FIT[FIT_GAM]; - else - EVLN[EVLN_GAM] = 0; - - EVLN[EVLN_SNG] = FIT[FIT_SNG]; //Singlet - EVLN[EVLN_GLU] = FIT[FIT_GLU]; //Gluon - EVLN[EVLN_VAL] = FIT[FIT_VAL]; //Valence - EVLN[EVLN_V3] = FIT[FIT_T3] + 2*FIT[FIT_DS]; //V3 = T3+2*Ds - EVLN[EVLN_V8] = FIT[FIT_VAL] -3*FIT[FIT_SM]; //V8 = V - 3sm - EVLN[EVLN_V15] = FIT[FIT_VAL]; // V15 - EVLN[EVLN_V24] = FIT[FIT_VAL]; // V24 - EVLN[EVLN_V35] = FIT[FIT_VAL]; // V35 - EVLN[EVLN_T3] = FIT[FIT_T3]; //T3 - EVLN[EVLN_T8] = FIT[FIT_SNG] - 3*FIT[FIT_SP]; //T8 = S - 3sp - EVLN[EVLN_T15] = FIT[FIT_SNG]; //T15 - EVLN[EVLN_T24] = FIT[FIT_SNG]; //T24 - EVLN[EVLN_T35] = FIT[FIT_SNG]; //T35 - - return; -} - -void NN23FitBasis::EVLN2BASIS(const real *EVLN, real *FIT) const -{ - // Order in fitting basis - // S g V T3 Ds sp sm gam - - // Order in Evln bassi - // γ, Σ, g, V, V3, V8, V15, V24, V35, T3, T8, T15, T24, T35 - - //V3 = T3+2*Ds - //V8 = V - 3sm - //T8 = S - 3sp - - FIT[FIT_SNG] = EVLN[EVLN_SNG]; //Singlet - FIT[FIT_GLU] = EVLN[EVLN_GLU]; //gluon - FIT[FIT_VAL] = EVLN[EVLN_VAL]; //valence - FIT[FIT_T3] = EVLN[EVLN_T3]; // T3 - FIT[FIT_DS] = 0.5*(EVLN[EVLN_V3] - EVLN[EVLN_T3]); // Ds = (V3-T3)/2 - - FIT[FIT_SP] = (EVLN[EVLN_SNG] - EVLN[EVLN_T8])/3.0; //sp = (S-T8)/3 - FIT[FIT_SM] = (EVLN[EVLN_VAL] - EVLN[EVLN_V8])/3.0; //sm = (V - V8)/3 - - if (fQED) - FIT[FIT_GAM] = EVLN[EVLN_GAM]; // photon - - return; -} - -real NN23FitBasis::ComputeSumRules(sumRule rule, int mem, PDFSet *pdf, bool &status) const -{ - // status - status = false; - - // sum rule calculations - switch (rule) { - // total momentum - case SUM_MSR: - { - real xsng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real xglu = pdf->IntegratePDF(mem,FIT_GLU,fQ2,PDFSet::XFX,status,fGSLWork); - real msr = xsng+xglu; - if (fQED) - { - real xgam = pdf->IntegratePDF(mem,FIT_GAM,fQ2,PDFSet::XFX,status,fGSLWork); - msr += xgam; - } - return msr; - } - break; - // up valence - case SUM_UVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real t3 = pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::FX,status,fGSLWork); - real delta = pdf->IntegratePDF(mem,FIT_DS,fQ2,PDFSet::FX,status,fGSLWork); - real sm = pdf->IntegratePDF(mem,FIT_SM,fQ2,PDFSet::FX,status,fGSLWork); - return 0.5*( val + t3 + 2.0*delta - sm ); - } - break; - // down valence - case SUM_DVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real t3 = pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::FX,status,fGSLWork); - real delta = pdf->IntegratePDF(mem,FIT_DS,fQ2,PDFSet::FX,status,fGSLWork); - real sm = pdf->IntegratePDF(mem,FIT_SM,fQ2,PDFSet::FX,status,fGSLWork); - return 0.5*( val - t3 - 2.0*delta - sm ); - } - break; - case SUM_SVL: - // strange valence - return pdf->IntegratePDF(mem,FIT_SM,fQ2,PDFSet::FX,status,fGSLWork); - break; - case SUM_USM: - // up momentum fraction - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t3 = pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::XFX,status,fGSLWork); - real sp = pdf->IntegratePDF(mem,FIT_SP,fQ2,PDFSet::XFX,status,fGSLWork); - return 0.5*( sng + t3 - sp ); - } - break; - case SUM_DSM: - // down momentum fraction - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t3 = pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::XFX,status,fGSLWork); - real sp = pdf->IntegratePDF(mem,FIT_SP,fQ2,PDFSet::XFX,status,fGSLWork); - return 0.5*( sng - t3 - sp ); - } - break; - case SUM_SSM: - // strange momentum fraction - return pdf->IntegratePDF(mem,FIT_SP,fQ2,PDFSet::XFX,status,fGSLWork); - break; - default: - cerr << "NN23FitBasis::ComputeSumRules error: unknown sum rule"<IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); // Total valence - norm[FIT_V3] = 1.0f/pdf->IntegratePDF(mem,FIT_V3,fQ2,PDFSet::FX,status,fGSLWork); // V3 - norm[FIT_V8] = 3.0f/pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); // V8 - - // ************ QED dependent normalisations ************** - if (fQED) - { - norm[FIT_GLU] = (1-pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork) - pdf->IntegratePDF(mem,FIT_GAM,fQ2,PDFSet::XFX,status,fGSLWork)) - / pdf->IntegratePDF(mem,FIT_GLU,fQ2,PDFSet::XFX,status,fGSLWork); - } - else - { - norm[FIT_GLU] = (1-pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork))/ - pdf->IntegratePDF(mem,FIT_GLU,fQ2,PDFSet::XFX,status,fGSLWork); - } - - return; - -} - -/** - * @brief EvolFitBasis::BASIS2EVLN - * @param FIT - * @param EVLN - */ -void EvolFitBasis::BASIS2EVLN(const real *FIT, real *EVLN) const -{ - if ( fQED ) - EVLN[EVLN_GAM] = FIT[FIT_GAM]; - else - EVLN[EVLN_GAM] = 0; - - EVLN[EVLN_SNG] = FIT[FIT_SNG]; //Singlet - EVLN[EVLN_GLU] = FIT[FIT_GLU]; //Gluon - EVLN[EVLN_VAL] = FIT[FIT_VAL]; //Valence - EVLN[EVLN_V3] = FIT[FIT_V3]; //V3 - EVLN[EVLN_V8] = FIT[FIT_V8]; //V8 - EVLN[EVLN_V15] = FIT[FIT_VAL]; //V15 = V - EVLN[EVLN_V24] = FIT[FIT_VAL]; //V24 = V - EVLN[EVLN_V35] = FIT[FIT_VAL]; //V35 = V - EVLN[EVLN_T3] = FIT[FIT_T3]; //T3 - EVLN[EVLN_T8] = FIT[FIT_T8]; //T8 - EVLN[EVLN_T15] = FIT[FIT_SNG]; //T15 = S - EVLN[EVLN_T24] = FIT[FIT_SNG]; //T24 = S - EVLN[EVLN_T35] = FIT[FIT_SNG]; //T35 = S - - return; -} - -void EvolFitBasis::EVLN2BASIS(const real *EVLN, real *FIT) const -{ - // Order in fitting basis - // S g V V3 V8 T3 T8 gam - - // Order in Evln bassi - // γ, Σ, g, V, V3, V8, V15, V24, V35, T3, T8, T15, T24, T35 - - FIT[FIT_SNG] = EVLN[EVLN_SNG]; //Singlet - FIT[FIT_GLU] = EVLN[EVLN_GLU]; //gluon - FIT[FIT_VAL] = EVLN[EVLN_VAL]; //valence - FIT[FIT_V3] = EVLN[EVLN_V3]; // V3 - FIT[FIT_V8] = EVLN[EVLN_V8]; // V8 - FIT[FIT_T3] = EVLN[EVLN_T3]; // T3 - FIT[FIT_T8] = EVLN[EVLN_T8]; // T8 - - if (fQED) - FIT[FIT_GAM] = EVLN[0]; // photon - - return; -} - -real EvolFitBasis::ComputeSumRules(sumRule rule, int mem, PDFSet *pdf, bool &status) const -{ - // status - status = false; - - // sum rule calculations - switch (rule) { - case SUM_MSR: - { - real xsng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real xglu = pdf->IntegratePDF(mem,FIT_GLU,fQ2,PDFSet::XFX,status,fGSLWork); - real msr = xsng+xglu; - if (fQED) - { - real xgam = pdf->IntegratePDF(mem,FIT_GAM,fQ2,PDFSet::XFX,status,fGSLWork); - msr += xgam; - } - return msr; - } - break; - case SUM_UVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v3 = pdf->IntegratePDF(mem,FIT_V3,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - return ( 2.0*val + 3.0*v3 + v8 )/6.0; - } - break; - case SUM_DVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v3 = pdf->IntegratePDF(mem,FIT_V3,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - return ( 2.0*val - 3.0*v3 + v8 )/6.0; - } - break; - case SUM_SVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - return ( val - v8 )/3.0; - } - break; - case SUM_USM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t3 = pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - return ( 2.0*sng + 3.0*t3 + t8 )/6.0; - } - break; - case SUM_DSM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t3 = pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - return ( 2.0*sng - 3.0*t3 + t8 )/6.0; - } - break; - case SUM_SSM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - return ( sng - t8 )/3.0; - } - break; - default: - cerr << "EvolFitBasis::ComputeSumRules error: unknown sum rule"<IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); // Total valence - norm[FIT_V3] = 1.0f/pdf->IntegratePDF(mem,FIT_V3,fQ2,PDFSet::FX,status,fGSLWork); // V3 - - // ************ QED dependent normalisations ************** - if (fQED) - { - norm[FIT_GLU] = (1-pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork) - pdf->IntegratePDF(mem,FIT_GAM,fQ2,PDFSet::XFX,status,fGSLWork)) - / pdf->IntegratePDF(mem,FIT_GLU,fQ2,PDFSet::XFX,status,fGSLWork); - } - else - { - norm[FIT_GLU] = (1-pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork))/ - pdf->IntegratePDF(mem,FIT_GLU,fQ2,PDFSet::XFX,status,fGSLWork); - } - - return; - -} - -/** - * @brief EvolFitBasis::BASIS2EVLN - * @param FIT - * @param EVLN - */ -void PDF4LHC20FitBasis::BASIS2EVLN(const real *FIT, real *EVLN) const -{ - if ( fQED ) - EVLN[EVLN_GAM] = FIT[FIT_GAM]; - else - EVLN[EVLN_GAM] = 0; - - EVLN[EVLN_SNG] = FIT[FIT_SNG]; //Singlet - EVLN[EVLN_GLU] = FIT[FIT_GLU]; //Gluon - EVLN[EVLN_VAL] = FIT[FIT_VAL]; //Valence - EVLN[EVLN_V3] = FIT[FIT_V3]; //V3 - EVLN[EVLN_V8] = FIT[FIT_VAL]; //V8 - EVLN[EVLN_V15] = FIT[FIT_VAL]; //V15 = V - EVLN[EVLN_V24] = FIT[FIT_VAL]; //V24 = V - EVLN[EVLN_V35] = FIT[FIT_VAL]; //V35 = V - EVLN[EVLN_T3] = FIT[FIT_T3]; //T3 - EVLN[EVLN_T8] = FIT[FIT_T8]; //T8 - EVLN[EVLN_T15] = FIT[FIT_SNG]; //T15 = S - EVLN[EVLN_T24] = FIT[FIT_SNG]; //T24 = S - EVLN[EVLN_T35] = FIT[FIT_SNG]; //T35 = S - - return; -} - -void PDF4LHC20FitBasis::EVLN2BASIS(const real *EVLN, real *FIT) const -{ - // Order in fitting basis - // S g V V3 V8 T3 T8 gam - - // Order in Evln bassi - // γ, Σ, g, V, V3, V8, V15, V24, V35, T3, T8, T15, T24, T35 - - FIT[FIT_SNG] = EVLN[EVLN_SNG]; //Singlet - FIT[FIT_GLU] = EVLN[EVLN_GLU]; //gluon - FIT[FIT_VAL] = EVLN[EVLN_VAL]; //valence - FIT[FIT_V3] = EVLN[EVLN_V3]; // V3 - FIT[FIT_T3] = EVLN[EVLN_T3]; // T3 - FIT[FIT_T8] = EVLN[EVLN_T8]; // T8 - - if (fQED) - FIT[FIT_GAM] = EVLN[0]; // photon - - return; -} - -real PDF4LHC20FitBasis::ComputeSumRules(sumRule rule, int mem, PDFSet *pdf, bool &status) const -{ - // status - status = false; - - // sum rule calculations - switch (rule) { - case SUM_MSR: - { - real xsng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real xglu = pdf->IntegratePDF(mem,FIT_GLU,fQ2,PDFSet::XFX,status,fGSLWork); - real msr = xsng+xglu; - if (fQED) - { - real xgam = pdf->IntegratePDF(mem,FIT_GAM,fQ2,PDFSet::XFX,status,fGSLWork); - msr += xgam; - } - return msr; - } - break; - case SUM_UVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v3 = pdf->IntegratePDF(mem,FIT_V3,fQ2,PDFSet::FX,status,fGSLWork); - return ( val + v3 )/2.0; - } - break; - case SUM_DVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v3 = pdf->IntegratePDF(mem,FIT_V3,fQ2,PDFSet::FX,status,fGSLWork); - return ( val - v3 )/2.0; - } - break; - case SUM_SVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - return ( val - val )/3.0; - } - break; - case SUM_USM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t3 = pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - return ( 2.0*sng + 3.0*t3 + t8 )/6.0; - } - break; - case SUM_DSM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t3 = pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - return ( 2.0*sng - 3.0*t3 + t8 )/6.0; - } - break; - case SUM_SSM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - return ( sng - t8 )/3.0; - } - break; - default: - cerr << "PDF4LHC20FitBasis::ComputeSumRules error: unknown sum rule"<IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork))/ - pdf->IntegratePDF(mem,FIT_GLU,fQ2,PDFSet::XFX,status,fGSLWork); - - return; -} - -/** - * @brief DISEvolFitBasis::BASIS2EVLN - * @param FIT - * @param EVLN - */ -void DISEvolFitBasis::BASIS2EVLN(const real *FIT, real *EVLN) const -{ - - EVLN[EVLN_GAM] = 0; - EVLN[EVLN_SNG] = FIT[FIT_SNG]; //Singlet - EVLN[EVLN_GLU] = FIT[FIT_GLU]; //Gluon - EVLN[EVLN_VAL] = 0; //Valence - EVLN[EVLN_V3] = 0; //V3 = V - EVLN[EVLN_V8] = 0; //V8 = V - EVLN[EVLN_V15] = 0; //V15 = V - EVLN[EVLN_V24] = 0; //V24 = V - EVLN[EVLN_V35] = 0; //V35 = V - EVLN[EVLN_T3] = 0; //T3 - EVLN[EVLN_T8] = FIT[FIT_T8]; //T8 - EVLN[EVLN_T15] = 0; //T15 = S - EVLN[EVLN_T24] = 0; //T24 = S - EVLN[EVLN_T35] = 0; //T35 = S - - return; -} - -void DISEvolFitBasis::EVLN2BASIS(const real *EVLN, real *FIT) const -{ - // Order in fitting basis - // S g V V3 V8 T3 T8 gam - - // Order in Evln bassi - // γ, Σ, g, V, V3, V8, V15, V24, V35, T3, T8, T15, T24, T35 - - FIT[FIT_SNG] = EVLN[EVLN_SNG]; //Singlet - FIT[FIT_GLU] = EVLN[EVLN_GLU]; //gluon - FIT[FIT_T8] = EVLN[EVLN_T8]; // T8 - - return; -} - -real DISEvolFitBasis::ComputeSumRules(sumRule rule, int mem, PDFSet *pdf, bool &status) const -{ -// status - status = false; - - // sum rule calculations - switch (rule) { - case SUM_MSR: - { - real xsng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real xglu = pdf->IntegratePDF(mem,FIT_GLU,fQ2,PDFSet::XFX,status,fGSLWork); - real msr = xsng+xglu; - return msr; - } - break; - case SUM_UVL: - { - /* - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v3 = pdf->IntegratePDF(mem,FIT_V3,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - return ( 2.0*val + 3.0*v3 + v8 )/6.0; - */ - return 0; - } - break; - case SUM_DVL: - { - /* - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v3 = pdf->IntegratePDF(mem,FIT_V3,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - return ( 2.0*val - 3.0*v3 + v8 )/6.0; - */ - return 0; - } - break; - case SUM_SVL: - { - /* - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - return ( val - v8 )/3.0; - */ - return 0; - } - break; - case SUM_USM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t3 = 0; //pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - return ( 2.0*sng + 3.0*t3 + t8 )/6.0; - } - break; - case SUM_DSM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t3 = 0; //pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - return ( 2.0*sng - 3.0*t3 + t8 )/6.0; - } - break; - case SUM_SSM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - return ( sng - t8 )/3.0; - } - break; - default: - cerr << "EvolFitBasis::ComputeSumRules error: unknown sum rule"<(), replica); - - // PDF Names for plotting - fPDFNames[FIT_SNG] = "Singlet"; - fPDFNames[FIT_GLU] = "Gluon"; - fPDFNames[FIT_VAL] = "V"; - fPDFNames[FIT_V3] = "V3"; - fPDFNames[FIT_V8] = "V8"; - fPDFNames[FIT_T3] = "T3"; - fPDFNames[FIT_T8] = "T8"; - fPDFNames[FIT_CP] = "c+"; - - // Damping factor for arclengths - fArcDampFactor[FIT_SNG] = 1; - fArcDampFactor[FIT_GLU] = 1; - fArcDampFactor[FIT_VAL] = 0; - fArcDampFactor[FIT_V3] = 0; - fArcDampFactor[FIT_V8] = 0; - fArcDampFactor[FIT_T3] = 1; - fArcDampFactor[FIT_T8] = 1; - fArcDampFactor[FIT_CP] = 1; -} - -/** - * @brief LuxBasis::~LuxBasis - */ -LuxBasis::~LuxBasis() -{ - delete fPhotonSet; -} - -/** - * @brief LuxBasis::BASIS2EVLN - */ -void LuxBasis::BASIS2EVLN(const real *FIT, real *EVLN) const -{ - EVLN[EVLN_GAM] = FIT[FIT_GAM]; //Photon - EVLN[EVLN_SNG] = FIT[FIT_SNG]; //Singlet - EVLN[EVLN_GLU] = FIT[FIT_GLU]; //Gluon - EVLN[EVLN_VAL] = FIT[FIT_VAL]; //Valence - EVLN[EVLN_V3] = FIT[FIT_V3]; //V3 - EVLN[EVLN_V8] = FIT[FIT_V8]; //V8 - EVLN[EVLN_V15] = FIT[FIT_VAL]; //V15 = V (c- = 0) - EVLN[EVLN_V24] = FIT[FIT_VAL]; //V24 = V - EVLN[EVLN_V35] = FIT[FIT_VAL]; //V35 = V - EVLN[EVLN_T3] = FIT[FIT_T3]; //T3 - EVLN[EVLN_T8] = FIT[FIT_T8]; //T8 - EVLN[EVLN_T15] = FIT[FIT_SNG] - 4*FIT[FIT_CP]; //T15 - EVLN[EVLN_T24] = FIT[FIT_SNG]; //T24 = S - EVLN[EVLN_T35] = FIT[FIT_SNG]; //T35 = S -} - -/** - * @brief LuxBasis::EVLN2BASIS - */ -void LuxBasis::EVLN2BASIS(const real *EVLN, real *FIT) const -{ - // Order in fitting basis - // S g V V3 V8 T3 T8 c+ gam - - // Order in Evln bassi - // γ, Σ, g, V, V3, V8, V15, V24, V35, T3, T8, T15, T24, T35 - - FIT[FIT_SNG] = EVLN[EVLN_SNG]; //Singlet - FIT[FIT_GLU] = EVLN[EVLN_GLU]; //gluon - FIT[FIT_VAL] = EVLN[EVLN_VAL]; //valence - FIT[FIT_V3] = EVLN[EVLN_V3]; //V3 - FIT[FIT_V8] = EVLN[EVLN_V8]; //V8 - FIT[FIT_T3] = EVLN[EVLN_T3]; //T3 - FIT[FIT_T8] = EVLN[EVLN_T8]; //T8 - FIT[FIT_CP] = (EVLN[EVLN_SNG]-EVLN[EVLN_T15])/4; // T15 - FIT[FIT_GAM] = EVLN[EVLN_GAM]; //photon -} - -/** - * @brief LuxBasis::ComputeParam - */ -void LuxBasis::ComputeParam(PDFSet* pdf, int mem, PreprocParam& param, bool &status) const -{ - // status - status = false; - - // Clear old normalisations - for (int i=0; iIntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); // Total valence - norm[FIT_V3] = 1.0f/pdf->IntegratePDF(mem,FIT_V3,fQ2,PDFSet::FX,status,fGSLWork); // V3 - norm[FIT_V8] = 3.0f/pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); // V8 - norm[FIT_GLU] = (1-pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork) - pdf->IntegratePDF(mem,FIT_GAM,fQ2,PDFSet::XFX,status,fGSLWork)) - / pdf->IntegratePDF(mem,FIT_GLU,fQ2,PDFSet::XFX,status,fGSLWork); - -} - -/** - * @brief LuxBasis::ComputeSumRules - */ -real LuxBasis::ComputeSumRules(sumRule rule, int mem, PDFSet *pdf, bool &status) const -{ - // status - status = false; - - // sum rule calculations - switch (rule) { - case SUM_MSR: - { - real xsng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real xglu = pdf->IntegratePDF(mem,FIT_GLU,fQ2,PDFSet::XFX,status,fGSLWork); - real xgam = pdf->IntegratePDF(mem,FIT_GAM,fQ2,PDFSet::XFX,status,fGSLWork); - real msr = xsng+xglu+xgam; - return msr; - } - break; - case SUM_UVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v3 = pdf->IntegratePDF(mem,FIT_V3,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - real v15 = val; - return ( 3.0*val + 6.0*v3 + 2.0*v8 + v15 )/12.0; - } - break; - case SUM_DVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v3 = pdf->IntegratePDF(mem,FIT_V3,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - real v15 = val; - return ( 3.0*val - 6.0*v3 + 2.0*v8 + v15 )/12.0; - } - break; - case SUM_SVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - real v15 = val; - return ( 3.0*val - 4.0*v8 + v15 )/12.0; - } - break; - case SUM_CVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v15 = val; - return ( val - v15 )/4.0; - } - break; - case SUM_USM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t3 = pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - real cp = pdf->IntegratePDF(mem,FIT_CP,fQ2,PDFSet::XFX,status,fGSLWork); - real t15 = sng-4*cp; - return ( 3.0*sng + 6.0*t3 + 2.0*t8 + t15 )/12.0; - } - break; - case SUM_DSM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t3 = pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - real cp = pdf->IntegratePDF(mem,FIT_CP,fQ2,PDFSet::XFX,status,fGSLWork); - real t15 = sng-4*cp; - return ( 3.0*sng - 6.0*t3 + 2.0*t8 + t15)/12.0; - } - break; - case SUM_SSM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - real cp = pdf->IntegratePDF(mem,FIT_CP,fQ2,PDFSet::XFX,status,fGSLWork); - real t15 = sng-4*cp; - return ( 3.0*sng - 4.0*t8 + t15)/12.0; - } - break; - case SUM_CSM: - { - real cp = pdf->IntegratePDF(mem,FIT_CP,fQ2,PDFSet::XFX,status,fGSLWork); - return cp; - } - break; - default: - cerr << "LuxBasis::ComputeSumRules error: unknown sum rule"<xfxQ(x, fQ0, 0, 22); -} - -/** - * @brief FitBasis::Preprocess - */ -void LuxBasis::Preprocess(real const& x, real* pdf, PreprocParam const& par) -{ - FitBasis::Preprocess(x, pdf, par); - - // Force photon preprocess - Preprocess(x,fNPDF,pdf[fNPDF],par); -} - - -// ******************** EVOLUTION ONLY STRANGENESS ********************* - -/** - * Evolution only for strangeness - **/ - -EvolSFitBasis::EvolSFitBasis(NNPDFSettings const& nnset): -FitBasis(nnset, "EvolSFitBasis", 7+nnset.IsQED()), -fQED(nnset.IsQED()) -{ - // PDF Names for plotting - fPDFNames[FIT_SNG] = "Singlet"; - fPDFNames[FIT_GLU] = "Gluon"; - fPDFNames[FIT_VAL] = "Valence"; - fPDFNames[FIT_V8] = "V8"; - fPDFNames[FIT_T3] = "Triplet"; - fPDFNames[FIT_T8] = "T8"; - fPDFNames[FIT_DS] = "Sea Asymmetry"; - if (fQED) - fPDFNames[FIT_GAM] = "Photon"; - - // Damping factor for arclengths - fArcDampFactor[FIT_SNG] = 1; - fArcDampFactor[FIT_GLU] = 1; - fArcDampFactor[FIT_VAL] = 0; - fArcDampFactor[FIT_V8] = 0; - fArcDampFactor[FIT_T3] = 1; - fArcDampFactor[FIT_T8] = 1; - fArcDampFactor[FIT_DS] = 1; - if (fQED) - fArcDampFactor[FIT_GAM] = 1; -} - -void EvolSFitBasis::ComputeParam(PDFSet* pdf, int mem, PreprocParam& param, bool &status) const -{ - // status - status = false; - - // Clear old normalisations - for (int i=0; iIntegratePDF(mem,FIT_VAL, fQ2,PDFSet::FX,status,fGSLWork); // Total valence - norm[FIT_V8] = 3.0f/pdf->IntegratePDF(mem,FIT_V8, fQ2,PDFSet::FX,status,fGSLWork); // V8 - norm[ FIT_DS] = (1-pdf->IntegratePDF(mem,FIT_T3, fQ2,PDFSet::FX,status,fGSLWork))/ - (2*pdf->IntegratePDF(mem,FIT_DS, fQ2,PDFSet::FX,status,fGSLWork)); // D_S - 1-t3/2d_s - - // ************ QED dependent normalisations ************** - if (fQED) - { - norm[FIT_GLU] = (1-pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork) - pdf->IntegratePDF(mem,FIT_GAM,fQ2,PDFSet::XFX,status,fGSLWork)) - / pdf->IntegratePDF(mem,FIT_GLU, fQ2,PDFSet::XFX,status,fGSLWork); - } - else - { - norm[FIT_GLU] = (1-pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork))/ - pdf->IntegratePDF(mem,FIT_GLU,fQ2,PDFSet::XFX,status,fGSLWork); - } - - return; - -} - -/** - * @brief NN23FitBasis::BASIS2EVLN - * @param FIT - * @param EVLN - */ -void EvolSFitBasis::BASIS2EVLN(const real *FIT, real *EVLN) const -{ - if ( fQED ) - EVLN[EVLN_GAM] = FIT[FIT_GAM]; - else - EVLN[EVLN_GAM] = 0; - - - enum fitBasis {FIT_SNG, FIT_GLU, FIT_VAL, FIT_V8, FIT_T3, FIT_T8, FIT_DS, FIT_GAM }; - - EVLN[EVLN_SNG] = FIT[FIT_SNG]; //Singlet - EVLN[EVLN_GLU] = FIT[FIT_GLU]; //Gluon - EVLN[EVLN_VAL] = FIT[FIT_VAL]; //Valence - EVLN[EVLN_V3] = FIT[FIT_T3]+2*FIT[FIT_DS]; //V3 = T3+2*Ds - EVLN[EVLN_V8] = FIT[FIT_V8]; //V8 - EVLN[EVLN_V15] = FIT[FIT_VAL]; //V15 = V - EVLN[EVLN_V24] = FIT[FIT_VAL]; //V24 = V - EVLN[EVLN_V35] = FIT[FIT_VAL]; //V35 = V - EVLN[EVLN_T3] = FIT[FIT_T3]; //T3 - EVLN[EVLN_T8] = FIT[FIT_T8]; //T8 - EVLN[EVLN_T15] = FIT[FIT_SNG]; //T15 = S - EVLN[EVLN_T24] = FIT[FIT_SNG]; //T24 = S - EVLN[EVLN_T35] = FIT[FIT_SNG]; //T35 = S - - return; -} - -void EvolSFitBasis::EVLN2BASIS(const real *EVLN, real *FIT) const -{ - // Order in fitting basis - // S g V T3 Ds sp sm gam - - // Order in Evln bassi - // γ, Σ, g, V, V3, V8, V15, V24, V35, T3, T8, T15, T24, T35 - - //V3 = T3+2*Ds - //V8 = V - 3sm - //T8 = S - 3sp - - FIT[FIT_SNG] = EVLN[EVLN_SNG]; //Singlet - FIT[FIT_GLU] = EVLN[EVLN_GLU]; //gluon - FIT[FIT_VAL] = EVLN[EVLN_VAL]; //valence - FIT[FIT_V8] = EVLN[EVLN_V8]; // v8 - FIT[FIT_T3] = EVLN[EVLN_T3]; // t3 - FIT[FIT_T8] = EVLN[EVLN_T8]; // t8 - FIT[FIT_DS] = 0.5*(EVLN[EVLN_V3] - EVLN[EVLN_T3]); // Ds = (V3-T3)/2 - - if (fQED) - FIT[FIT_GAM] = EVLN[EVLN_GAM]; // photon - - return; -} - -real EvolSFitBasis::ComputeSumRules(sumRule rule, int mem, PDFSet *pdf, bool &status) const -{ - // status - status = false; - - // sum rule calculations - switch (rule) { - case SUM_MSR: - { - real xsng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real xglu = pdf->IntegratePDF(mem,FIT_GLU,fQ2,PDFSet::XFX,status,fGSLWork); - real msr = xsng+xglu; - if (fQED) - { - real xgam = pdf->IntegratePDF(mem,FIT_GAM,fQ2,PDFSet::XFX,status,fGSLWork); - msr += xgam; - } - return msr; - } - break; - case SUM_UVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real t3 = pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::FX,status,fGSLWork); - real ds = pdf->IntegratePDF(mem,FIT_DS,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - return ( 2.0*val + 3.0*t3 + 6.0*ds + v8 )/6.0; - } - break; - case SUM_DVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real t3 = pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::FX,status,fGSLWork); - real ds = pdf->IntegratePDF(mem,FIT_DS,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - return ( 2.0*val - 3.0*t3 - 6.0*ds + v8 )/6.0; - } - break; - case SUM_SVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - return ( val - v8 )/3.0; - } - break; - case SUM_USM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t3 = pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - return ( 2.0*sng + 3.0*t3 + t8 )/6.0; - } - break; - case SUM_DSM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t3 = pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - return ( 2.0*sng - 3.0*t3 + t8 )/6.0; - } - break; - case SUM_SSM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - return ( sng - t8 )/3.0; - } - break; - default: - cerr << "EvolSFitBasis::ComputeSumRules error: unknown sum rule"<IntegratePDF(mem,FIT_VAL, fQ2,PDFSet::FX,status,fGSLWork); // Total valence - norm[FIT_V3] = 1.0f/pdf->IntegratePDF(mem,FIT_V3, fQ2,PDFSet::FX,status,fGSLWork); // V3 - norm[FIT_V8] = 3.0f/pdf->IntegratePDF(mem,FIT_V8, fQ2,PDFSet::FX,status,fGSLWork); // V8 - - // ************ QED dependent normalisations ************** - if (fQED) - { - norm[FIT_GLU] = (1-pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork) - pdf->IntegratePDF(mem,FIT_GAM,fQ2,PDFSet::XFX,status,fGSLWork)) - / pdf->IntegratePDF(mem,FIT_GLU, fQ2,PDFSet::XFX,status,fGSLWork); - } - else - { - norm[FIT_GLU] = (1-pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork))/ - pdf->IntegratePDF(mem,FIT_GLU,fQ2,PDFSet::XFX,status,fGSLWork); - } - - return; - -} - -/** - * @brief EvolFitBasis::BASIS2EVLN - * @param FIT - * @param EVLN - */ -void EvolICFitBasis::BASIS2EVLN(const real *FIT, real *EVLN) const -{ - if ( fQED ) - EVLN[EVLN_GAM] = FIT[FIT_GAM]; - else - EVLN[EVLN_GAM] = 0; - - EVLN[EVLN_SNG] = FIT[FIT_SNG]; //Singlet - EVLN[EVLN_GLU] = FIT[FIT_GLU]; //Gluon - EVLN[EVLN_VAL] = FIT[FIT_VAL]; //Valence - EVLN[EVLN_V3] = FIT[FIT_V3]; //V3 - EVLN[EVLN_V8] = FIT[FIT_V8]; //V8 - EVLN[EVLN_V15] = FIT[FIT_VAL]; //V15 = V (c- = 0) - EVLN[EVLN_V24] = FIT[FIT_VAL]; //V24 = V - EVLN[EVLN_V35] = FIT[FIT_VAL]; //V35 = V - EVLN[EVLN_T3] = FIT[FIT_T3]; //T3 - EVLN[EVLN_T8] = FIT[FIT_T8]; //T8 - EVLN[EVLN_T15] = FIT[FIT_T15]; //T15 - EVLN[EVLN_T24] = FIT[FIT_SNG]; //T24 = S - EVLN[EVLN_T35] = FIT[FIT_SNG]; //T35 = S - - return; -} - -void EvolICFitBasis::EVLN2BASIS(const real *EVLN, real *FIT) const -{ - // Order in fitting basis - // S g V V3 V8 T3 T8 gam - - // Order in Evln bassi - // γ, Σ, g, V, V3, V8, V15, V24, V35, T3, T8, T15, T24, T35 - - FIT[FIT_SNG] = EVLN[EVLN_SNG]; //Singlet - FIT[FIT_GLU] = EVLN[EVLN_GLU]; //gluon - FIT[FIT_VAL] = EVLN[EVLN_VAL]; //valence - FIT[FIT_V3] = EVLN[EVLN_V3]; // V3 - FIT[FIT_V8] = EVLN[EVLN_V8]; // V8 - FIT[FIT_T3] = EVLN[EVLN_T3]; // T3 - FIT[FIT_T8] = EVLN[EVLN_T8]; // T8 - FIT[FIT_T15] = EVLN[EVLN_T15]; // T15 - - if (fQED) - FIT[FIT_GAM] = EVLN[0]; // photon - - return; -} - -real EvolICFitBasis::ComputeSumRules(sumRule rule, int mem, PDFSet *pdf, bool &status) const -{ - // status - status = false; - - // sum rule calculations - switch (rule) { - case SUM_MSR: - { - real xsng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real xglu = pdf->IntegratePDF(mem,FIT_GLU,fQ2,PDFSet::XFX,status,fGSLWork); - real msr = xsng+xglu; - if (fQED) - { - real xgam = pdf->IntegratePDF(mem,FIT_GAM,fQ2,PDFSet::XFX,status,fGSLWork); - msr += xgam; - } - return msr; - } - break; - case SUM_UVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v3 = pdf->IntegratePDF(mem,FIT_V3,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - real v15 = val; - return ( 3.0*val + 6.0*v3 + 2.0*v8 + v15 )/12.0; - } - break; - case SUM_DVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v3 = pdf->IntegratePDF(mem,FIT_V3,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - real v15 = val; - return ( 3.0*val - 6.0*v3 + 2.0*v8 + v15 )/12.0; - } - break; - case SUM_SVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - real v15 = val; - return ( 3.0*val - 4.0*v8 + v15 )/12.0; - } - break; - case SUM_CVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v15 = val; - return ( val - v15 )/4.0; - } - break; - - case SUM_USM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t3 = pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - real t15 = pdf->IntegratePDF(mem,FIT_T15,fQ2,PDFSet::XFX,status,fGSLWork); - return ( 3.0*sng + 6.0*t3 + 2.0*t8 + t15 )/12.0; - } - break; - case SUM_DSM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t3 = pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - real t15 = pdf->IntegratePDF(mem,FIT_T15,fQ2,PDFSet::XFX,status,fGSLWork); - return ( 3.0*sng - 6.0*t3 + 2.0*t8 + t15)/12.0; - } - break; - case SUM_SSM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - real t15 = pdf->IntegratePDF(mem,FIT_T15,fQ2,PDFSet::XFX,status,fGSLWork); - return ( 3.0*sng - 4.0*t8 + t15)/12.0; - } - break; - case SUM_CSM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t15 = pdf->IntegratePDF(mem,FIT_T15,fQ2,PDFSet::XFX,status,fGSLWork); - return ( sng - t15)/4.0; - } - default: - cerr << "EvolFitBasis::ComputeSumRules error: unknown sum rule"<IntegratePDF(mem,FIT_VAL, fQ2,PDFSet::FX,status,fGSLWork); // Total valence - norm[FIT_V3] = 1.0f/pdf->IntegratePDF(mem,FIT_V3, fQ2,PDFSet::FX,status,fGSLWork); // V3 - norm[FIT_V8] = 3.0f/pdf->IntegratePDF(mem,FIT_V8, fQ2,PDFSet::FX,status,fGSLWork); // V8 - - // ************ QED dependent normalisations ************** - if (fQED) - { - norm[FIT_GLU] = (1-pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork) - pdf->IntegratePDF(mem,FIT_GAM,fQ2,PDFSet::XFX,status,fGSLWork)) - / pdf->IntegratePDF(mem,FIT_GLU, fQ2,PDFSet::XFX,status,fGSLWork); - } - else - { - norm[FIT_GLU] = (1-pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork))/ - pdf->IntegratePDF(mem,FIT_GLU,fQ2,PDFSet::XFX,status,fGSLWork); - } - - return; - -} - -/** - * @brief EvolFitBasis::BASIS2EVLN - * @param FIT - * @param EVLN - */ -void NN31ICFitBasis::BASIS2EVLN(const real *FIT, real *EVLN) const -{ - if ( fQED ) - EVLN[EVLN_GAM] = FIT[FIT_GAM]; - else - EVLN[EVLN_GAM] = 0; - - EVLN[EVLN_SNG] = FIT[FIT_SNG]; //Singlet - EVLN[EVLN_GLU] = FIT[FIT_GLU]; //Gluon - EVLN[EVLN_VAL] = FIT[FIT_VAL]; //Valence - EVLN[EVLN_V3] = FIT[FIT_V3]; //V3 - EVLN[EVLN_V8] = FIT[FIT_V8]; //V8 - EVLN[EVLN_V15] = FIT[FIT_VAL]; //V15 = V (c- = 0) - EVLN[EVLN_V24] = FIT[FIT_VAL]; //V24 = V - EVLN[EVLN_V35] = FIT[FIT_VAL]; //V35 = V - EVLN[EVLN_T3] = FIT[FIT_T3]; //T3 - EVLN[EVLN_T8] = FIT[FIT_T8]; //T8 - EVLN[EVLN_T15] = FIT[FIT_SNG] - 4*FIT[FIT_CP]; //T15 - EVLN[EVLN_T24] = FIT[FIT_SNG]; //T24 = S - EVLN[EVLN_T35] = FIT[FIT_SNG]; //T35 = S - - return; -} - -/*! - * \brief NN31ICFitBasis::EVLN2BASIS - * \param EVLN - * \param FIT - */ -void NN31ICFitBasis::EVLN2BASIS(const real *EVLN, real *FIT) const -{ - // Order in fitting basis - // S g V V3 V8 T3 T8 c+ gam - - // Order in Evln bassi - // γ, Σ, g, V, V3, V8, V15, V24, V35, T3, T8, T15, T24, T35 - - FIT[FIT_SNG] = EVLN[EVLN_SNG]; //Singlet - FIT[FIT_GLU] = EVLN[EVLN_GLU]; //gluon - FIT[FIT_VAL] = EVLN[EVLN_VAL]; //valence - FIT[FIT_V3] = EVLN[EVLN_V3]; // V3 - FIT[FIT_V8] = EVLN[EVLN_V8]; // V8 - FIT[FIT_T3] = EVLN[EVLN_T3]; // T3 - FIT[FIT_T8] = EVLN[EVLN_T8]; // T8 - FIT[FIT_CP] = (EVLN[EVLN_SNG]-EVLN[EVLN_T15])/4; // T15 - - if (fQED) - FIT[FIT_GAM] = EVLN[0]; // photon - - return; -} - -/*! - * \brief NN31ICFitBasis::ComputeSumRules - * \param rule - * \param mem - * \param pdf - * \param status - * \return - */ -real NN31ICFitBasis::ComputeSumRules(sumRule rule, int mem, PDFSet *pdf, bool &status) const -{ - // status - status = false; - - // sum rule calculations - switch (rule) { - case SUM_MSR: - { - real xsng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real xglu = pdf->IntegratePDF(mem,FIT_GLU,fQ2,PDFSet::XFX,status,fGSLWork); - real msr = xsng+xglu; - if (fQED) - { - real xgam = pdf->IntegratePDF(mem,FIT_GAM,fQ2,PDFSet::XFX,status,fGSLWork); - msr += xgam; - } - return msr; - } - break; - case SUM_UVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v3 = pdf->IntegratePDF(mem,FIT_V3,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - real v15 = val; - return ( 3.0*val + 6.0*v3 + 2.0*v8 + v15 )/12.0; - } - break; - case SUM_DVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v3 = pdf->IntegratePDF(mem,FIT_V3,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - real v15 = val; - return ( 3.0*val - 6.0*v3 + 2.0*v8 + v15 )/12.0; - } - break; - case SUM_SVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - real v15 = val; - return ( 3.0*val - 4.0*v8 + v15 )/12.0; - } - break; - case SUM_CVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v15 = val; - return ( val - v15 )/4.0; - } - break; - - case SUM_USM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t3 = pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - real cp = pdf->IntegratePDF(mem,FIT_CP,fQ2,PDFSet::XFX,status,fGSLWork); - real t15 = sng-4*cp; - return ( 3.0*sng + 6.0*t3 + 2.0*t8 + t15 )/12.0; - } - break; - case SUM_DSM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t3 = pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - real cp = pdf->IntegratePDF(mem,FIT_CP,fQ2,PDFSet::XFX,status,fGSLWork); - real t15 = sng-4*cp; - return ( 3.0*sng - 6.0*t3 + 2.0*t8 + t15)/12.0; - } - break; - case SUM_SSM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - real cp = pdf->IntegratePDF(mem,FIT_CP,fQ2,PDFSet::XFX,status,fGSLWork); - real t15 = sng-4*cp; - return ( 3.0*sng - 4.0*t8 + t15)/12.0; - } - break; - case SUM_CSM: - { - real cp = pdf->IntegratePDF(mem,FIT_CP,fQ2,PDFSet::XFX,status,fGSLWork); - return cp; - } - break; - default: - cerr << "NN31ICFitBasis::ComputeSumRules error: unknown sum rule"<IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real xglu = pdf->IntegratePDF(mem,FIT_GLU,fQ2,PDFSet::XFX,status,fGSLWork); - real msr = xsng+xglu; - return msr; - } - break; - case SUM_UVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v3 = pdf->IntegratePDF(mem,FIT_V3,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - real v15 = val; - return ( 3.0*val + 6.0*v3 + 2.0*v8 + v15 )/12.0; - } - break; - case SUM_DVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v3 = pdf->IntegratePDF(mem,FIT_V3,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - real v15 = val; - return ( 3.0*val - 6.0*v3 + 2.0*v8 + v15 )/12.0; - } - break; - case SUM_SVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v8 = pdf->IntegratePDF(mem,FIT_V8,fQ2,PDFSet::FX,status,fGSLWork); - real v15 = val; - return ( 3.0*val - 4.0*v8 + v15 )/12.0; - } - break; - case SUM_CVL: - { - real val = pdf->IntegratePDF(mem,FIT_VAL,fQ2,PDFSet::FX,status,fGSLWork); - real v15 = val; - return ( val - v15 )/4.0; - } - break; - - case SUM_USM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t3 = pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - real cp = pdf->IntegratePDF(mem,FIT_CP,fQ2,PDFSet::XFX,status,fGSLWork); - real t15 = sng-4*cp; - return ( 3.0*sng + 6.0*t3 + 2.0*t8 + t15 )/12.0; - } - break; - case SUM_DSM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t3 = pdf->IntegratePDF(mem,FIT_T3,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - real cp = pdf->IntegratePDF(mem,FIT_CP,fQ2,PDFSet::XFX,status,fGSLWork); - real t15 = sng-4*cp; - return ( 3.0*sng - 6.0*t3 + 2.0*t8 + t15)/12.0; - } - break; - case SUM_SSM: - { - real sng = pdf->IntegratePDF(mem,FIT_SNG,fQ2,PDFSet::XFX,status,fGSLWork); - real t8 = pdf->IntegratePDF(mem,FIT_T8,fQ2,PDFSet::XFX,status,fGSLWork); - real cp = pdf->IntegratePDF(mem,FIT_CP,fQ2,PDFSet::XFX,status,fGSLWork); - real t15 = sng-4*cp; - return ( 3.0*sng - 4.0*t8 + t15)/12.0; - } - break; - case SUM_CSM: - { - real cp = pdf->IntegratePDF(mem,FIT_CP,fQ2,PDFSet::XFX,status,fGSLWork); - return cp; - } - break; - default: - cerr << "NoSumRuleBasis::ComputeSumRules error: unknown sum rule"< -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "fitpdfset.h" -#include "nnpdfsettings.h" -#include -#include -#include - -using std::setw; -using std::setprecision; -using std::scientific; -using std::fixed; -using std::ofstream; -using std::array; - -#define EPSILON 1e-5 - -// *************************** FitPDFSet ************************************* -/** - * @brief FitPDFSet constructor - * @param nnset the config.ini file name - */ -FitPDFSet::FitPDFSet(NNPDFSettings const& nnset, FitBasis* basis): -PDFSet(string("NNPDF_Fit"),1,erType::ER_NONE), -fSettings(nnset), -fFitBasis(basis), -fNfl(nnset.GetNFL()), -fQ20((real)pow(stod(nnset.GetTheory(APFEL::kQ0)),2.0)), -fPreprocParam(), -fBestFit(0), -fEbf(std::numeric_limits::infinity()), -fNIte(0), -fbtype(NNPDFSettings::getFitBasisType(nnset.Get("fitting","fitbasis").as())) -{ - fMembers = 0; // copies -} - -/** - * @brief The FitPDFSet destructor - */ -FitPDFSet::~FitPDFSet() -{ - for (int j=0; j (int)fPDFs.size()) - { - cerr << "FitPDFSet::SetBestFit error: requested best fit index is not in fPDFs range"<CopyPars(fPDFs[i][fl]); -} - -/** - * @brief Generate new mutants if needed after integrability checks - */ -void FitPDFSet::ExpandMembers() -{ - // Number of members to be added - const int nnew = fMembers - fPDFs.size(); - - if (nnew <= 0) - return; - - cout <<"Generating " << nnew <<" new parameterisations."<Duplicate(); - - fPDFs.push_back(newpdf); - fPreprocParam.push_back(new PreprocParam(fNfl)); - } -} - -/** - * @brief Disable a PDF by moving it to the end, and decrementing fMembers - * @param i member index - */ -void FitPDFSet::DisableMember(int i) -{ - fMembers--; - - // Already the last element - if (i == fMembers) - return; - - // Swap parametrisations - Parametrisation **movePDF = fPDFs[i]; - fPDFs[i] = fPDFs[fMembers]; - fPDFs[fMembers] = movePDF; - - // Swap Preprocessing - PreprocParam* movePP = fPreprocParam[i]; - fPreprocParam[i] = fPreprocParam[fMembers]; - fPreprocParam[fMembers] = movePP; -} - -/** - * @brief Sort the PDF members - * @param chi2 the vector with chi2s - */ -void FitPDFSet::SortMembers(real* chi2) -{ - for (int i=0; i fEbf || std::isnan(chi2[i]) || std::isinf(chi2[i])) - { - // Disable member and swap chi2 - DisableMember(i); - chi2[i] = chi2[fMembers]; - - i--; - } -} - -/** - * @brief Compute integrals and preprocessing for an individual member - */ -bool FitPDFSet::ComputeIntegrals( int const& i ) -{ - bool err=false; - fFitBasis->ComputeParam(this, i, *(fPreprocParam[i]), err); if (err) return false; - fFitBasis->ComputeSumRules(SUM_USM, i, this, err); if (err) return false; - fFitBasis->ComputeSumRules(SUM_DSM, i, this, err); if (err) return false; - fFitBasis->ComputeSumRules(SUM_SSM, i, this, err); if (err) return false; - if (fSettings.IsIC()) fFitBasis->ComputeSumRules(SUM_CSM, i, this, err); - return !err; -} - -/** - * @brief Compute the sum rules. - */ -void FitPDFSet::ComputeSumRules() -{ - for (int i=0; iCopyPars(fBestFit[j]); - } - } -} - -/** - * @brief Verify that starting pdfs are satisfactory - */ -void FitPDFSet::ValidateStartingPDFs() -{ - // Since this method messes with the bestfit, check that fitpdfset state is consistent with fit start - if(fMembers!=0 || fPDFs.size()!=0) - { - cerr << "FitPDFSet::ValidateStartingFit error: Called after fitting has started (mutants are present)." << endl; - exit(-1); - } - - // Add a mutant - SetNMembers(1); - - for (int i=0; i<50000; i++) - if (!ComputeIntegrals(0)) - { - cout << "FitPDFSet::ValidateStartingFit:: Rerolling initial PDF attempt "<InitParameters(); - fBestFit[j]->CopyPars(fPDFs[0][j]); - } - } - else - { - cout << "Starting PDFs successfully validated." << endl; - // Reset mutants (probably unecessary) - SetNMembers(0); - return; - } - - cerr << "FitPDFSet::ValidateStartingPDF error: Difficulty finding valid starting PDF." << endl; - cout << "Preprocessing exponents:" << endl; - for (int i=0; iGetAlpha(i) << " " << fFitBasis->GetBeta(i) << endl; - exit(-1); -} - -/** - * @brief Returns the Inital scale evolution basis PDF vector at fixed x, for a fixed member - * @param x the momentum fraction - * @param n the member index - * @param pdf the output PDF vector - */ -void FitPDFSet::GetPDF(real const& x, real const& Q2, int const& n, real* pdf) const -{ - if (fabs(fQ20 - Q2) < EPSILON) - { - // Fetch fit basis PDFs - std::array xvals; - xvals[0] = x; - xvals[1] = log(x); - std::vector fitpdfs; - - if (fbtype == BASIS_LUX) - fitpdfs.resize(fNfl+1, 0); - else - fitpdfs.resize(fNfl, 0); - - for (int i=0; iCompute(xvals.data(), &fitpdfs.data()[i]); - - // Preprocess - fFitBasis->Preprocess(x, fitpdfs.data(), *fPreprocParam[n]); - - // Rotate to evolution basis - fFitBasis->BASIS2EVLN(fitpdfs.data(), pdf); - } - else - throw RuntimeException("FitPDFSet::GetPDF", "Evolved PDFs not implemented for this function anymore"); - - return; -} - -/** - * @brief Returns the Preprocessed NN output at fixed x, for a fixed member - * @param x the momentum fraction - * @param n the member index - * @param fl the requested Fit basis PDF - */ -real FitPDFSet::GetPDF(real const& x, const real &Q2, int const& n, int const& fl) const // Get Fit basis PDF -{ - real pdf = 0; - if (fabs(fQ20 - Q2) < EPSILON) - { - std::array xvals; - xvals[0] = x; - xvals[1] = log(x); - std::vector transform(fNfl, 0); - fFitBasis->NetTransform(fl,fNfl,transform.data()); - - for (int i = 0; i < fNfl; i++) - if (transform[i]) - { - real tmp = 0; - fPDFs[n][i]->Compute(xvals.data(), &tmp); - if(fFitBasis->GetPDFSqrPos(i)) tmp *= tmp; - pdf+=transform[i]*tmp; - } - - fFitBasis->Preprocess(x, fl, pdf, *fPreprocParam[n]); - } - else - throw RuntimeException("FitPDFSet::GetPDF", "Evolved PDFs not implemented for this function anymore"); - - return pdf; -} - -/** - * @brief Export fit metadata - * @param rep the replica - * @param erf_val the validation error function - * @param erf_trn the training error function - * @param chi2 the chi2 - * Print to file information on the fit - */ -void FitPDFSet::ExportMeta( int const& rep, real const& erf_val, real const& erf_trn, real const& chi2, bool posVeto) -{ - // Printing fitinfo to file - cout << Colour::FG_BLUE << "\n- Writing fitinfo file..." << Colour::FG_DEFAULT << endl; - stringstream fitinfofile, fitinfodata; - fitinfofile << fSettings.GetResultsDirectory() << "/nnfit/replica_" << rep << "/" << fSettings.GetPDFName() <<".fitinfo"; - fitinfodata << fNIte <<" " << erf_val <<" "<fArcDampFactor[i]) << " "; - write_to_file(fitinfofile.str(), fitinfodata.str()); - - // Print sumrules to file - cout << Colour::FG_BLUE << "- Writing sumrules file..." << Colour::FG_DEFAULT << endl; - stringstream sumrulefile, sumruledata; - sumrulefile << fSettings.GetResultsDirectory() << "/nnfit/replica_" << rep << "/" << fSettings.GetPDFName() <<".sumrules"; - bool status; - sumruledata.precision(8); - sumruledata << scientific; - sumruledata << fFitBasis->ComputeSumRules(SUM_MSR, 0, this, status) << " "; - sumruledata << fFitBasis->ComputeSumRules(SUM_UVL, 0, this, status) << " "; - sumruledata << fFitBasis->ComputeSumRules(SUM_DVL, 0, this, status) << " "; - sumruledata << fFitBasis->ComputeSumRules(SUM_SVL, 0, this, status) << " "; - if (fSettings.IsIC()) sumruledata << fFitBasis->ComputeSumRules(SUM_CVL, 0, this, status) << " "; - sumruledata << fFitBasis->ComputeSumRules(SUM_USM, 0, this, status) << " "; - sumruledata << fFitBasis->ComputeSumRules(SUM_DSM, 0, this, status) << " "; - sumruledata << fFitBasis->ComputeSumRules(SUM_SSM, 0, this, status) << " "; - if (fSettings.IsIC()) sumruledata << fFitBasis->ComputeSumRules(SUM_CSM, 0, this, status) << " "; - sumruledata << endl; - write_to_file(sumrulefile.str(), sumruledata.str()); - - // Print preprocessing to file - cout << Colour::FG_BLUE << "- Writing preproc file..." << Colour::FG_DEFAULT << endl; - stringstream preprocfile, preprocdata; - preprocfile << fSettings.GetResultsDirectory() << "/nnfit/replica_" << rep << "/" << fSettings.GetPDFName() <<".preproc"; - for (int i = 0; i < fNfl; i++) - preprocdata << -fFitBasis->GetAlpha(i) << " " << fFitBasis->GetBeta(i) << " " << fPreprocParam[0]->fPDFNorm[i] << endl; - write_to_file(preprocfile.str(), preprocdata.str()); - - // printing parameters to file - cout << Colour::FG_BLUE << "- Writing params file..." << Colour::FG_DEFAULT << endl; - stringstream paramsfile, paramsdata; - paramsfile << fSettings.GetResultsDirectory() << "/nnfit/replica_" << rep << "/" << fSettings.GetPDFName() <<".params"; - for (int i = 0; i < fNfl; i++) - { - paramsdata << fFitBasis->GetPDFName(i) << endl; - for (int j = 0; j < (int) fBestFit[i]->GetNParameters(); j++) - paramsdata << fBestFit[i]->GetParameters()[j] << endl; - } - write_to_file(paramsfile.str(), paramsdata.str()); -} - -/** - * @brief FitPDFSet::CalculateArcLength - * @param mem - * @param fl - * @param dampfact - * @param xmin - * @param xmax - * @return - */ -real FitPDFSet::CalculateArcLength(int const& mem, int const& fl, real const& dampfact, real xmin, real xmax) const -{ - int const nblock = 15; // Number of logarithmically spaced blocks to use - int const nseg = 1e5; // Number of points for derivative/integration with each block - - if (xmin <= 0) //xmin must be strictly larger than zero for this (due to logarithmic spacing) - { - cerr << "Error in PDFSet::CalculateArcLength: xmin must be > 0. Using xmin = 1E-15" << endl; - xmin = 1e-15; //Set to default rather than exit - } - - if (xmax <= 0) //Same requirement for xmax - { - cerr << "Error in PDFSet::CalculateArcLength: xmax must be > 0. Using xmax = 1E-15" << endl; - xmin = 1e-15; //Set to default rather than exit - } - - double i1 = log10(xmin); - double i2 = log10(xmax); - double keff = (i2 - i1)/nblock; //Calculate block spacing - - double arc = 0; - for (int k = 0; k < nblock; k++) //Start from xmin - { - double startx = pow(10,i1+k*keff); //Start of block - double endx = pow(10,i1+(k+1)*keff); //End of block - double neps = (endx-startx)/nseg; //Size of delta x in block - for (int i = 0; i < nseg; i++) - { - double x = startx + i*neps; - double f1 = GetPDF(x,fQ20,mem,fl)*pow(x,dampfact); - double f2 = GetPDF(x+neps,fQ20,mem,fl)*pow(x+neps,dampfact); //Standard two point derivative - arc+=sqrt(neps*neps+pow(f2-f1,2)); - } - } - - return arc; -} diff --git a/nnpdfcpp/src/nnfit/src/minimizer.cc b/nnpdfcpp/src/nnfit/src/minimizer.cc deleted file mode 100644 index 8ab590d073..0000000000 --- a/nnpdfcpp/src/nnfit/src/minimizer.cc +++ /dev/null @@ -1,704 +0,0 @@ -// $Id: minimizer.cc 1310 2013-11-06 16:01:25Z stefano.carrazza@mi.infn.it $ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -#include -#include -#include -#include - -#include "minimizer.h" -#include "nnpdfsettings.h" -#include "fastaddchi2.h" - -#include -#include -#include -#include -#include -#include -#include - -using NNPDF::Parametrisation; -using NNPDF::ThPredictions; - -/** - * @brief Minimizer baseline class - * @param settings the config.ini filename - */ -Minimizer::Minimizer(NNPDFSettings const& settings): -fChi2Mem(0), -fSettings(settings) -{ - -} - -/** - * @brief The Minimizer destructor - */ -Minimizer::~Minimizer() -{ - if (fChi2Mem) delete[] fChi2Mem; - return; -} - -/** - * @brief Prototype of initialization function for the Minimizer - * @param pdf the fit pdf set - * @param exps the experiment vector - */ -void Minimizer::Init(FitPDFSet*, vector const&, vector const&) -{ - return; -} - - -/** - * @brief Computes the error function of the PDFs to the supplied experiments - * @param pdf the pdf used to compute the chi2 - * @param exps the experiments to be used when computing the chi2 - * @param pos the positivity set used to penalize the chi2 - * @param minMode the mode of minimisation (to Datasets or Experiments) - * This function calculates the error function for each PDF option/mutant - * discarding PDF options which have an Erf larger than the previous best fit. - */ -void Minimizer::ComputeErf(FitPDFSet* pdf, - vector const& exps, - vector const& pos, - Minimizer::Mode minMode, - Minimizer::SortPDF sortMode) -{ - // Init PDF - pdf->InitPDFSet(); - - // Clear existing chi2 values - const int nMem = pdf->GetMembers(); - if (fChi2Mem) delete[] fChi2Mem; - fChi2Mem = new real[nMem]; - - for (int i=0; iSortMembers(fChi2Mem); - - // Calculate chi^2 and resort members after each set - for (size_t i=0; iGetNSet(); j++) - FastAddChi2(pdf,&exps[i]->GetSet(j),fChi2Mem); - } - else if (minMode == Minimizer::ExpMode) // Experimental Erf - FastAddChi2(pdf,exps[i],fChi2Mem); - - // Check for anomalous chi^2 values - for (int j=0; j< pdf->GetMembers(); j++) - if (fChi2Mem[j] >= 1E20 || std::isnan(fChi2Mem[j]) || std::isinf(fChi2Mem[j])) - cerr << "Anomalous chi^2: "<< fChi2Mem[j] <SortMembers(fChi2Mem); - } -} - -// ************************* GA MINIMIZER ***************************** -/** - * @brief GAMinimizer is the basic single Epoch Genetic Algorithm minimizer - * @param settings the global NNPDFSettings - */ -GAMinimizer::GAMinimizer(NNPDFSettings const& settings): -Minimizer(settings) -{ - // Init logger - LogManager::AddLogger("GAMinimizer", "GAMin.log"); -} - -/** - * @brief GA implementation of the iterate function. - * @param pdf the input pdf for the minimization - * @param exps the experiments to be used when minimizing - * @param pos the positivity sets - * This function does the mutation, compute the error function and sort the chi2s - * and finally applies the selection method. This is a very simple, single epoch, always to experiments, minimisation. - */ -void GAMinimizer::Iterate(FitPDFSet* pdf,vector const& exps, vector const& pos) -{ - // Mutation of PDFs - Mutation(pdf, fSettings.Get("fitting","nmutants").as()); - - // Calculate Experimental Chi2 values - ComputeErf(pdf,exps, pos, Minimizer::ExpMode, Minimizer::PDF_SORT); - - // Selection of best fit PDF - Selection(pdf); - - if (fChi2Mem && fSettings.Get("debug").as()) - cout << " chi2 trn: "<GetEbf()<Iterate(); -} - -/** - * @brief The mutation algorithm implementation - * @param pdf the input PDF - */ -void GAMinimizer::Mutation(FitPDFSet* pdf, int const& nmut) -{ - vector& pdfs = pdf->GetPDFs(); - RandomGenerator* rg = RandomGenerator::GetRNG(); - // Set number of members - pdf->SetNMembers(nmut); - - // Copy best fit parameters - for (int i=0; iCopyPars(pdf->GetBestFit()[j]); - - // Mutate copies - const int NIte = pdf->GetNIte() + 1; // +1 to avoid on iteration 0 div by 0 error - for (int i=0; iGetRandomUniform(); - const int NParam = pdfs[i][j]->GetNParameters(); - for (int n=0; n< (int) fSettings.GetFlMutProp(j).mutsize.size(); n++) - { - - const int mutDice = rg->GetRandomUniform(100); - const int mutProb = 100*fSettings.GetFlMutProp(j).mutprob[n]; - if (mutDice < mutProb) // mutation probability - { - const real sz = fSettings.GetFlMutProp(j).mutsize[n]; - pdfs[i][j]->GetParameters()[rg->GetRandomUniform(NParam)]+=sz*rg->GetRandomUniform(-1,1)/pow(NIte,ex); - } - } - } - - // Compute Preprocessing - pdf->ComputeSumRules(); - - return; -} - -/** - * @brief The selection algorithm, - * @param pdf the input PDF to be minimized - * @return 0 - */ -int GAMinimizer::Selection(FitPDFSet *pdf) -{ - // find minimum chi2 - if (pdf->GetMembers() > 0) - { - int index = 0; - real bestchi2 = fChi2Mem[0]; - for (int i=1; iGetMembers(); i++) - if (fChi2Mem[i] < bestchi2) - { - bestchi2 = fChi2Mem[i]; - index = i; - } - - // Set best fit pdf to the correct index if it's better than the current one - if (bestchi2 < pdf->GetEbf() ) - { - pdf->SetBestFit(index); - pdf->SetEbf(bestchi2); - - // Update fit logger - stringstream fitLog; fitLog << "GEN "<GetNIte()<<" Erf: " <GetPDFs()[0][i]->CopyPars(pdf->GetBestFit()[i]); - - // Set FitPDFset only to use member zero - pdf->SetNMembers(1); - pdf->ComputeSumRules(); - - return 0; -} - -// ************************* GA MINIMIZER ***************************** -/** - * @brief NGAMinimizer is a version of GAMinimizer with nodal mutations - * @param settings the global NNPDFSettings - */ -NGAMinimizer::NGAMinimizer(NNPDFSettings const& settings): -GAMinimizer(settings){} - -/** - * @brief The mutation algorithm implementation - * @param pdf the input PDF - */ -void NGAMinimizer::Mutation(FitPDFSet* pdf, int const& nmut) -{ - vector& pdfs = pdf->GetPDFs(); - RandomGenerator* rg = RandomGenerator::GetRNG(); - // Set number of members - pdf->SetNMembers(nmut); - - // Copy best fit parameters - for (int i=0; iCopyPars(pdf->GetBestFit()[j]); - - // Mutate copies - const int Nlayers = (int) fSettings.GetArch().size(); - vector Nnodes = fSettings.GetArch(); - - const int NIte = pdf->GetNIte() + 1; // +1 to avoid on iteration 0 div by 0 error - for (int i=0; iGetParamName() != "MultiLayerPerceptron") - throw NNPDF::RuntimeException("NGAMinimizer", "NGAMinimizer requires a MultiLayerPerceptron as a parametrisation"); - MultiLayerPerceptron* mlp = static_cast(tpdf); - const real ex = rg->GetRandomUniform(); - for (int n=0; n< (int) fSettings.GetFlMutProp(j).mutsize.size(); n++) - { - int index = 0; - for (int m=1; mGetRandomUniform() < fSettings.GetFlMutProp(j).mutprob[n]) // mutation probability - for (int k=0; k< mlp->GetNumNodeParams(m); k++) - { - const real sz = fSettings.GetFlMutProp(j).mutsize[n]; - mlp->GetParameters()[index+k]+=sz*rg->GetRandomUniform(-1,1)/pow(NIte,ex); - } - index+= mlp->GetNumNodeParams(m); - } - } - } - - // Compute Preprocessing - pdf->ComputeSumRules(); - - return; -} - -// ************************* NGAFT MINIMIZER ***************************** -/*! - * \brief NGAFTMinimizer::NGAFTMinimizer - * \param settings - */ -NGAFTMinimizer::NGAFTMinimizer(NNPDFSettings const& settings): -GAMinimizer(settings){} - -/** - * @brief The mutation algorithm implementation - * @param pdf the input PDF - */ -void NGAFTMinimizer::Mutation(FitPDFSet* pdf, int const& nmut) -{ - vector& pdfs = pdf->GetPDFs(); - RandomGenerator* rg = RandomGenerator::GetRNG(); - // Set number of members - pdf->SetNMembers(nmut); - - // Copy best fit parameters - for (int i=0; iCopyPars(pdf->GetBestFit()[j]); - - // Mutate copies - const int Nlayers = (int) fSettings.GetArch().size(); - vector Nnodes = fSettings.GetArch(); - - real xvals[2] = {1, 0}, fitpdfs; - - const int NIte = pdf->GetNIte() + 1; // +1 to avoid on iteration 0 div by 0 error - for (int i=0; iGetParamName() != "MultiLayerPerceptron") - throw NNPDF::RuntimeException("NGAMinimizer", "NGAMinimizer requires a MultiLayerPerceptron as a parametrisation"); - MultiLayerPerceptron* mlp = static_cast(tpdf); - const real ex = rg->GetRandomUniform(); - for (int n=0; n< (int) fSettings.GetFlMutProp(j).mutsize.size(); n++) - { - int index = 0; - for (int m=1; mGetRandomUniform() < fSettings.GetFlMutProp(j).mutprob[n]) // mutation probability - for (int k=0; k< mlp->GetNumNodeParams(m); k++) - { - const real sz = fSettings.GetFlMutProp(j).mutsize[n]; - mlp->GetParameters()[index+k]+=sz*rg->GetRandomUniform(-1,1)/pow(NIte,ex); - } - index+= mlp->GetNumNodeParams(m); - } - } - mlp->Compute(xvals, &fitpdfs); - mlp->GetParameters()[pdfs[i][j]->GetNParameters()-1] += fitpdfs; - } - - // Compute Preprocessing - pdf->ComputeSumRules(); - - return; -} - -// ************************* CMA-ES MINIMIZER ***************************** - -// Initialises parameters for CMA-ES minimiser -CMAESParam::CMAESParam(size_t const& _n, size_t const& _lambda): - lambda(_lambda), - mu(floor(lambda/2.0)), - n(_n), - eigenInterval(0.0), - expN(0), - mu_eff(0), - csigma(0), - dsigma(0), - cc(0), - c1(0), - cmu(0), - wgts(lambda,0) -{ - // Set expN - expN = sqrt(n)*(1.0-1.0/(4.0*n) + 1.0/(21.0*n*n) ); - - // Initialise w prime vector - vector wpr(lambda, 0); - for (int i=0; i< (int) lambda; i++) - wpr[i] = log( (lambda + 1.0) / 2.0) - log(i+1); - - // Calculate weight sums - double psumwgt = 0.0; double nsumwgt = 0.0; - double psumwgtsqr = 0.0; double nsumwgtsqr = 0.0; - for (int i=0; i< (int) lambda; i++) - if (i < (int) mu) {psumwgt += wpr[i]; psumwgtsqr += wpr[i]*wpr[i]; } - else {nsumwgt += wpr[i]; nsumwgtsqr += wpr[i]*wpr[i]; } - - mu_eff = psumwgt*psumwgt/psumwgtsqr; - const double mu_eff_minus = nsumwgt*nsumwgt/nsumwgtsqr; - - const double alpha_cov = 2.0; - const double cmupr = alpha_cov*(mu_eff - 2.0 + 1.0/mu_eff)/(pow(n+2.0,2) + alpha_cov*mu_eff/2.0); - - // Set constants - csigma = (mu_eff + 2.0) / (n + mu_eff + 5.0); - dsigma = 1.0 + 2.0*fmax(0,(sqrt((mu_eff - 1.0)/(n + 1.0)))-1.0) + csigma; - cc = (4.0 + mu_eff/n) / (n + 4.0 + 2.0*mu_eff/n ); - c1 = alpha_cov / ( pow(n + 1.3, 2.0) + mu_eff ); - cmu = std::min(1.0 - c1, cmupr); - - double sumwgtpos = 0.0; - double sumwgtneg = 0.0; - for (int i=0; i < (int) lambda; i++) - if (wpr[i] > 0) sumwgtpos += wpr[i]; - else sumwgtneg += fabs(wpr[i]); - - const double alpha_mu_minus = 1.0 + c1/cmu; - const double alpha_mueff_minus = 1.0 + (2*mu_eff_minus)/(mu_eff + 2.0); - const double alpha_posdef_minus = (1.0-c1-cmu)/(n*cmu); - const double alpha_min = fmin(alpha_mu_minus, fmin(alpha_mueff_minus, alpha_posdef_minus)); - - // Eigensystem solution interval - eigenInterval = (lambda/(c1+cmu)/n)/10.0; - - // ********************************** Normalising weights **************************************** - - for (int i=0; i < (int) lambda; i++) - wgts[i] = wpr[i]*( wpr[i] > 0 ? 1.0/sumwgtpos:alpha_min/sumwgtneg); - - - // Test weight sum normalisation - const double sumtestpos = std::accumulate(wgts.begin(), wgts.begin()+mu, 0.0); - const double sumtestneg = std::accumulate(wgts.begin()+mu, wgts.end(), 0.0); - - std::stringstream teststream; - teststream << "CMA-ES Minimiser parameters initialised:" <()), -fCMAES(0), -fpsigma(0), -fpc(0), -fC(0) -{ - // Init logger - LogManager::AddLogger("CMAESMinimizer", "CMA-ES.log"); - LogManager::AddLogger("CMAESMatrix", "CMA-ES_Matrix.dat"); -} - -CMAESMinimizer::~CMAESMinimizer() -{ - std::stringstream outcov; - for (int i=0; i < (int) fNTparam; i++) - { - for (int j=0; j < (int) fNTparam; j++) - outcov << gsl_matrix_get(fC,i,j) <<" "; - outcov << std::endl; - } - - LogManager::AddLogEntry("CMAESMatrix", outcov.str()); - - if (fpsigma) gsl_vector_free(fpsigma); - if (fpc) gsl_vector_free(fpc); - if (fC) gsl_matrix_free(fC); - if (fBD) gsl_matrix_free(fBD); - if (finvC) gsl_matrix_free(finvC); - if (fwrkspc) gsl_eigen_symmv_free(fwrkspc); - if (fCMAES) delete fCMAES; -} - -void CMAESMinimizer::ComputeEigensystem() -{ - // Initialise matrices - gsl_matrix *B = gsl_matrix_calloc( fNTparam, fNTparam ); - gsl_matrix *D = gsl_matrix_calloc( fNTparam, fNTparam ); - gsl_matrix *invD = gsl_matrix_calloc( fNTparam, fNTparam ); - - gsl_matrix_set_zero (fBD); - gsl_matrix_set_zero (finvC); - - // Calculate the eigensystem - gsl_matrix* C = gsl_matrix_calloc( fNTparam, fNTparam ); - gsl_vector* E = gsl_vector_calloc( fNTparam ); - gsl_matrix_memcpy (C, fC); - gsl_eigen_symmv (C, E, B, fwrkspc); - - // Compute condition number - double min, max; - gsl_vector_minmax (E, &min, &max); - - // Initialise D, invD - for (size_t i=0; i const&, vector const&) -{ - fNTparam = 0; - for (size_t i=0; i < (size_t) fSettings.GetNFL(); i++) - fNTparam += pdf->GetBestFit()[i]->GetNParameters(); - - // GSL vectors/matrices - fpsigma = gsl_vector_calloc( fNTparam ); - fpc = gsl_vector_calloc( fNTparam ); - fC = gsl_matrix_calloc( fNTparam, fNTparam ); - fBD = gsl_matrix_calloc( fNTparam, fNTparam ); - finvC = gsl_matrix_calloc( fNTparam, fNTparam ); - fwrkspc = gsl_eigen_symmv_alloc( fNTparam ); - gsl_matrix_set_identity(fC); - - // Initialise CMA-ES constants - fCMAES = new CMAESParam(fNTparam, fSettings.Get("fitting","nmutants").as()); - ComputeEigensystem(); - - std::stringstream initstr; initstr << "CMA-ES minimiser initialised with " < const& exps, vector const& pos) -{ - // First setup the required matrices - if (pdf->GetNIte() % fCMAES->eigenInterval == 0 ) - ComputeEigensystem(); - - // Setup and mutate PDF members - pdf->SetNMembers(fCMAES->lambda); - const vector yvals = Mutation(pdf); - - // Compute ERF and rank members - ComputeErf(pdf, exps, pos, Minimizer::ExpMode, Minimizer::PDF_NOSORT); - vector erf_srt(fChi2Mem, fChi2Mem + fCMAES->lambda); - vector irank_map(fCMAES->lambda,0); // Weight-ordered map to members (index is i) - std::sort(erf_srt.begin(), erf_srt.end()); - for (int i=0; i < (int) fCMAES->lambda; i++) - irank_map[std::distance(erf_srt.begin(), std::find(erf_srt.begin(), erf_srt.end(), fChi2Mem[i]))] = i; - - // Compute weighted shift and set new mean - gsl_vector* yavg = Recombination(pdf, irank_map, yvals); - - // ********************************** Adaptation **************************************** - CSA(yavg); CMA(pdf, irank_map, yvals, yavg ); - - for (auto i : yvals ) gsl_vector_free(i); - gsl_vector_free(yavg); - - pdf->Iterate(); -}; - -std::vector CMAESMinimizer::Mutation(FitPDFSet* pdf) const -{ - gsl_vector* m = gsl_vector_calloc( fNTparam ); - gsl_vector* z = gsl_vector_calloc(fCMAES->n); - gsl_vector* x = gsl_vector_calloc(fCMAES->n); - - GetParam(pdf->GetBestFit(), m); - std::vector yvals; - for (size_t i=0; ilambda; i++) - { - gsl_vector* y = gsl_vector_calloc(fCMAES->n); - do - { - gsl_vector_set_zero (z); NormVect(z); - gsl_vector_set_zero (y); gsl_blas_dgemv (CblasNoTrans, 1.0, fBD, z, 1.0, y); - gsl_vector_set_zero (x); gsl_vector_memcpy (x, m); gsl_blas_daxpy (fSigma, y, x); - SetParam(x, pdf->GetPDFs()[i]); - } while(!pdf->ComputeIntegrals(i)); // Ensures integrability of generated solutions - - yvals.push_back(y); - } - - gsl_vector_free(m); - gsl_vector_free(z); - gsl_vector_free(x); - - return yvals; -} - -gsl_vector* CMAESMinimizer::Recombination(FitPDFSet* pdf, vector const& irank_map, std::vector const& yvals) const -{ - // Old average - gsl_vector *m = gsl_vector_calloc( fNTparam ); - GetParam(pdf->GetBestFit(), m); - - // Compute average step - gsl_vector* yavg = gsl_vector_calloc(fCMAES->n); - for (int i=0; i < (int) fCMAES->mu; i++) - gsl_blas_daxpy (fCMAES->wgts[i], yvals[irank_map[i]], yavg); - - // Compute new average - gsl_vector *newm = gsl_vector_calloc( fNTparam ); - gsl_vector_memcpy(newm, m); - gsl_blas_daxpy (fSigma, yavg, newm); - - // Set new mean - SetParam(newm, pdf->GetBestFit()); - SetParam(newm, pdf->GetPDFs()[0]); - pdf->SetNMembers(1); - pdf->ComputeSumRules(); - - gsl_vector_free(m); - gsl_vector_free(newm); - return yavg; -} - -// Cumulative step-size adaptation -void CMAESMinimizer::CSA( gsl_vector const* yavg ) -{ - const double alpha = sqrt(fCMAES->csigma*(2.0 - fCMAES->csigma)*fCMAES->mu_eff ); // Coeff of matrix multiply - const double beta = (1.0-fCMAES->csigma); // Coeff of sum - gsl_blas_dgemv (CblasNoTrans, alpha, finvC, yavg, beta, fpsigma); - double pnorm = 0; gsl_blas_ddot (fpsigma, fpsigma, &pnorm); - - const double sigrat = fCMAES->csigma/fCMAES->dsigma; - fSigma = fSigma*exp(sigrat*(sqrt(pnorm)/fCMAES->expN - 1.0)); - - std::stringstream csastring; csastring << "CSA - StepSize: "<expN; - LogManager::AddLogEntry("CMAESMinimizer",csastring.str()); -} - -// Covariance matrix adaptation -void CMAESMinimizer::CMA( FitPDFSet* pdf, vector const& irank_map, std::vector const& yvals, gsl_vector const* yavg ) -{ - // Compute norm of p-sigma - const double pnorm = gsl_blas_dnrm2 (fpsigma); - const int g = pdf->GetNIte() + 1; - const double hl = pnorm / (sqrt(1.0 - pow(1.0 - fCMAES->csigma,2*(g+1)))); - const double hr = (1.4 + 2.0/(fNTparam + 1))*fCMAES->expN; - const double hsig = (hl < hr) ? 1:0; - const double dhsig = (1 - hsig)*fCMAES->cc*(2-fCMAES->cc); - - const double alpha = hsig*sqrt(fCMAES->cc*(2.0-fCMAES->cc)*fCMAES->mu_eff); - gsl_vector_scale( fpc, (1.0-fCMAES->cc)); - gsl_blas_daxpy (alpha, yavg, fpc); - - const double weightsum = std::accumulate(fCMAES->wgts.begin(),fCMAES->wgts.end(), 0.0 ); - const double Cscale = (1.0 + fCMAES->c1*dhsig - fCMAES->c1 - fCMAES->cmu*weightsum ); - - if ( Cscale != 1.0 ) gsl_matrix_scale(fC, Cscale); - gsl_blas_dger (fCMAES->c1, fpc, fpc, fC); // Rank-1 update - - // Rank-mu update - for (int i=0; i < (int) fCMAES->lambda; i++) - { - const gsl_vector* yval = yvals[irank_map[i]]; - double wo = fCMAES->wgts[i]; - if (fCMAES->wgts[i] < 0) - { - gsl_vector *cy = gsl_vector_calloc( fNTparam ); - gsl_blas_dgemv (CblasNoTrans, 1.0, finvC, yval, 1.0, cy); - const double norm = gsl_blas_dnrm2 (cy); - wo *= fNTparam / (norm*norm); - gsl_vector_free(cy); - } - gsl_blas_dger (fCMAES->cmu*wo, yval, yval, fC); - } -} - - -void CMAESMinimizer::NormVect(gsl_vector* vec) const -{ - for (size_t i=0; isize; i++) - gsl_vector_set(vec, i, RandomGenerator::GetRNG()->GetRandomGausDev(1)); -} - -void CMAESMinimizer::GetParam(Parametrisation** const pdfs, gsl_vector* params) const -{ - int icount = 0; - for (int i=0; iGetNParameters(); j++) - gsl_vector_set(params, icount++, pdfs[i]->GetParameters()[j]); -} - -void CMAESMinimizer::SetParam(gsl_vector* const params, Parametrisation** pdfs) const -{ - int icount = 0; - for (int i=0; iGetNParameters(); j++) - pdfs[i]->GetParameters()[j] = gsl_vector_get(params,icount++); -} diff --git a/nnpdfcpp/src/nnfit/src/nnfit.cc b/nnpdfcpp/src/nnfit/src/nnfit.cc deleted file mode 100644 index 5bc25356ac..0000000000 --- a/nnpdfcpp/src/nnfit/src/nnfit.cc +++ /dev/null @@ -1,633 +0,0 @@ -// $Id: nnfit.cc 1760 2014-05-06 14:56:31Z s0673800 $ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -/** - * nnfit - creates replica and apply fit - */ - -#include "nnfit.h" - -#include -#include -#include -#include -#include -#include -#include - -#include "loadutils.h" -#include "datautils.h" -#include "fitbases.h" -#include "fitpdfset.h" -#include "minimizer.h" -#include "stopping.h" -#include "fastaddchi2.h" -#include "exportgrid.h" -#include "evolgrid.h" - -// Signal catcher -static void catch_int(int) { - if ( state == FIT_ITER ) - { - cout << Colour::FG_RED << "\n\n----------------- SIGINT - Interrupting fit -----------------\n" << Colour::FG_DEFAULT << endl; - state = FIT_ABRT; - } - else - exit(-1); -} - -// Set the RNG seed from replica id -void SetSeed(int const& replica) -{ - unsigned long int seed = 0; - for (int i = 0; i < replica; i++) - seed = RandomGenerator::GetRNG()->GetRandomInt(); - RandomGenerator::GetRNG()->SetSeed(seed); -} - -/** - * \param argv the filename containing the configuration - */ -int main(int argc, char **argv) -{ - MPI::Init(); - - if (MPI::TaskID() == 0) // master slave - { - // Fitting status and signal handler - state = FIT_INIT; - signal(SIGINT, catch_int); - - // Read configuration filename from arguments - string folder; - int replica = 0; - if (argc > 2) - { - replica = atoi(argv[1]); - folder.assign(argv[2]); - } - else - { - cout << Colour::FG_RED << "\nusage: nnfit [replica number] [configuration folder]\n" << Colour::FG_DEFAULT << endl; - exit(-1); - } - - if (replica <= 0) - { - cerr << Colour::FG_RED << "\nError replica must be > 0" << Colour::FG_DEFAULT << endl; - exit(-1); - } - - // Creates the configuration class - NNPDFSettings settings(folder); - settings.VerifyConfiguration(); - - // Creating output folder - CreateResultsFolder(settings, replica); - - // Initialise log manager - stringstream logPath; - logPath << settings.GetResultsDirectory()<<"/nnfit/replica_"<()) - { - LogManager::AddLogger("PDFgenerations","PDFgenerations.grid"); - LogManager::AddLogger("Chi2RealData","chi2expsrealdata.grid"); - } - - // Use 'dataseed' if it exists in the yml file otherwise - // use as the default 'seed' (set by the NNPDFSettings constructor) - if (settings.Exists("fitting","dataseed")) - RandomGenerator::GetRNG()->SetSeed(settings.Get("fitting", "dataseed").as()); - SetSeed(replica); - - // Creating folders - cout << "\n- MC generation of replica " << replica << ":" << endl; - - // Read data and perform training-validation split - cout << Colour::FG_YELLOW << "----------------- Performing training - validation split ----------------- " << Colour::FG_DEFAULT << endl; - - vector training; - vector validation; - vector pos; - LoadAllDataAndSplit(settings, training, validation, pos, replica); - - // Fit Basis - std::unique_ptr fitbasis(getFitBasis(settings, NNPDFSettings::getFitBasisType(settings.Get("fitting","fitbasis").as()), replica)); - - // If 'dataseed' exists then reset the RNG to 'seed' for the GA - if (settings.Exists("fitting","dataseed")) - { - RandomGenerator::GetRNG()->SetSeed(settings.Get("fitting", "seed").as()); - SetSeed(replica); - } - - // Minimiser control - std::unique_ptr minim; - switch (NNPDFSettings::getFitMethod(settings.Get("fitting","fitmethod").as())) - { - case MIN_GA: - minim = std::make_unique(settings); - cout << Colour::FG_BLUE << "Minimiser: Genetic Algorithm" << Colour::FG_DEFAULT << endl; - break; - - case MIN_NGA: - minim = std::make_unique(settings); - cout << Colour::FG_BLUE << "Minimiser: Genetic Algorithm w/ nodal mutations" << Colour::FG_DEFAULT << endl; - break; - - case MIN_NGAFT: - minim = std::make_unique(settings); - cout << Colour::FG_BLUE << "Minimiser: Genetic Algorithm w/ fixed threshold term NN(x)-NN(1)" << Colour::FG_DEFAULT << endl; - break; - - case MIN_CMAES: - minim = std::make_unique(settings); - cout << Colour::FG_BLUE << "Minimiser: CMA-ES" << Colour::FG_DEFAULT << endl; - break; - - default: - cout << Colour::FG_RED << "ERROR: Invalid Minimiser" << Colour::FG_DEFAULT < fitset; - switch (NNPDFSettings::getParamType(settings.Get("fitting","paramtype").as())) - { - case PARAM_NN: - fitset = std::unique_ptr(FitPDFSet::Generate(settings, fitbasis.get())); // need to rewrite generate - cout << Colour::FG_BLUE << "Parametrisation: Neural Network" << Colour::FG_DEFAULT << endl; - break; - - case PARAM_SLNPP: - fitset = std::unique_ptr(FitPDFSet::Generate(settings, fitbasis.get())); // need to rewrite generate - cout << Colour::FG_BLUE << "Parametrisation: Single layer network (preprocessed)" << Colour::FG_DEFAULT << endl; - break; - - case PARAM_SLN: - fitset = std::unique_ptr(FitPDFSet::Generate(settings, fitbasis.get())); // need to rewrite generate - cout << Colour::FG_BLUE << "Parametrisation: Single layer network" << Colour::FG_DEFAULT << endl; - break; - - default: - cout << Colour::FG_RED << "ERROR: Invalid Parametrisation" << Colour::FG_DEFAULT << endl; - exit(-1); - break; - } - fitset->ValidateStartingPDFs(); - - // Stopping criterion - std::unique_ptr stop; - switch (NNPDFSettings::getStopType(settings.Get("stopping","stopmethod").as())) - { - case STOP_NONE: - stop = std::make_unique(settings); - cout << Colour::FG_BLUE << "Stopping Criterion: Fixed Length Fit" << Colour::FG_DEFAULT << endl; - break; - - case STOP_LB: - stop = std::make_unique(settings); - cout << Colour::FG_BLUE << "Stopping Criterion: Look-Back Cross-Validation" << Colour::FG_DEFAULT << endl; - break; - - default: - cout << Colour::FG_RED << "ERROR: Invalid Stopping Criterion" << Colour::FG_DEFAULT << endl; - exit(-1); - break; - } - - cout << endl; - - int nData = 0; - for (size_t i=0; iGetNData(); - - cout << "Training upon "<()) - { - time.start(); - state = FIT_ITER; - } - - // Initialise minimiser - minim->Init(fitset.get(),training, pos); - - for (int i = 0; i < settings.Get("fitting","ngen").as(); i++) - { - // Abort signal - if (state == FIT_ABRT) - break; - - minim->Iterate(fitset.get(), training, pos); - - if (stop->Stop(fitset.get(), training, validation, pos)) break; - - if (settings.Get("debug").as()) - { - cout << "Generation "<GetNIte()<<" "; - time.printTime(time.stop()); - time.start(); - } - - if (i % 100 == 0) - LogChi2(fitset.get(), pos, training, validation); - } - - state = FIT_END; - - int doftrn = 0; - int dofval = 0; - real erf_val = 0; - real erf_trn = 0; - - // Compute training error function and free training sets - for (size_t i = 0; i < training.size(); i++) - { - vector theory(training[i]->GetNData()); - - Convolute(fitset.get(),training[i],theory.data()); - NNPDF::ComputeChi2(training[i],1,theory.data(),&erf_trn); - - doftrn += training[i]->GetNData(); - - delete training[i]; - } - - // Compute validation error function and free validation sets - for (size_t i = 0; i < validation.size(); i++) - if (validation[i]) - { - vector theory(validation[i]->GetNData()); - - Convolute(fitset.get(),validation[i],theory.data()); - NNPDF::ComputeChi2(validation[i],1,theory.data(),&erf_val); - - dofval += validation[i]->GetNData(); - - delete validation[i]; - } - - // Check for empty validation set - if (dofval == 0) - { - erf_val = 0; - dofval = 1; - } - - training.clear(); - validation.clear(); - - // Compute Final Chi2 - cout << Colour::FG_YELLOW << "Final Chi2 Test" << Colour::FG_DEFAULT << endl; - int dof = 0; - real chi2 = 0; - auto T0Set = std::make_unique(settings.Get("datacuts","t0pdfset").as(), PDFSet::erType::ER_MCT0); - for (int i = 0; i < settings.GetNExp(); i++) - { - if (settings.GetExpName(i) == "REWEIGHT") // Don't fit RW experiment - continue; - - vector datasets; - for (size_t j = 0; j < settings.GetExpSets(i).size(); j++) - { - datasets.push_back(LoadDataSet(settings, settings.GetExpSets(i)[j], DATA_FILTERED)); - MakeT0Predictions(T0Set.get(), datasets[j]); - } - - // Load Experiments - auto exp = std::make_unique(datasets, settings.GetExpName(i)); - vector theory(exp->GetNData()); - - if (settings.IsThUncertainties()) - { - string ThCovMatPath = settings.GetResultsDirectory() + "/tables/datacuts_theory_theorycovmatconfig_theory_covmat.csv"; - - exp->LoadRepCovMat(ThCovMatPath, settings.IsThCovSampling()); - exp->LoadFitCovMat(ThCovMatPath, settings.IsThCovFitting()); - } - - Convolute(fitset.get(),exp.get(),theory.data()); - NNPDF::ComputeChi2(exp.get(),1,theory.data(),&chi2); - - dof += exp->GetNData(); - } - - // Check Positivity Veto - bool posVeto = false; - // Compute Final Chi2 - cout << Colour::FG_BLUE << "\n- Final Positivity Test" << Colour::FG_DEFAULT << endl; - for (size_t i = 0; i < pos.size(); i++) - { - // Load Experiments - int res; - pos[i].ComputeNUnacceptable(fitset.get(),&res); - if (res != 0) - { - cout << Colour::FG_RED << "- Positivity Vetoed\n" << Colour::FG_DEFAULT << endl; - posVeto = true; - break; - } - else - cout << Colour::FG_GREEN << "- Passed all points for " << settings.GetPosName(i) << Colour::FG_DEFAULT << endl; - } - pos.clear(); - - // Export meta file - fitset->ExportMeta(replica, erf_val/dofval, erf_trn/doftrn, chi2/dof, posVeto); - - // Export fit results to an initial scale grid - std::string basefile = settings.GetResultsDirectory() + "/nnfit/"; - std::string gridfile = basefile + "replica_" + std::to_string(replica) + "/" - + settings.GetPDFName() +".exportgrid"; - const auto eg = ExportGrid(*fitset, 0, replica, fitset->GetQ20()); - eg.Write(gridfile); - - // Export evolved fit - std::string infofile = basefile + settings.GetPDFName() + ".info"; - std::string replica_file = basefile + "replica_" + std::to_string(replica) + "/" - + settings.GetPDFName() + ".dat"; - - const vector egrid = {eg}; - auto dglapg = EvolveGrid(egrid, settings.GetTheoryMap()); - dglapg.WriteInfoFile(infofile); - const auto outstream = dglapg.WriteLHAFile(); - write_to_file(replica_file, outstream[0].str()); - - // Export Logs - LogManager::ExportLogs(); - - cout << Colour::FG_GREEN << endl; - cout << " -------------------------------------------------\n"; - cout << " - nnfit completed with success" << endl; - cout << " - please go "<< settings.GetResultsDirectory() << "/nnfit \n"; - cout << " -------------------------------------------------\n"; - cout << Colour::FG_DEFAULT << endl; - - } - - MPI::Finalize(); - - return 0; -} - -// Load data and perform trainng validation split -void LoadAllDataAndSplit(NNPDFSettings const& settings, - vector & training, - vector & validation, - vector & pos, - int const& replica) -{ - auto T0Set = std::make_unique(settings.Get("datacuts","t0pdfset").as(), PDFSet::erType::ER_MCT0); - for (int i = 0; i < settings.GetNExp(); i++) - { - if (settings.GetExpName(i) == "REWEIGHT") // Don't fit RW experiment - continue; - - vector datasets; - for (int j = 0; j < (int) settings.GetExpSets(i).size(); j++) - { - datasets.push_back(LoadDataSet(settings, settings.GetExpSets(i)[j], DATA_FILTERED)); - MakeT0Predictions(T0Set.get(),datasets[j]); - } - - auto exp = std::make_unique(datasets, settings.GetExpName(i)); - - // read covmat from file if specified in the runcard - if (settings.IsThUncertainties()) - { - string ThCovMatPath = settings.GetResultsDirectory() + "/tables/datacuts_theory_theorycovmatconfig_theory_covmat.csv"; - - exp->LoadRepCovMat(ThCovMatPath, settings.IsThCovSampling()); - exp->LoadFitCovMat(ThCovMatPath, settings.IsThCovFitting()); - } - - // Apply MC shifts - if (settings.Get("fitting","genrep").as()) - exp->MakeReplica(); - - training.push_back(NULL); - validation.push_back(NULL); - - TrainValidSplit(settings, exp.get(), training.back(), validation.back(), replica); - } - - // Read Positivity Sets - if (settings.GetNPos()) - cout << Colour::FG_YELLOW << " ----------------- Reading positivity sets ----------------- " << Colour::FG_DEFAULT << endl; - - // Positivity sets - for (int i = 0; i < settings.GetNPos(); i++) - { - cout << Colour::FG_BLUE << "\n- Loading: " << Colour::FG_DEFAULT << settings.GetPosName(i) << endl; - pos.push_back(LoadPositivitySet(settings,settings.GetPosName(i),settings.GetPosInfo(settings.GetPosName(i)).tLambda)); - pos[i].SetBounds(T0Set.get()); - } - cout << endl; -} - -// Chi2 per experiment logger -void LogChi2(const FitPDFSet* pdf, - vector const& pos, - vector const& train, - vector const& valid) -{ - - if (pdf->GetMembers() != 1) - { - cerr << Colour::FG_RED << "LogChi2 Error: number of PDFs in FitPDFSet is not = 1" << Colour::FG_DEFAULT << endl; - exit(-1); - } - - // Total chi^2 values - real TrnChi2Tot = 0; - real ValChi2Tot = 0; - real PosChi2Tot = 0; - - // Data points - int nDataTrn = 0; - int nDataVal = 0; - - const int Nexp = train.size(); - - stringstream logString; - logString << "Generation "<GetNIte()<<" NExp: "<GetExpName(); - FastAddChi2(pdf, train[i], &ExpTrn); - TrnChi2Tot += ExpTrn; - ExpTrn /= train[i]->GetNData(); - nDataTrn += train[i]->GetNData(); - } - - // Validation chi^2 - if (valid[i] != NULL) - { - ExpName = train[i]->GetExpName(); - FastAddChi2(pdf, valid[i], &ExpVal); - ValChi2Tot += ExpVal; - ExpVal /= valid[i]->GetNData(); - nDataVal += valid[i]->GetNData(); - } - - // Write to log string - logString << "\t"< trainingSets; - vector validationSets; - - vector trCovMatMask(0); - vector valCovMatMask(0); - // Vector containing vectors of masks - vector> trMasks, valMasks; - int AccumulatedData = 0; - - int expValSize = 0; // size of validation experiment - - for (int s = 0; s < exp->GetNSet(); s++) - { - const DataSet& set = exp->GetSet(s); - - // Fraction of data in training and validation sets - const double trFrac = settings.GetSetInfo(set.GetSetName()).tTrainingFraction; - const int trMax =(trFrac*set.GetNData()); - - // Creating Masks - vector mask; - for (int i = 0; i < set.GetNData(); i++) mask.push_back(i); - RandomGenerator::GetRNG()->ShuffleVector(mask); - - vector trMaskset(mask.begin(), mask.begin() + trMax); - vector valMaskset(mask.begin() + trMax, mask.end()); - - std::sort(trMaskset.begin(), trMaskset.end()); - std::sort(valMaskset.begin(), valMaskset.end()); - - - // If either of the training or validation mask sets - // are empty then don't insert them into the vector - // of masks - if (trMaskset.size() != 0) - trMasks.push_back(trMaskset); - if (valMaskset.size() != 0) - valMasks.push_back(valMaskset); - - if (settings.IsThUncertainties()) - { - /* - * Flag the points for training and validations - */ - - //initializing to zero - for (int i = 0; i < set.GetNData(); i++) - { - trCovMatMask.push_back(0); - valCovMatMask.push_back(0); - } - - //Creating the boolean mask - for (size_t i = 0; i < trMaskset.size(); i++) - trCovMatMask.at(AccumulatedData + trMaskset.at(i)) = 1; - for (size_t i = 0; i < valMaskset.size(); i++) - valCovMatMask.at(AccumulatedData + valMaskset.at(i)) = 1; - - //Accumulating Sets NData - AccumulatedData += set.GetNData(); - } - - // Initializing new datasets - trainingSets.push_back(DataSet(exp->GetSet(s), trMaskset)); - if ((int)valMaskset.size() != 0) - { - validationSets.push_back(DataSet(exp->GetSet(s), valMaskset)); - expValSize += valMaskset.size(); - } - } - - cout << Colour::FG_BLUE << "- Building Training" << Colour::FG_DEFAULT << endl; - tr = new Experiment(*exp, trainingSets); - - cout << Colour::FG_BLUE << "- Building Validation" << Colour::FG_DEFAULT << endl; - if (expValSize != 0) - val = new Experiment(*exp, validationSets); - - - if (settings.SavePseudodata()) - { - // Save the pseudodata if requested in the runcard - // Note that the datapoint index starts with a 0 and - // goes up to the number of datapoints after cuts - // have been applied minus one (because we start - // counting from 0). - std::ofstream training_file, validation_file; - training_file.open(settings.GetResultsDirectory() + "/nnfit/replica_" + std::to_string(replica) + "/training.dat", std::ios_base::app); - validation_file.open(settings.GetResultsDirectory() + "/nnfit/replica_" + std::to_string(replica) + "/validation.dat", std::ios_base::app); - - for (int i = 0; i < tr->GetNSet(); ++i) - { - auto ds = tr->GetSet(i); - // The training mask for set i - vector tr_mask = trMasks[i]; - for (int j = 0; j < ds.GetNData(); ++j) { - training_file << tr->GetExpName() << "\t" << ds.GetSetName() << "\t" << tr_mask[j] << "\t" << ds.GetData(j) << "\n"; - } - } - if (expValSize != 0) - for (int i = 0; i < val->GetNSet(); ++i) - { - auto ds = val->GetSet(i); - vector val_mask = valMasks[i]; - for (int j = 0; j < ds.GetNData(); ++j) { - validation_file << val->GetExpName() << "\t" << ds.GetSetName() << "\t" << val_mask[j] << "\t" << ds.GetData(j) << "\n"; - } - } - } - - // read covmat from file if specified in the runcard - if (settings.IsThUncertainties()) - { - string ThCovMatPath = settings.GetResultsDirectory() + "/tables/datacuts_theory_theorycovmatconfig_theory_covmat.csv"; - - tr->LoadRepCovMat(ThCovMatPath, settings.IsThCovSampling(), trCovMatMask); - tr->LoadFitCovMat(ThCovMatPath, settings.IsThCovFitting(), trCovMatMask); - - val->LoadRepCovMat(ThCovMatPath, settings.IsThCovSampling(), valCovMatMask); - val->LoadFitCovMat(ThCovMatPath, settings.IsThCovFitting(), valCovMatMask); - } -} diff --git a/nnpdfcpp/src/nnfit/src/pdfbasis.cc b/nnpdfcpp/src/nnfit/src/pdfbasis.cc deleted file mode 100644 index e06704902e..0000000000 --- a/nnpdfcpp/src/nnfit/src/pdfbasis.cc +++ /dev/null @@ -1,31 +0,0 @@ -// $Id$ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -#include -#include - -#include -#include "nnpdfsettings.h" -#include "pdfbasis.h" -#include - - -void PDFBasis::BASIS2LHA(const real *basis, real *lha) const -{ - real *evln = new real[14]; - BASIS2EVLN(basis,evln); - PDFSet::EVLN2LHA(evln,lha); - delete[] evln; -} - -void PDFBasis::LHA2BASIS(const real *lha, real *basis) const -{ - real *evln = new real[14]; - PDFSet::LHA2EVLN(lha,evln); - EVLN2BASIS(evln,basis); - delete[] evln; -} diff --git a/nnpdfcpp/src/nnfit/src/stopping.cc b/nnpdfcpp/src/nnfit/src/stopping.cc deleted file mode 100644 index bee4cfcf22..0000000000 --- a/nnpdfcpp/src/nnfit/src/stopping.cc +++ /dev/null @@ -1,125 +0,0 @@ -// $Id: stopping.cc 1799 2014-06-23 12:37:38Z s0673800 $ -// -// NNPDF++ 2012-2015 -// -// Authors: Nathan Hartland, n.p.hartland@ed.ac.uk -// Stefano Carrazza, stefano.carrazza@mi.infn.it - -#include -#include -#include -#include -#include -#include - -#include "stopping.h" -#include "fastaddchi2.h" -#include "datautils.h" - -#include -#include -#include -#include - -// **************** StoppingCriterion base class ****************** -StoppingCriterion::StoppingCriterion(NNPDFSettings const& settings): -fSettings(settings) -{ - -} -bool StoppingCriterion::Stop(FitPDFSet* pdf, - vector& , - vector& , - vectorconst& ) -{ - if (pdf->GetMembers() != 1) - { - cerr << "StoppingCriterion::Stop Error: FitPDFSet has more than 1 member (at stopping there should only remain the best fit PDF)"<()) - { - cout << Colour::FG_GREEN << "Stopping: Max number of iterations ("<()<<") reached!"<< Colour::FG_DEFAULT << endl; - return true; - } - - return false; -} - -/** - * \class LookBackCV - * \brief Look back cross validation stopping - */ - -LookBackCV::LookBackCV(NNPDFSettings const& settings): -StoppingCriterion(settings), -fCurrentBest(0), -fCurrentValidErf(std::numeric_limits::infinity()), -fBestGeneration(0) -{ - -} - -LookBackCV::~LookBackCV() -{ - // Delete current best fit - if (fCurrentBest) - { - for (int i=0; i& train, - vector& valid, - vectorconst& positivity) -{ - // Grab the best fit - if (!fCurrentBest) - { - fCurrentBest = new Parametrisation*[fSettings.GetNFL()]; - for (int i=0; iGetPDFs()[0][i]->Duplicate(); - } - - // Compute Validation Chi2 values - real ValChi2Tot = 0; - for (size_t i=0; iCopyPars(pdf->GetBestFit()[i]); - - fBestGeneration = pdf->GetNIte(); - } - - // Number of iterations exceeded max - if (StoppingCriterion::Stop(pdf,train, valid, positivity)) - { - // Set best fit - for (int i=0; iGetBestFit()[i]->CopyPars(fCurrentBest[i]); - - // Set zeroth member fit - for (int i=0; iGetPDFs()[0][i]->CopyPars(fCurrentBest[i]); - - pdf->ComputeSumRules(); - - pdf->SetNIte(fBestGeneration); - - return true; - } - - return false; -} diff --git a/nnprofile_example.yaml b/nnprofile_example.yaml new file mode 100644 index 0000000000..5e675579bc --- /dev/null +++ b/nnprofile_example.yaml @@ -0,0 +1,15 @@ +# Example and recommended configuration for nnprofile.yaml +# you can put this file in +# ${XDG_CONFIG_HOME}/NNPDF/nnprofile.yaml +# which usually defaults to +# ~/.config/NNPDF/nnprofile.yaml +# To change the configuration of the NNPDF code framework + +nnpdf_share: ~/.local/share/NNPDF + +results_path: results +theories_path: theories +hyperscan_path: hyperscan +validphys_cache_path: vp-cache + +# With these options downloaded theories will go to ~/.local/share/NNPDF/theories diff --git a/pyproject.toml b/pyproject.toml index 0305f8c4cc..a77affe24f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,127 @@ +[build-system] +requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.1.0"] +build-backend = "poetry_dynamic_versioning.backend" + +[tool.poetry] +name = "nnpdf" +version = "0.0.0" +description = "An open-source machine learning framework for global analyses of parton distributions." +readme = "README.md" +authors = [ + "NNPDF Collaboration" +] +classifiers = [ + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Topic :: Scientific/Engineering", + "Topic :: Scientific/Engineering :: Physics", + "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", +] +license = "GPL-3.0-or-later" +repository = "https://github.com/NNPDF/nnpdf" +# Packages installed together within the nnpdf metapackage +packages = [ + { include = "n3fit", from = "n3fit/src" }, + { include = "evolven3fit_new", from = "n3fit/src" }, + { include = "validphys", from = "validphys2/src" }, +] +# Data files +include = [ + # The profile is included together with the validphys package + "validphys2/src/validphys/nnprofile_default.yaml", + # While commondata and theory.db are separated into the datafiles folder + "validphys2/src/validphys/datafiles/commondata/*", + "validphys2/src/validphys/datafiles/theory.db", + # The version file is ignored by git so it needs to be explicitly included + "validphys2/src/validphys/_version.py" +] + +[tool.poetry.scripts] +n3fit = "n3fit.scripts.n3fit_exec:main" +validphys = "validphys.scripts.main:main" +# Fitting scripts +evolven3fit_new = "n3fit.scripts.evolven3fit_new:main" +vp-setupfit = "n3fit.scripts.vp_setupfit:main" +varflavors = "n3fit.scripts.varflavors:main" +postfit = "validphys.scripts.postfit:main" +# validphys helpers and scripts +vp-upload = "validphys.scripts.vp_upload:main" +wiki-upload = "validphys.scripts.wiki_upload:main" +vp-get = "validphys.scripts.vp_get:main" +vp-comparefits = "validphys.scripts.vp_comparefits:main" +vp-fitrename = "validphys.scripts.vp_fitrename:main" +vp-checktheory = "validphys.scripts.vp_checktheory:main" +vp-rebuild-data = "validphys.scripts.vp_rebuild_data:main" +vp-pdfrename = "validphys.scripts.vp_pdfrename:main" +vp-pdffromreplicas = "validphys.scripts.vp_pdffromreplicas:main" +vp-list = "validphys.scripts.vp_list:main" +vp-nextfitruncard = "validphys.scripts.vp_nextfitruncard:main" +vp-hyperoptplot = "validphys.scripts.vp_hyperoptplot:main" +vp-deltachi2 = "validphys.scripts.vp_deltachi2:main" + +[tool.poetry.dependencies] +# Generic dependencies (i.e., validphys) +python = "^3.9" +matplotlib = ">=3.3.0,<3.8" +pineappl = "^0.6.2" +pandas = "<2" +numpy = "*" +validobj = "*" +prompt_toolkit = "*" +# Reportengine (and its dependencies) need to be installed in a bit more manual way +reportengine = { git = "https://github.com/NNPDF/reportengine", rev = "3bb2b1d"} +ruamel_yaml = {version = "<0.18"} +# Fit +psutil = "*" +tensorflow = "*" +eko = "^0.14.0" +# Hyperopt +hyperopt = "*" +seaborn = "*" +# LHAPDF installation for debugging purposes +# a3b2bbc3ced97675ac3a71df45f55ba = "*" +# Optional dependencies +# tests +pytest = {version = "*", optional = true} +pytest-mpl = {version = "*", optional = true} +hypothesis = {version = "*", optional = true} +# docs +recommonmark = {version = "*", optional = true} +sphinxcontrib-bibtex = {version = "*", optional = true} +sphinx_rtd_theme = {version = "*", optional = true} +sphinx = {version = "^4.0.2", optional = true} +# qed +fiatlux = {version = "*", optional = true} +# without lhapdf +pdfflow = {version = "^1.2.1", optional = true} +lhapdf-management = {version = "^0.5", optional = true} + +# Optional dependencies +[tool.poetry.extras] +tests = ["pytest", "pytest-mpl", "hypothesis"] +docs = ["recommonmark", "sphinxcontrib", "sphinx-rtd-theme", "sphinx"] +qed = ["fiatlux"] +nolha = ["pdfflow", "lhapdf-management"] + +[tool.poetry-dynamic-versioning] +enable = true +vcs = "git" +metadata = true +dirty = true +semver = true +pattern = "default-unprefixed" # we don't use v in the tags + +[tool.poetry-dynamic-versioning.files."validphys2/src/validphys/_version.py"] +persistent-substitution = true +initial-content = """ +__version__ = "0.0.0" +""" + +[tool.poetry-dynamic-versioning.substitution] +files = ["validphys2/src/validphys/_version.py"] + + + [tool.black] line-length = 100 skip-string-normalization = 1 diff --git a/validphys2/setup.py b/validphys2/setup.py deleted file mode 100644 index 4f89706db7..0000000000 --- a/validphys2/setup.py +++ /dev/null @@ -1,60 +0,0 @@ -from __future__ import print_function -import sys -from setuptools import setup, find_packages - -if sys.version_info < (3,6): - print("validphys requires Python 3.6 or later", file=sys.stderr) - sys.exit(1) - -with open('README.md') as f: - long_desc = f.read() - -setup(name= "validphys", - version = '4.0', - description = "NNPDF analysis framework", - author = "Zahari Kassabov", - author_email = "kassabov@to.infn.it", - url="https://gitlab.cern.ch/NNPDF/validphys2", - long_description = long_desc, - entry_points = {'console_scripts': - [ - 'validphys = validphys.scripts.main:main', - 'vp-upload = validphys.scripts.vp_upload:main', - 'wiki-upload = validphys.scripts.wiki_upload:main', - 'postfit = validphys.scripts.postfit:main', - 'vp-get = validphys.scripts.vp_get:main', - 'vp-comparefits = validphys.scripts.vp_comparefits:main', - 'vp-fitrename = validphys.scripts.vp_fitrename:main', - 'vp-checktheory = validphys.scripts.vp_checktheory:main', - 'vp-rebuild-data = validphys.scripts.vp_rebuild_data:main', - 'vp-pdfrename = validphys.scripts.vp_pdfrename:main', - 'vp-pdffromreplicas = validphys.scripts.vp_pdffromreplicas:main', - 'vp-list = validphys.scripts.vp_list:main', - 'vp-nextfitruncard = validphys.scripts.vp_nextfitruncard:main', - 'vp-hyperoptplot = validphys.scripts.vp_hyperoptplot:main', - 'vp-deltachi2 = validphys.scripts.vp_deltachi2:main', - ]}, - package_dir = {'': 'src'}, - packages = find_packages('src'), - package_data = { - #TODO: Get rid of this nonsense - '':['*.template', '*.mplstyle', '*.csv', '*.yaml', '*.md', '*.png', '*.pickle'], - 'tests/regressions': ['*'], - 'comparefit': ['*'], - 'tests/baseline': ['*'], - 'cuts': ['*'], - 'scalevariations': ['*'], - 'hyperplot': ['*'], - 'deltachi2': ['*'], - }, - zip_safe = False, - classifiers=[ - 'Operating System :: Unix', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', - 'Topic :: Scientific/Engineering', - 'Topic :: Scientific/Engineering :: Physics', - ], - ) - diff --git a/validphys2/src/validphys/__init__.py b/validphys2/src/validphys/__init__.py index 407f181cbc..2848b606d1 100644 --- a/validphys2/src/validphys/__init__.py +++ b/validphys2/src/validphys/__init__.py @@ -1,4 +1,4 @@ -# We don't want to import stuff here that could slow down the import times -from validphys.version import build_version - -__version__ = build_version +try: + from ._version import __version__ +except ModuleNotFoundError: + raise ModuleNotFoundError("`_version` not found, you might need to reinstall nnpdf (e.g., `pip install .`) if you installed last before nnpdf 4.0.8") diff --git a/validphys2/src/validphys/core.py b/validphys2/src/validphys/core.py index 7d1fe69c79..ef50faf3ff 100644 --- a/validphys2/src/validphys/core.py +++ b/validphys2/src/validphys/core.py @@ -1,12 +1,8 @@ # -*- coding: utf-8 -*- """ Core datastructures used in the validphys data model. -Created on Wed Mar 9 15:19:52 2016 - -@author: Zahari Kassabov """ -from __future__ import generator_stop - +from dataclasses import dataclass import enum import functools import inspect @@ -507,18 +503,12 @@ def __init__(self, name, commondataspec, fkspec, maxlambda, thspec): cuts = Cuts(commondataspec, None) self.maxlambda = maxlambda super().__init__( - name=name, - commondata=commondataspec, - fkspecs=fkspec, - thspec=thspec, - cuts=cuts, + name=name, commondata=commondataspec, fkspecs=fkspec, thspec=thspec, cuts=cuts ) def to_unweighted(self): log.warning( - "Trying to unweight %s, %s are always unweighted", - self.__class__.__name__, - self.name, + "Trying to unweight %s, %s are always unweighted", self.__class__.__name__, self.name ) return self @@ -590,9 +580,7 @@ def to_unweighted(self): """Return a copy of the group with the weights for all experiments set to one. Note that the results cannot be used as a namespace.""" return self.__class__( - name=self.name, - datasets=[ds.to_unweighted() for ds in self.datasets], - dsinputs=None, + name=self.name, datasets=[ds.to_unweighted() for ds in self.datasets], dsinputs=None ) @@ -705,20 +693,18 @@ def sample_trials(self, n=None, base_params=None, sigma=4.0): return np.random.choice(all_trials, replace=False, size=n, p=weights) +@dataclass class TheoryIDSpec: - def __init__(self, id, path): - self.id = id - self.path = path + id: int + path: Path + dbpath: Path def __iter__(self): yield self.id yield self.path def get_description(self): - dbpath = self.path.parent / 'theory.db' - return fetch_theory(dbpath, self.id) - - __slots__ = ('id', 'path') + return fetch_theory(self.dbpath, self.id) def __repr__(self): return f"{self.__class__.__name__}(id={self.id}, path={self.path!r})" @@ -726,6 +712,9 @@ def __repr__(self): def __str__(self): return f"Theory {self.id}" + def __hash__(self): + return hash(self.path.as_posix()) + @property def yamldb_path(self): return self.path / "yamldb" @@ -855,11 +844,7 @@ def moment(self, order): return np.sum(np.power((data[1::2] - data[2::2]) / self.rescale_factor / 2, order), axis=0) -STAT_TYPES = dict( - symmhessian=SymmHessianStats, - hessian=HessianStats, - replicas=MCStats, -) +STAT_TYPES = dict(symmhessian=SymmHessianStats, hessian=HessianStats, replicas=MCStats) class Filter: diff --git a/validphys2/src/validphys/datafiles/__init__.py b/validphys2/src/validphys/datafiles/__init__.py new file mode 100644 index 0000000000..f80600b6cb --- /dev/null +++ b/validphys2/src/validphys/datafiles/__init__.py @@ -0,0 +1,5 @@ +import pathlib + +path_vpdata = pathlib.Path(__file__).parent +path_commondata = pathlib.Path(__file__).with_name('commondata') +path_theorydb = pathlib.Path(__file__).with_name('theory.db') diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-00-05.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-00-05.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-00-05.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-00-05.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-05-10.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-05-10.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-05-10.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-05-10.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-10-15.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-10-15.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-10-15.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-10-15.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-15-20.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-15-20.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-15-20.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-15-20.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-20-25.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-20-25.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-20-25.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-20-25.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-25-30.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-25-30.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-25-30.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-25-30.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-00-05.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-00-05.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-00-05.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-00-05.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-05-10.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-05-10.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-05-10.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-05-10.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-10-15.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-10-15.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-10-15.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-10-15.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-15-20.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-15-20.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-15-20.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-15-20.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-20-25.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-20-25.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-20-25.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-20-25.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-25-30.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-25-30.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-25-30.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-25-30.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-1.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-1.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-1.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-1.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-2.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-2.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-2.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-2.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-3.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-3.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-3.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-3.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-4.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-4.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-4.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-4.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-5.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-5.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-5.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-5.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-6.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-6.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-6.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-6.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-7.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-7.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-7.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-7.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-1.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-1.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-1.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-1.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-2.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-2.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-2.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-2.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-3.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-3.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-3.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-3.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-4.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-4.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-4.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-4.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-5.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-5.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-5.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-5.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-6.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-6.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-6.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-6.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-7.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-7.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-7.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-7.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-1.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-1.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-1.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-1.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-2.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-2.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-2.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-2.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-3.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-3.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-3.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-3.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-4.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-4.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-4.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-4.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-5.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-5.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-5.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-5.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-6.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-6.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-6.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-6.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-7.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-7.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-7.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-7.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-1.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-1.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-1.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-1.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-2.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-2.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-2.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-2.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-3.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-3.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-3.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-3.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-4.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-4.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-4.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-4.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-5.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-5.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-5.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-5.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-6.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-6.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-6.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-6.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-7.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-7.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-7.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-7.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CDFR2KT-all.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CDFR2KT-all.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CDFR2KT-all.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CDFR2KT-all.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CDFR2KT_SF-all.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CDFR2KT_SF-all.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CDFR2KT_SF-all.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CDFR2KT_SF-all.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-00-05.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-00-05.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-00-05.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-00-05.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-05-10.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-05-10.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-05-10.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-05-10.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-10-15.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-10-15.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-10-15.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-10-15.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-15-20.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-15-20.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-15-20.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-15-20.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-20-25.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-20-25.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-20-25.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-20-25.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-25-30.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-25-30.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-25-30.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-25-30.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-00-05.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-00-05.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-00-05.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-00-05.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-05-10.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-05-10.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-05-10.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-05-10.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-10-15.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-10-15.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-10-15.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-10-15.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-15-20.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-15-20.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-15-20.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-15-20.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-20-25.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-20-25.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-20-25.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-20-25.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-25-30.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-25-30.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-25-30.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-25-30.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11-00_05.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11-00_05.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11-00_05.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11-00_05.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11-05_10.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11-05_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11-05_10.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11-05_10.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11-10_15.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11-10_15.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11-10_15.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11-10_15.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11-15_20.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11-15_20.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11-15_20.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11-15_20.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11-20_25.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11-20_25.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11-20_25.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11-20_25.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11_SF-00_05.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11_SF-00_05.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11_SF-00_05.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11_SF-00_05.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11_SF-05_10.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11_SF-05_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11_SF-05_10.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11_SF-05_10.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11_SF-10_15.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11_SF-10_15.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11_SF-10_15.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11_SF-10_15.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11_SF-15_20.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11_SF-15_20.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11_SF-15_20.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11_SF-15_20.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11_SF-20_25.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11_SF-20_25.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11_SF-20_25.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11_SF-20_25.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-00-05.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-00-05.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-00-05.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-00-05.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-05-10.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-05-10.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-05-10.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-05-10.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-10-15.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-10-15.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-10-15.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-10-15.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-15-20.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-15-20.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-15-20.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-15-20.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-20-25.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-20-25.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-20-25.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-20-25.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-25-30.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-25-30.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-25-30.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-25-30.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-1.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-1.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-1.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-1.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-2.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-2.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-2.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-2.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-3.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-3.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-3.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-3.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-4.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-4.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-4.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-4.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-5.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-5.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-5.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-5.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-6.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-6.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-6.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-6.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-7.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-7.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-7.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-7.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-1.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-1.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-1.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-1.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-2.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-2.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-2.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-2.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-3.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-3.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-3.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-3.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-4.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-4.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-4.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-4.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-5.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-5.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-5.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-5.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-6.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-6.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-6.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-6.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-7.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-7.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-7.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-7.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-00-05.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-00-05.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-00-05.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-00-05.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-05-10.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-05-10.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-05-10.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-05-10.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-10-15.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-10-15.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-10-15.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-10-15.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-15-20.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-15-20.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-15-20.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-15-20.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-20-25.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-20-25.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-20-25.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-20-25.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-25-30.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-25-30.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-25-30.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-25-30.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMSJETS11-00_05.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMSJETS11-00_05.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMSJETS11-00_05.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMSJETS11-00_05.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMSJETS11-05_10.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMSJETS11-05_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMSJETS11-05_10.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMSJETS11-05_10.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMSJETS11-10_15.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMSJETS11-10_15.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMSJETS11-10_15.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMSJETS11-10_15.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMSJETS11-15_20.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMSJETS11-15_20.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMSJETS11-15_20.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMSJETS11-15_20.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMSJETS11-20_25.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMSJETS11-20_25.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMSJETS11-20_25.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMSJETS11-20_25.dat diff --git a/nnpdfcpp/data/commondata/31systematics/postprocess_jets.sh b/validphys2/src/validphys/datafiles/commondata/31systematics/postprocess_jets.sh similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/postprocess_jets.sh rename to validphys2/src/validphys/datafiles/commondata/31systematics/postprocess_jets.sh diff --git a/nnpdfcpp/data/commondata/31systematics/process_jets.sh b/validphys2/src/validphys/datafiles/commondata/31systematics/process_jets.sh similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/process_jets.sh rename to validphys2/src/validphys/datafiles/commondata/31systematics/process_jets.sh diff --git a/nnpdfcpp/data/commondata/31systematics/process_zpt.sh b/validphys2/src/validphys/datafiles/commondata/31systematics/process_zpt.sh similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/process_zpt.sh rename to validphys2/src/validphys/datafiles/commondata/31systematics/process_zpt.sh diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS1JET11.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS1JET11.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS1JET11.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS1JET11.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS1JET11_NEW_SCALE.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS1JET11_NEW_SCALE.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS1JET11_NEW_SCALE.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS1JET11_NEW_SCALE.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS1JET11_NEW_SCALE_CORR.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS1JET11_NEW_SCALE_CORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS1JET11_NEW_SCALE_CORR.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS1JET11_NEW_SCALE_CORR.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS1JET11_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS1JET11_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS1JET11_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS1JET11_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASDY2D8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASDY2D8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASDY2D8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASDY2D8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASLOMASSDY11EXT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASLOMASSDY11EXT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASLOMASSDY11EXT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASLOMASSDY11EXT.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASPHT12.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASPHT12.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASPHT12.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASPHT12.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASPHT12_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASPHT12_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASPHT12_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASPHT12_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASPHT15.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASPHT15.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASPHT15.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASPHT15.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASPHT15_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASPHT15_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASPHT15_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASPHT15_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASR04JETS2P76TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASR04JETS2P76TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASR04JETS2P76TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASR04JETS2P76TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASR04JETS2P76TEV_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASR04JETS2P76TEV_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASR04JETS2P76TEV_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASR04JETS2P76TEV_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASR04JETS36PB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASR04JETS36PB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASR04JETS36PB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASR04JETS36PB.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASR04JETS36PB_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASR04JETS36PB_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASR04JETS36PB_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASR04JETS36PB_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASR06JETS36PB_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASR06JETS36PB_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASR06JETS36PB_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASR06JETS36PB_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTPTNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTPTNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTPTNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTPTNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTPTNORM_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTPTNORM_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTPTNORM_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTPTNORM_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTRAPNORM_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTRAPNORM_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTRAPNORM_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTRAPNORM_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTTMNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTTMNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTTMNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTTMNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTTMNORM_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTTMNORM_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTTMNORM_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTTMNORM_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTTRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTTRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTTRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTTRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTTRAPNORM_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTTRAPNORM_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTTRAPNORM_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTTRAPNORM_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTTBARTOT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTTBARTOT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTTBARTOT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTTBARTOT.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTTBARTOT13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTTBARTOT13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTTBARTOT13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTTBARTOT13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTTBARTOT7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTTBARTOT7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTTBARTOT7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTTBARTOT7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTTBARTOT8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTTBARTOT8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTTBARTOT8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTTBARTOT8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASWPT31PB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASWPT31PB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASWPT31PB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASWPT31PB.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASWRAP11CC.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASWRAP11CC.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASWRAP11CC.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASWRAP11CC.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASWRAP36PB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASWRAP36PB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASWRAP36PB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASWRAP36PB.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASWZRAP11.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASWZRAP11.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASWZRAP11.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASWZRAP11.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASWZRAP11CC.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASWZRAP11CC.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASWZRAP11CC.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASWZRAP11CC.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASWZRAP11CF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASWZRAP11CF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASWZRAP11CF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASWZRAP11CF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASWZRAP36PB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASWZRAP36PB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASWZRAP36PB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASWZRAP36PB.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASWZTOT13TEV81PB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASWZTOT13TEV81PB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASWZTOT13TEV81PB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASWZTOT13TEV81PB.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASZHIGHMASS49FB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASZHIGHMASS49FB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASZHIGHMASS49FB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASZHIGHMASS49FB.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASZPT7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASZPT7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASZPT7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASZPT7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASZPT8TEVMDIST.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASZPT8TEVMDIST.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASZPT8TEVMDIST.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASZPT8TEVMDIST.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASZPT8TEVYDIST.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASZPT8TEVYDIST.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASZPT8TEVYDIST.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASZPT8TEVYDIST.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASZRAP11CC.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASZRAP11CC.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASZRAP11CC.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASZRAP11CC.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASZRAP36PB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASZRAP36PB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASZRAP36PB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASZRAP36PB.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_1JET_8TEV_R04.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_1JET_8TEV_R04.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_1JET_8TEV_R04.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_1JET_8TEV_R04.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_1JET_8TEV_R06.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_1JET_8TEV_R06.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_1JET_8TEV_R06.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_1JET_8TEV_R06.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_1JET_8TEV_R06_DEC.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_1JET_8TEV_R06_DEC.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_1JET_8TEV_R06_DEC.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_1JET_8TEV_R06_DEC.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_1JET_8TEV_R06_UNC.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_1JET_8TEV_R06_UNC.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_1JET_8TEV_R06_UNC.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_1JET_8TEV_R06_UNC.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_2JET_7TEV_R04.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_2JET_7TEV_R04.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_2JET_7TEV_R04.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_2JET_7TEV_R04.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_2JET_7TEV_R06.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_2JET_7TEV_R06.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_2JET_7TEV_R06.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_2JET_7TEV_R06.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_DY_2D_8TEV_LOWMASS.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_DY_2D_8TEV_LOWMASS.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_DY_2D_8TEV_LOWMASS.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_DY_2D_8TEV_LOWMASS.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_R_13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_R_13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_R_13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_R_13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_R_7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_R_7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_R_7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_R_7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_R_8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_R_8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_R_8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_R_8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TTBARTOT_13TEV_FULLLUMI.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTBARTOT_13TEV_FULLLUMI.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TTBARTOT_13TEV_FULLLUMI.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTBARTOT_13TEV_FULLLUMI.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TRAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TRAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TRAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TRAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_WCHARM_WM_DIFF_7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WCHARM_WM_DIFF_7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_WCHARM_WM_DIFF_7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WCHARM_WM_DIFF_7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_WCHARM_WP_DIFF_7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WCHARM_WP_DIFF_7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_WCHARM_WP_DIFF_7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WCHARM_WP_DIFF_7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_WMU_8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WMU_8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_WMU_8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WMU_8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_WM_JET_8TEV_PT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WM_JET_8TEV_PT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_WM_JET_8TEV_PT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WM_JET_8TEV_PT.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_WM_JET_8TEV_PTJ.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WM_JET_8TEV_PTJ.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_WM_JET_8TEV_PTJ.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WM_JET_8TEV_PTJ.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_WP_JET_8TEV_PT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WP_JET_8TEV_PT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_WP_JET_8TEV_PT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WP_JET_8TEV_PT.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_WP_JET_8TEV_PTJ.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WP_JET_8TEV_PTJ.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_WP_JET_8TEV_PTJ.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WP_JET_8TEV_PTJ.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_WZ_TOT_13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WZ_TOT_13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_WZ_TOT_13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WZ_TOT_13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_W_TOT_13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_W_TOT_13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_W_TOT_13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_W_TOT_13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_Z_TOT_13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_Z_TOT_13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_Z_TOT_13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_Z_TOT_13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_BCDMSD.dat b/validphys2/src/validphys/datafiles/commondata/DATA_BCDMSD.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_BCDMSD.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_BCDMSD.dat diff --git a/nnpdfcpp/data/commondata/DATA_BCDMSD_dw.dat b/validphys2/src/validphys/datafiles/commondata/DATA_BCDMSD_dw.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_BCDMSD_dw.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_BCDMSD_dw.dat diff --git a/nnpdfcpp/data/commondata/DATA_BCDMSD_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_BCDMSD_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_BCDMSD_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_BCDMSD_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_BCDMSD_sh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_BCDMSD_sh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_BCDMSD_sh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_BCDMSD_sh.dat diff --git a/nnpdfcpp/data/commondata/DATA_BCDMSD_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_BCDMSD_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_BCDMSD_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_BCDMSD_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_BCDMSP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_BCDMSP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_BCDMSP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_BCDMSP.dat diff --git a/nnpdfcpp/data/commondata/DATA_BCDMSP_dwsh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_BCDMSP_dwsh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_BCDMSP_dwsh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_BCDMSP_dwsh.dat diff --git a/nnpdfcpp/data/commondata/DATA_CDFR2KT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CDFR2KT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CDFR2KT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CDFR2KT.dat diff --git a/nnpdfcpp/data/commondata/DATA_CDFR2KT_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CDFR2KT_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CDFR2KT_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CDFR2KT_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_CDFZRAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CDFZRAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CDFZRAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CDFZRAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_CDFZRAP_NEW.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CDFZRAP_NEW.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CDFZRAP_NEW.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CDFZRAP_NEW.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNB.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNBPb.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNBPb.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNBPb.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNBPb.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNBPb_dw.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNBPb_dw.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNBPb_dw.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNBPb_dw.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNBPb_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNBPb_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNBPb_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNBPb_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNBPb_sh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNBPb_sh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNBPb_sh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNBPb_sh.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNBPb_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNBPb_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNBPb_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNBPb_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNU.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNU.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNU.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNU.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNUPb.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNUPb.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNUPb.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNUPb.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNUPb_dw.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNUPb_dw.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNUPb_dw.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNUPb_dw.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNUPb_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNUPb_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNUPb_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNUPb_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNUPb_sh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNUPb_sh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNUPb_sh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNUPb_sh.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNUPb_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNUPb_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNUPb_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNUPb_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS1JET276TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS1JET276TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS1JET276TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS1JET276TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS1JET276TEV_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS1JET276TEV_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS1JET276TEV_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS1JET276TEV_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSDY2D11.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSDY2D11.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSDY2D11.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSDY2D11.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSDY2D12.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSDY2D12.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSDY2D12.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSDY2D12.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSJETS11.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSJETS11.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSJETS11.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSJETS11.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSJETS11_NEW_SCALE.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSJETS11_NEW_SCALE.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSJETS11_NEW_SCALE.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSJETS11_NEW_SCALE.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSJETS11_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSJETS11_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSJETS11_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSJETS11_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSTOPDIFF8TEVTRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSTOPDIFF8TEVTRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSTOPDIFF8TEVTRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSTOPDIFF8TEVTRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSTOPDIFF8TEVTTMNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSTOPDIFF8TEVTTMNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSTOPDIFF8TEVTTMNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSTOPDIFF8TEVTTMNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSTOPDIFF8TEVTTRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSTOPDIFF8TEVTTRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSTOPDIFF8TEVTTRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSTOPDIFF8TEVTTRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSTTBARTOT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSTTBARTOT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSTTBARTOT13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSTTBARTOT13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSTTBARTOT5TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT5TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSTTBARTOT5TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT5TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSTTBARTOT7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSTTBARTOT7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSTTBARTOT8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSTTBARTOT8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSTTBARTOT_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSTTBARTOT_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSWCHARMRAT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSWCHARMRAT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSWCHARMRAT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSWCHARMRAT.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSWCHARMTOT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSWCHARMTOT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSWCHARMTOT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSWCHARMTOT.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSWEASY840PB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSWEASY840PB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSWEASY840PB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSWEASY840PB.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSWMASY47FB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSWMASY47FB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSWMASY47FB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSWMASY47FB.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSWMU8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSWMU8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSWMU8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSWMU8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSZDIFF12.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSZDIFF12.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSZDIFF12.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSZDIFF12.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_1JET_8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_1JET_8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_1JET_8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_1JET_8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_2JET_3D_8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_2JET_3D_8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_2JET_3D_8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_2JET_3D_8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_2JET_5TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_2JET_5TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_2JET_5TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_2JET_5TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_2JET_7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_2JET_7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_2JET_7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_2JET_7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_HMDY_13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_HMDY_13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_HMDY_13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_HMDY_13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_HMDY_DE_13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_HMDY_DE_13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_HMDY_DE_13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_HMDY_DE_13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_HMDY_DM_13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_HMDY_DM_13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_HMDY_DM_13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_HMDY_DM_13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_SINGLETOP_TCH_R_13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_SINGLETOP_TCH_R_13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_SINGLETOP_TCH_R_13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_SINGLETOP_TCH_R_13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_SINGLETOP_TCH_R_8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_SINGLETOP_TCH_R_8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_SINGLETOP_TCH_R_8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_SINGLETOP_TCH_R_8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_SINGLETOP_TCH_TOT_7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_SINGLETOP_TCH_TOT_7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_SINGLETOP_TCH_TOT_7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_SINGLETOP_TCH_TOT_7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TRAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TRAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TRAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TRAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_WCHARM_DIFF_UNNORM_13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_WCHARM_DIFF_UNNORM_13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_WCHARM_DIFF_UNNORM_13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_WCHARM_DIFF_UNNORM_13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_D0R2CON.dat b/validphys2/src/validphys/datafiles/commondata/DATA_D0R2CON.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_D0R2CON.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_D0R2CON.dat diff --git a/nnpdfcpp/data/commondata/DATA_D0WEASY.dat b/validphys2/src/validphys/datafiles/commondata/DATA_D0WEASY.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_D0WEASY.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_D0WEASY.dat diff --git a/nnpdfcpp/data/commondata/DATA_D0WMASY.dat b/validphys2/src/validphys/datafiles/commondata/DATA_D0WMASY.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_D0WMASY.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_D0WMASY.dat diff --git a/nnpdfcpp/data/commondata/DATA_D0ZRAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_D0ZRAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_D0ZRAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_D0ZRAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_D0ZRAP_40.dat b/validphys2/src/validphys/datafiles/commondata/DATA_D0ZRAP_40.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_D0ZRAP_40.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_D0ZRAP_40.dat diff --git a/nnpdfcpp/data/commondata/DATA_D0ZRAP_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_D0ZRAP_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_D0ZRAP_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_D0ZRAP_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE605.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE605.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE605.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE605.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE605_dw.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE605_dw.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE605_dw.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE605_dw.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE605_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE605_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE605_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE605_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE605_sh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE605_sh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE605_sh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE605_sh.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE605_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE605_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE605_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE605_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE886P.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE886P.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE886P.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE886P.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE886R.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE886R.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE886R.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE886R.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE886R_dw.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE886R_dw.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE886R_dw.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE886R_dw.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE886R_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE886R_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE886R_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE886R_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE886R_sh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE886R_sh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE886R_sh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE886R_sh.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE886R_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE886R_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE886R_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE886R_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE886_D.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE886_D.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE886_D.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE886_D.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_BIN01.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN01.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_BIN01.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN01.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_BIN02.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN02.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_BIN02.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN02.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_BIN03.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN03.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_BIN03.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN03.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_BIN04.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN04.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_BIN04.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN04.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_BIN05.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN05.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_BIN05.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN05.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_BIN06.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN06.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_BIN06.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN06.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_BIN07.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN07.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_BIN07.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN07.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_BIN08.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN08.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_BIN08.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN08.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_BIN09.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN09.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_BIN09.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN09.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_BIN10.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN10.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_BIN10.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN10.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906_D.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906_D.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906_D.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906_D.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_CC_EMP_140_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_CC_EMP_140_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_CC_EMP_140_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_CC_EMP_140_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_CC_EMP_140_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_CC_EMP_140_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_CC_EMP_140_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_CC_EMP_140_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_CC_EPP_140_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_CC_EPP_140_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_CC_EPP_140_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_CC_EPP_140_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_CC_EPP_140_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_CC_EPP_140_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_CC_EPP_140_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_CC_EPP_140_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_28_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_28_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_28_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_28_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_28_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_28_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_28_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_28_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_66_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_66_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_66_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_66_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_66_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_66_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_66_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_66_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_88_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_88_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_88_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_88_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_88_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_88_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_88_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_88_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_140_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_140_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_140_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_140_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_140_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_140_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_140_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_140_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_28_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_28_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_28_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_28_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_28_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_28_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_28_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_28_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_44_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_44_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_44_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_44_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_44_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_44_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_44_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_44_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_63_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_63_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_63_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_63_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_63_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_63_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_63_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_63_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_28_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_28_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_28_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_28_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_28_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_28_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_28_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_28_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_66_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_66_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_66_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_66_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_66_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_66_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_66_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_66_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_88_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_88_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_88_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_88_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_88_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_88_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_88_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_88_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_140_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_140_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_140_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_140_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_140_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_140_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_140_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_140_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_28_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_28_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_28_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_28_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_28_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_28_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_28_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_28_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_44_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_44_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_44_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_44_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_44_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_44_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_44_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_44_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_63_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_63_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_63_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_63_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_63_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_63_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_63_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_63_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EMCF2C.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EMCF2C.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EMCF2C.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EMCF2C.dat diff --git a/nnpdfcpp/data/commondata/DATA_EMCF2C_dw.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EMCF2C_dw.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EMCF2C_dw.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EMCF2C_dw.dat diff --git a/nnpdfcpp/data/commondata/DATA_EMCF2C_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EMCF2C_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EMCF2C_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EMCF2C_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_EMCF2C_sh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EMCF2C_sh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EMCF2C_sh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EMCF2C_sh.dat diff --git a/nnpdfcpp/data/commondata/DATA_EMCF2C_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EMCF2C_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EMCF2C_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EMCF2C_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_EMCF2D.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EMCF2D.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EMCF2D.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EMCF2D.dat diff --git a/nnpdfcpp/data/commondata/DATA_EMCF2P.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EMCF2P.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EMCF2P.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EMCF2P.dat diff --git a/nnpdfcpp/data/commondata/DATA_EMCF2c1987.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EMCF2c1987.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EMCF2c1987.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EMCF2c1987.dat diff --git a/nnpdfcpp/data/commondata/DATA_H1HERAF2B.dat b/validphys2/src/validphys/datafiles/commondata/DATA_H1HERAF2B.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_H1HERAF2B.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_H1HERAF2B.dat diff --git a/nnpdfcpp/data/commondata/DATA_HERACOMBCCEM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBCCEM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_HERACOMBCCEM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBCCEM.dat diff --git a/nnpdfcpp/data/commondata/DATA_HERACOMBCCEP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBCCEP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_HERACOMBCCEP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBCCEP.dat diff --git a/nnpdfcpp/data/commondata/DATA_HERACOMBNCEM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBNCEM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_HERACOMBNCEM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBNCEM.dat diff --git a/nnpdfcpp/data/commondata/DATA_HERACOMBNCEP460.dat b/validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBNCEP460.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_HERACOMBNCEP460.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBNCEP460.dat diff --git a/nnpdfcpp/data/commondata/DATA_HERACOMBNCEP575.dat b/validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBNCEP575.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_HERACOMBNCEP575.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBNCEP575.dat diff --git a/nnpdfcpp/data/commondata/DATA_HERACOMBNCEP820.dat b/validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBNCEP820.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_HERACOMBNCEP820.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBNCEP820.dat diff --git a/nnpdfcpp/data/commondata/DATA_HERACOMBNCEP920.dat b/validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBNCEP920.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_HERACOMBNCEP920.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBNCEP920.dat diff --git a/nnpdfcpp/data/commondata/DATA_HERACOMB_SIGMARED_B.dat b/validphys2/src/validphys/datafiles/commondata/DATA_HERACOMB_SIGMARED_B.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_HERACOMB_SIGMARED_B.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_HERACOMB_SIGMARED_B.dat diff --git a/nnpdfcpp/data/commondata/DATA_HERACOMB_SIGMARED_C.dat b/validphys2/src/validphys/datafiles/commondata/DATA_HERACOMB_SIGMARED_C.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_HERACOMB_SIGMARED_C.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_HERACOMB_SIGMARED_C.dat diff --git a/nnpdfcpp/data/commondata/DATA_HERAF2CHARM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_HERAF2CHARM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_HERAF2CHARM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_HERAF2CHARM.dat diff --git a/nnpdfcpp/data/commondata/DATA_INTEGXT3.dat b/validphys2/src/validphys/datafiles/commondata/DATA_INTEGXT3.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_INTEGXT3.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_INTEGXT3.dat diff --git a/nnpdfcpp/data/commondata/DATA_INTEGXT3_543.dat b/validphys2/src/validphys/datafiles/commondata/DATA_INTEGXT3_543.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_INTEGXT3_543.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_INTEGXT3_543.dat diff --git a/nnpdfcpp/data/commondata/DATA_INTEGXT8.dat b/validphys2/src/validphys/datafiles/commondata/DATA_INTEGXT8.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_INTEGXT8.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_INTEGXT8.dat diff --git a/nnpdfcpp/data/commondata/DATA_INTEGXV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_INTEGXV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV.dat diff --git a/nnpdfcpp/data/commondata/DATA_INTEGXV3.dat b/validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV3.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_INTEGXV3.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV3.dat diff --git a/nnpdfcpp/data/commondata/DATA_INTEGXV3_543.dat b/validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV3_543.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_INTEGXV3_543.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV3_543.dat diff --git a/nnpdfcpp/data/commondata/DATA_INTEGXV8.dat b/validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV8.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_INTEGXV8.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV8.dat diff --git a/nnpdfcpp/data/commondata/DATA_INTEGXV8_543.dat b/validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV8_543.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_INTEGXV8_543.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV8_543.dat diff --git a/nnpdfcpp/data/commondata/DATA_INTEGXV_543.dat b/validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV_543.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_INTEGXV_543.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV_543.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBW36PB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBW36PB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBW36PB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBW36PB.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBW36PB_40.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBW36PB_40.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBW36PB_40.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBW36PB_40.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBWMU7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBWMU7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBWMU7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBWMU7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBWMU8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBWMU8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBWMU8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBWMU8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBWZMU7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBWZMU7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBWZMU7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBWZMU7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBWZMU8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBWZMU8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBWZMU8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBWZMU8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBZ940PB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBZ940PB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBZ940PB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBZ940PB.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBZEE2FB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBZEE2FB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBZEE2FB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBZEE2FB.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBZEE2FB_40.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBZEE2FB_40.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBZEE2FB_40.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBZEE2FB_40.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBZMU7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBZMU7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBZMU7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBZMU7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBZMU8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBZMU8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBZMU8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBZMU8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCB_WENU_8TEV_A.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCB_WENU_8TEV_A.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCB_WENU_8TEV_A.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCB_WENU_8TEV_A.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCB_WENU_8TEV_R.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCB_WENU_8TEV_R.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCB_WENU_8TEV_R.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCB_WENU_8TEV_R.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCB_Z_13TEV_DIELECTRON.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCB_Z_13TEV_DIELECTRON.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCB_Z_13TEV_DIELECTRON.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCB_Z_13TEV_DIELECTRON.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCB_Z_13TEV_DIMUON.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCB_Z_13TEV_DIMUON.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCB_Z_13TEV_DIMUON.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCB_Z_13TEV_DIMUON.dat diff --git a/nnpdfcpp/data/commondata/DATA_NMC.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NMC.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NMC.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NMC.dat diff --git a/nnpdfcpp/data/commondata/DATA_NMCPD.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NMCPD.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NMCPD.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NMCPD.dat diff --git a/nnpdfcpp/data/commondata/DATA_NMCPD_D.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NMCPD_D.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NMCPD_D.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NMCPD_D.dat diff --git a/nnpdfcpp/data/commondata/DATA_NMCPD_dw.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NMCPD_dw.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NMCPD_dw.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NMCPD_dw.dat diff --git a/nnpdfcpp/data/commondata/DATA_NMCPD_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NMCPD_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NMCPD_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NMCPD_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_NMCPD_sh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NMCPD_sh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NMCPD_sh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NMCPD_sh.dat diff --git a/nnpdfcpp/data/commondata/DATA_NMCPD_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NMCPD_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NMCPD_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NMCPD_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNBDMN.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMN.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNBDMN.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMN.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNBDMNFe.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMNFe.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNBDMNFe.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMNFe.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNBDMNFe_dw.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMNFe_dw.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNBDMNFe_dw.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMNFe_dw.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNBDMNFe_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMNFe_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNBDMNFe_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMNFe_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNBDMNFe_sh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMNFe_sh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNBDMNFe_sh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMNFe_sh.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNBDMNFe_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMNFe_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNBDMNFe_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMNFe_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNUDMN.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMN.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNUDMN.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMN.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNUDMNFe.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMNFe.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNUDMNFe.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMNFe.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNUDMNFe_dw.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMNFe_dw.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNUDMNFe_dw.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMNFe_dw.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNUDMNFe_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMNFe_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNUDMNFe_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMNFe_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNUDMNFe_sh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMNFe_sh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNUDMNFe_sh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMNFe_sh.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNUDMNFe_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMNFe_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNUDMNFe_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMNFe_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYC.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYC.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYC.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYC.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYCBD.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYCBD.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYCBD.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYCBD.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYCBDB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYCBDB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYCBDB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYCBDB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYCBS.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYCBS.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYCBS.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYCBS.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYCBSB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYCBSB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYCBSB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYCBSB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYCD.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYCD.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYCD.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYCD.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYCDB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYCDB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYCDB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYCDB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYCS.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYCS.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYCS.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYCS.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYCSB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYCSB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYCSB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYCSB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYD.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYD.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYD.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYD.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYS.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYS.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYS.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYS.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYU.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYU.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYU.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYU.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYUBD.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYUBD.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYUBD.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYUBD.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYUBDB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYUBDB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYUBDB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYUBDB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYUBS.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYUBS.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYUBS.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYUBS.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYUBSB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYUBSB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYUBSB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYUBSB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYUD.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYUD.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYUD.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYUD.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYUDB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYUDB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYUDB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYUDB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYUS.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYUS.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYUS.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYUS.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYUSB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYUSB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYUSB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYUSB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSF2C.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSF2C.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSF2C.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSF2C.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSF2C_17PTS.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSF2C_17PTS.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSF2C_17PTS.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSF2C_17PTS.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSF2C_CCE.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSF2C_CCE.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSF2C_CCE.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSF2C_CCE.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSF2C_CCE_17PTS.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSF2C_CCE_17PTS.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSF2C_CCE_17PTS.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSF2C_CCE_17PTS.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSF2C_CCP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSF2C_CCP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSF2C_CCP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSF2C_CCP.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSF2C_CCP_17PTS.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSF2C_CCP_17PTS.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSF2C_CCP_17PTS.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSF2C_CCP_17PTS.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSF2DW.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSF2DW.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSF2DW.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSF2DW.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSF2S.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSF2S.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSF2S.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSF2S.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSF2U.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSF2U.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSF2U.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSF2U.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSFLL.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSFLL.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSFLL.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSFLL.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSFLL_19PTS.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSFLL_19PTS.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSFLL_19PTS.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSFLL_19PTS.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSXCQ.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSXCQ.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSXCQ.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSXCQ.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSXDB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSXDB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSXDB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSXDB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSXDQ.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSXDQ.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSXDQ.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSXDQ.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSXGL.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSXGL.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSXGL.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSXGL.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSXSB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSXSB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSXSB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSXSB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSXSQ.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSXSQ.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSXSQ.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSXSQ.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSXUB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSXUB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSXUB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSXUB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSXUQ.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSXUQ.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSXUQ.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSXUQ.dat diff --git a/nnpdfcpp/data/commondata/DATA_SLACD.dat b/validphys2/src/validphys/datafiles/commondata/DATA_SLACD.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_SLACD.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_SLACD.dat diff --git a/nnpdfcpp/data/commondata/DATA_SLACD_dw.dat b/validphys2/src/validphys/datafiles/commondata/DATA_SLACD_dw.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_SLACD_dw.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_SLACD_dw.dat diff --git a/nnpdfcpp/data/commondata/DATA_SLACD_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_SLACD_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_SLACD_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_SLACD_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_SLACD_sh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_SLACD_sh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_SLACD_sh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_SLACD_sh.dat diff --git a/nnpdfcpp/data/commondata/DATA_SLACD_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_SLACD_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_SLACD_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_SLACD_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_SLACP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_SLACP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_SLACP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_SLACP.dat diff --git a/nnpdfcpp/data/commondata/DATA_SLACP_dwsh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_SLACP_dwsh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_SLACP_dwsh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_SLACP_dwsh.dat diff --git a/nnpdfcpp/data/commondata/DATA_ZEUSHERAF2B.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ZEUSHERAF2B.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ZEUSHERAF2B.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ZEUSHERAF2B.dat diff --git a/nnpdfcpp/data/commondata/DATA_ZEUSHERAF2B_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ZEUSHERAF2B_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ZEUSHERAF2B_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ZEUSHERAF2B_SF.dat diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_DIJET.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_DIJET.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_DIJET.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_DIJET.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_DIS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_DIS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_DIS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_DIS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_DYP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_DYP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_DYP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_DYP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_EWJ_JPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWJ_JPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_EWJ_JPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWJ_JPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_EWJ_JRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWJ_JRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_EWJ_JRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWJ_JRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_EWJ_MLL.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWJ_MLL.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_EWJ_MLL.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWJ_MLL.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_EWJ_PT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWJ_PT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_EWJ_PT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWJ_PT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_EWJ_RAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWJ_RAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_EWJ_RAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWJ_RAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_EWK_MLL.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWK_MLL.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_EWK_MLL.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWK_MLL.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_EWK_PT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWK_PT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_EWK_PT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWK_PT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_EWK_PTRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWK_PTRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_EWK_PTRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWK_PTRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_EWK_RAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWK_RAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_EWK_RAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWK_RAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_HIG_RAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HIG_RAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_HIG_RAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HIG_RAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_HQP_MQQ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HQP_MQQ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_HQP_MQQ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HQP_MQQ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_HQP_PTQ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HQP_PTQ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_HQP_PTQ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HQP_PTQ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_HQP_PTQQ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HQP_PTQQ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_HQP_PTQQ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HQP_PTQQ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_HQP_YQ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HQP_YQ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_HQP_YQ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HQP_YQ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_HQP_YQQ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HQP_YQQ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_HQP_YQQ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HQP_YQQ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_INC.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_INC.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_INC.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_INC.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_JET.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_JET.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_JET.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_JET.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_PHT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_PHT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_PHT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_PHT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS1JET11.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS1JET11.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS1JET11.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS1JET11.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS1JET11_NEW_SCALE.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS1JET11_NEW_SCALE.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS1JET11_NEW_SCALE.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS1JET11_NEW_SCALE.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS1JET11_NEW_SCALE_CORR.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS1JET11_NEW_SCALE_CORR.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS1JET11_NEW_SCALE_CORR.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS1JET11_NEW_SCALE_CORR.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS1JET11_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS1JET11_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS1JET11_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS1JET11_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASDY2D8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASDY2D8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASDY2D8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASDY2D8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASLOMASSDY11EXT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASLOMASSDY11EXT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASLOMASSDY11EXT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASLOMASSDY11EXT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASPHT12.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASPHT12.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASPHT12.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASPHT12.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASPHT12_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASPHT12_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASPHT12_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASPHT12_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASPHT15.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASPHT15.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASPHT15.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASPHT15.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASPHT15_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASPHT15_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASPHT15_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASPHT15_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASR04JETS2P76TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASR04JETS2P76TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASR04JETS2P76TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASR04JETS2P76TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASR04JETS2P76TEV_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASR04JETS2P76TEV_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASR04JETS2P76TEV_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASR04JETS2P76TEV_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASR04JETS36PB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASR04JETS36PB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASR04JETS36PB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASR04JETS36PB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASR04JETS36PB_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASR04JETS36PB_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASR04JETS36PB_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASR04JETS36PB_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASR06JETS36PB_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASR06JETS36PB_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASR06JETS36PB_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASR06JETS36PB_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTPTNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTPTNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTPTNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTPTNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTPTNORM_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTPTNORM_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTPTNORM_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTPTNORM_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTRAPNORM_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTRAPNORM_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTRAPNORM_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTRAPNORM_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTTMNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTTMNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTTMNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTTMNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTTMNORM_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTTMNORM_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTTMNORM_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTTMNORM_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTTRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTTRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTTRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTTRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTTRAPNORM_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTTRAPNORM_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTTRAPNORM_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTTRAPNORM_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTTBARTOT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTTBARTOT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTTBARTOT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTTBARTOT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTTBARTOT13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTTBARTOT13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTTBARTOT13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTTBARTOT13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTTBARTOT7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTTBARTOT7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTTBARTOT7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTTBARTOT7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTTBARTOT8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTTBARTOT8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTTBARTOT8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTTBARTOT8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASWPT31PB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWPT31PB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASWPT31PB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWPT31PB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASWRAP11CC.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWRAP11CC.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASWRAP11CC.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWRAP11CC.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASWRAP36PB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWRAP36PB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASWRAP36PB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWRAP36PB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASWZRAP11.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWZRAP11.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASWZRAP11.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWZRAP11.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASWZRAP11CC.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWZRAP11CC.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASWZRAP11CC.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWZRAP11CC.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASWZRAP11CF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWZRAP11CF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASWZRAP11CF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWZRAP11CF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASWZRAP36PB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWZRAP36PB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASWZRAP36PB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWZRAP36PB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASWZTOT13TEV81PB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWZTOT13TEV81PB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASWZTOT13TEV81PB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWZTOT13TEV81PB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASZHIGHMASS49FB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZHIGHMASS49FB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASZHIGHMASS49FB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZHIGHMASS49FB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASZPT7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZPT7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASZPT7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZPT7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASZPT8TEVMDIST.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZPT8TEVMDIST.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASZPT8TEVMDIST.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZPT8TEVMDIST.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASZPT8TEVYDIST.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZPT8TEVYDIST.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASZPT8TEVYDIST.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZPT8TEVYDIST.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASZRAP11CC.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZRAP11CC.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASZRAP11CC.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZRAP11CC.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASZRAP36PB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZRAP36PB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASZRAP36PB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZRAP36PB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_1JET_8TEV_R04.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_1JET_8TEV_R04.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_1JET_8TEV_R04.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_1JET_8TEV_R04.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_1JET_8TEV_R06.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_1JET_8TEV_R06.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_1JET_8TEV_R06.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_1JET_8TEV_R06.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_1JET_8TEV_R06_DEC.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_1JET_8TEV_R06_DEC.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_1JET_8TEV_R06_DEC.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_1JET_8TEV_R06_DEC.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_1JET_8TEV_R06_UNC.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_1JET_8TEV_R06_UNC.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_1JET_8TEV_R06_UNC.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_1JET_8TEV_R06_UNC.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_2JET_7TEV_R04.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_2JET_7TEV_R04.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_2JET_7TEV_R04.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_2JET_7TEV_R04.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_2JET_7TEV_R06.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_2JET_7TEV_R06.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_2JET_7TEV_R06.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_2JET_7TEV_R06.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_DY_2D_8TEV_LOWMASS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_DY_2D_8TEV_LOWMASS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_DY_2D_8TEV_LOWMASS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_DY_2D_8TEV_LOWMASS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTBARTOT_13TEV_FULLLUMI.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTBARTOT_13TEV_FULLLUMI.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTBARTOT_13TEV_FULLLUMI.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTBARTOT_13TEV_FULLLUMI.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_WCHARM_WM_DIFF_7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WCHARM_WM_DIFF_7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_WCHARM_WM_DIFF_7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WCHARM_WM_DIFF_7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_WCHARM_WP_DIFF_7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WCHARM_WP_DIFF_7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_WCHARM_WP_DIFF_7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WCHARM_WP_DIFF_7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_WMU_8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WMU_8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_WMU_8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WMU_8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_WM_JET_8TEV_PT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WM_JET_8TEV_PT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_WM_JET_8TEV_PT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WM_JET_8TEV_PT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_WM_JET_8TEV_PTJ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WM_JET_8TEV_PTJ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_WM_JET_8TEV_PTJ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WM_JET_8TEV_PTJ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_WP_JET_8TEV_PT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WP_JET_8TEV_PT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_WP_JET_8TEV_PT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WP_JET_8TEV_PT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_WP_JET_8TEV_PTJ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WP_JET_8TEV_PTJ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_WP_JET_8TEV_PTJ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WP_JET_8TEV_PTJ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_WZ_TOT_13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WZ_TOT_13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_WZ_TOT_13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WZ_TOT_13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_W_TOT_13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_W_TOT_13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_W_TOT_13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_W_TOT_13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_Z_TOT_13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_Z_TOT_13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_Z_TOT_13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_Z_TOT_13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_BCDMSD.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSD.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_BCDMSD.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSD.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_BCDMSD_dw.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSD_dw.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_BCDMSD_dw.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSD_dw.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_BCDMSD_dw_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSD_dw_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_BCDMSD_dw_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSD_dw_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_BCDMSD_sh.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSD_sh.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_BCDMSD_sh.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSD_sh.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_BCDMSD_sh_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSD_sh_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_BCDMSD_sh_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSD_sh_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_BCDMSP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_BCDMSP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_BCDMSP_dwsh.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSP_dwsh.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_BCDMSP_dwsh.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSP_dwsh.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CDFR2KT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CDFR2KT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CDFR2KT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CDFR2KT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CDFR2KT_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CDFR2KT_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CDFR2KT_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CDFR2KT_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CDFZRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CDFZRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CDFZRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CDFZRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CDFZRAP_NEW.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CDFZRAP_NEW.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CDFZRAP_NEW.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CDFZRAP_NEW.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNBPb.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNBPb.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNBPb.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNBPb.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNBPb_dw.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNBPb_dw.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNBPb_dw.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNBPb_dw.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNBPb_dw_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNBPb_dw_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNBPb_dw_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNBPb_dw_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNBPb_sh.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNBPb_sh.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNBPb_sh.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNBPb_sh.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNBPb_sh_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNBPb_sh_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNBPb_sh_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNBPb_sh_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNU.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNU.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNU.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNU.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNUPb.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNUPb.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNUPb.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNUPb.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNUPb_dw.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNUPb_dw.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNUPb_dw.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNUPb_dw.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNUPb_dw_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNUPb_dw_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNUPb_dw_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNUPb_dw_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNUPb_sh.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNUPb_sh.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNUPb_sh.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNUPb_sh.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNUPb_sh_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNUPb_sh_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNUPb_sh_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNUPb_sh_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS1JET276TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS1JET276TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS1JET276TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS1JET276TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS1JET276TEV_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS1JET276TEV_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS1JET276TEV_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS1JET276TEV_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSDY2D11.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSDY2D11.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSDY2D11.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSDY2D11.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSDY2D12.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSDY2D12.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSDY2D12.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSDY2D12.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSJETS11.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSJETS11.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSJETS11.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSJETS11.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSJETS11_NEW_SCALE.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSJETS11_NEW_SCALE.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSJETS11_NEW_SCALE.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSJETS11_NEW_SCALE.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSJETS11_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSJETS11_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSJETS11_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSJETS11_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSTOPDIFF8TEVTPTNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTOPDIFF8TEVTPTNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSTOPDIFF8TEVTPTNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTOPDIFF8TEVTPTNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSTOPDIFF8TEVTRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTOPDIFF8TEVTRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSTOPDIFF8TEVTRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTOPDIFF8TEVTRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSTOPDIFF8TEVTTMNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTOPDIFF8TEVTTMNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSTOPDIFF8TEVTTMNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTOPDIFF8TEVTTMNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSTOPDIFF8TEVTTRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTOPDIFF8TEVTTRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSTOPDIFF8TEVTTRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTOPDIFF8TEVTTRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT5TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT5TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT5TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT5TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSWCHARMRAT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSWCHARMRAT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSWCHARMRAT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSWCHARMRAT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSWCHARMTOT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSWCHARMTOT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSWCHARMTOT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSWCHARMTOT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSWEASY840PB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSWEASY840PB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSWEASY840PB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSWEASY840PB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSWMASY47FB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSWMASY47FB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSWMASY47FB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSWMASY47FB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSWMU8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSWMU8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSWMU8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSWMU8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSZDIFF12.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSZDIFF12.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSZDIFF12.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSZDIFF12.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_1JET_8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_1JET_8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_1JET_8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_1JET_8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_2JET_3D_8TEV.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_2JET_3D_8TEV.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_2JET_3D_8TEV.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_2JET_3D_8TEV.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_2JET_5TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_2JET_5TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_2JET_5TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_2JET_5TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_2JET_7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_2JET_7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_2JET_7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_2JET_7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_HMDY_13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_HMDY_13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_HMDY_13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_HMDY_13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_HMDY_DE_13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_HMDY_DE_13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_HMDY_DE_13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_HMDY_DE_13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_HMDY_DM_13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_HMDY_DM_13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_HMDY_DM_13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_HMDY_DM_13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_SINGLETOP_TCH_R_13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_SINGLETOP_TCH_R_13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_SINGLETOP_TCH_R_13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_SINGLETOP_TCH_R_13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_SINGLETOP_TCH_R_8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_SINGLETOP_TCH_R_8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_SINGLETOP_TCH_R_8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_SINGLETOP_TCH_R_8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_SINGLETOP_TCH_TOT_7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_SINGLETOP_TCH_TOT_7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_SINGLETOP_TCH_TOT_7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_SINGLETOP_TCH_TOT_7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_WCHARM_DIFF_UNNORM_13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_WCHARM_DIFF_UNNORM_13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_WCHARM_DIFF_UNNORM_13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_WCHARM_DIFF_UNNORM_13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_D0R2CON.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_D0R2CON.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_D0R2CON.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_D0R2CON.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_D0WEASY.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_D0WEASY.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_D0WEASY.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_D0WEASY.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_D0WMASY.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_D0WMASY.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_D0WMASY.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_D0WMASY.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_D0ZRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_D0ZRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_D0ZRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_D0ZRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_D0ZRAP_40.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_D0ZRAP_40.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_D0ZRAP_40.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_D0ZRAP_40.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_D0ZRAP_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_D0ZRAP_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_D0ZRAP_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_D0ZRAP_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE605.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE605.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE605.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE605.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE605_dw.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE605_dw.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE605_dw.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE605_dw.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE605_dw_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE605_dw_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE605_dw_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE605_dw_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE605_sh.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE605_sh.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE605_sh.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE605_sh.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE605_sh_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE605_sh_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE605_sh_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE605_sh_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE886P.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886P.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE886P.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886P.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE886R.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886R.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE886R.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886R.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE886R_dw.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886R_dw.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE886R_dw.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886R_dw.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE886R_dw_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886R_dw_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE886R_dw_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886R_dw_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE886R_sh.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886R_sh.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE886R_sh.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886R_sh.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE886R_sh_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886R_sh_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE886R_sh_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886R_sh_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE886_D.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886_D.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE886_D.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886_D.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN01.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN01.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN01.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN01.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN02.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN02.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN02.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN02.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN03.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN03.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN03.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN03.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN04.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN04.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN04.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN04.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN05.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN05.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN05.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN05.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN06.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN06.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN06.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN06.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN07.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN07.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN07.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN07.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN08.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN08.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN08.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN08.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN09.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN09.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN09.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN09.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN10.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN10.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN10.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN10.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_dw_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_dw_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_dw_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_dw_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_sh_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_sh_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_sh_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_sh_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906_D.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906_D.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906_D.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906_D.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_CC_EMP_140_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_CC_EMP_140_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_CC_EMP_140_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_CC_EMP_140_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_CC_EMP_140_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_CC_EMP_140_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_CC_EMP_140_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_CC_EMP_140_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_CC_EPP_140_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_CC_EPP_140_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_CC_EPP_140_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_CC_EPP_140_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_CC_EPP_140_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_CC_EPP_140_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_CC_EPP_140_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_CC_EPP_140_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_28_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_28_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_28_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_28_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_28_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_28_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_28_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_28_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_66_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_66_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_66_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_66_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_66_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_66_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_66_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_66_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_88_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_88_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_88_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_88_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_88_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_88_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_88_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_88_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_140_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_140_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_140_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_140_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_140_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_140_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_140_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_140_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_28_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_28_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_28_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_28_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_28_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_28_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_28_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_28_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_44_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_44_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_44_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_44_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_44_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_44_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_44_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_44_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_63_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_63_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_63_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_63_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_63_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_63_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_63_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_63_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_28_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_28_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_28_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_28_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_28_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_28_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_28_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_28_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_66_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_66_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_66_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_66_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_66_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_66_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_66_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_66_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_88_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_88_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_88_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_88_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_88_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_88_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_88_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_88_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_140_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_140_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_140_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_140_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_140_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_140_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_140_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_140_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_28_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_28_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_28_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_28_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_28_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_28_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_28_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_28_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_44_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_44_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_44_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_44_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_44_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_44_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_44_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_44_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_63_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_63_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_63_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_63_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_63_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_63_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_63_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_63_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EMCF2C.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2C.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EMCF2C.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2C.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EMCF2C_dw.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2C_dw.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EMCF2C_dw.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2C_dw.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EMCF2C_dw_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2C_dw_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EMCF2C_dw_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2C_dw_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EMCF2C_sh.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2C_sh.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EMCF2C_sh.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2C_sh.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EMCF2C_sh_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2C_sh_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EMCF2C_sh_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2C_sh_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EMCF2D.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2D.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EMCF2D.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2D.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EMCF2P.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2P.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EMCF2P.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2P.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EMCF2c1987.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2c1987.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EMCF2c1987.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2c1987.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_H1HERAF2B.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_H1HERAF2B.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_H1HERAF2B.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_H1HERAF2B.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_HERACOMBCCEM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBCCEM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_HERACOMBCCEM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBCCEM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_HERACOMBCCEP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBCCEP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_HERACOMBCCEP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBCCEP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_HERACOMBNCEM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBNCEM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_HERACOMBNCEM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBNCEM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_HERACOMBNCEP460.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBNCEP460.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_HERACOMBNCEP460.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBNCEP460.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_HERACOMBNCEP575.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBNCEP575.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_HERACOMBNCEP575.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBNCEP575.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_HERACOMBNCEP820.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBNCEP820.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_HERACOMBNCEP820.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBNCEP820.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_HERACOMBNCEP920.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBNCEP920.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_HERACOMBNCEP920.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBNCEP920.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_HERACOMB_SIGMARED_B.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMB_SIGMARED_B.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_HERACOMB_SIGMARED_B.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMB_SIGMARED_B.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_HERACOMB_SIGMARED_C.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMB_SIGMARED_C.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_HERACOMB_SIGMARED_C.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMB_SIGMARED_C.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_HERAF2CHARM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_HERAF2CHARM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_HERAF2CHARM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_HERAF2CHARM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_INTEGXT3.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXT3.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_INTEGXT3.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXT3.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_INTEGXT3_543.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXT3_543.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_INTEGXT3_543.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXT3_543.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_INTEGXT8.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXT8.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_INTEGXT8.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXT8.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_INTEGXV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_INTEGXV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_INTEGXV3.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV3.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_INTEGXV3.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV3.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_INTEGXV3_543.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV3_543.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_INTEGXV3_543.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV3_543.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_INTEGXV8.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV8.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_INTEGXV8.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV8.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_INTEGXV8_543.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV8_543.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_INTEGXV8_543.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV8_543.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_INTEGXV_543.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV_543.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_INTEGXV_543.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV_543.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBW36PB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBW36PB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBW36PB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBW36PB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBW36PB_40.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBW36PB_40.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBW36PB_40.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBW36PB_40.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBWMU7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBWMU7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBWMU7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBWMU7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBWMU8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBWMU8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBWMU8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBWMU8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBWZMU7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBWZMU7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBWZMU7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBWZMU7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBWZMU8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBWZMU8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBWZMU8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBWZMU8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBZ940PB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBZ940PB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBZ940PB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBZ940PB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBZEE2FB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBZEE2FB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBZEE2FB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBZEE2FB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBZEE2FB_40.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBZEE2FB_40.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBZEE2FB_40.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBZEE2FB_40.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBZMU7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBZMU7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBZMU7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBZMU7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBZMU8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBZMU8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBZMU8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBZMU8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCB_WENU_8TEV_A.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCB_WENU_8TEV_A.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCB_WENU_8TEV_A.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCB_WENU_8TEV_A.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCB_WENU_8TEV_R.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCB_WENU_8TEV_R.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCB_WENU_8TEV_R.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCB_WENU_8TEV_R.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCB_Z_13TEV_DIELECTRON.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCB_Z_13TEV_DIELECTRON.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCB_Z_13TEV_DIELECTRON.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCB_Z_13TEV_DIELECTRON.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCB_Z_13TEV_DIMUON.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCB_Z_13TEV_DIMUON.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCB_Z_13TEV_DIMUON.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCB_Z_13TEV_DIMUON.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NMC.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NMC.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NMC.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NMC.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NMCPD.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NMCPD.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NMCPD_D.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD_D.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NMCPD_D.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD_D.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NMCPD_dw.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD_dw.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NMCPD_dw.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD_dw.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NMCPD_dw_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD_dw_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NMCPD_dw_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD_dw_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NMCPD_sh.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD_sh.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NMCPD_sh.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD_sh.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NMCPD_sh_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD_sh_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NMCPD_sh_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD_sh_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNBDMN.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMN.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNBDMN.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMN.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNBDMNFe.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMNFe.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNBDMNFe.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMNFe.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNBDMNFe_dw.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMNFe_dw.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNBDMNFe_dw.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMNFe_dw.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNBDMNFe_dw_ite.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMNFe_dw_ite.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNBDMNFe_dw_ite.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMNFe_dw_ite.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNBDMNFe_sh.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMNFe_sh.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNBDMNFe_sh.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMNFe_sh.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNBDMNFe_sh_ite.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMNFe_sh_ite.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNBDMNFe_sh_ite.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMNFe_sh_ite.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNUDMN.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMN.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNUDMN.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMN.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNUDMNFe.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMNFe.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNUDMNFe.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMNFe.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNUDMNFe_dw.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMNFe_dw.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNUDMNFe_dw.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMNFe_dw.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNUDMNFe_dw_ite.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMNFe_dw_ite.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNUDMNFe_dw_ite.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMNFe_dw_ite.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNUDMNFe_sh.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMNFe_sh.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNUDMNFe_sh.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMNFe_sh.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNUDMNFe_sh_ite.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMNFe_sh_ite.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNUDMNFe_sh_ite.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMNFe_sh_ite.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYC.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYC.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYC.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYC.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYCBD.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCBD.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYCBD.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCBD.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYCBDB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCBDB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYCBDB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCBDB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYCBS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCBS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYCBS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCBS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYCBSB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCBSB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYCBSB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCBSB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYCD.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCD.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYCD.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCD.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYCDB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCDB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYCDB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCDB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYCS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYCS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYCSB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCSB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYCSB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCSB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYD.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYD.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYD.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYD.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYU.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYU.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYU.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYU.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYUBD.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUBD.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYUBD.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUBD.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYUBDB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUBDB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYUBDB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUBDB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYUBS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUBS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYUBS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUBS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYUBSB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUBSB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYUBSB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUBSB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYUD.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUD.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYUD.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUD.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYUDB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUDB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYUDB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUDB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYUS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYUS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYUSB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUSB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYUSB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUSB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSF2C.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSF2C.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSF2C_17PTS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C_17PTS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSF2C_17PTS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C_17PTS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSF2C_CCE.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C_CCE.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSF2C_CCE.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C_CCE.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSF2C_CCE_17PTS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C_CCE_17PTS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSF2C_CCE_17PTS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C_CCE_17PTS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSF2C_CCP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C_CCP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSF2C_CCP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C_CCP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSF2C_CCP_17PTS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C_CCP_17PTS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSF2C_CCP_17PTS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C_CCP_17PTS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSF2DW.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2DW.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSF2DW.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2DW.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSF2S.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2S.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSF2S.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2S.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSF2U.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2U.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSF2U.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2U.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSFLL.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSFLL.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSFLL.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSFLL.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSFLL_19PTS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSFLL_19PTS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSFLL_19PTS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSFLL_19PTS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSXCQ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXCQ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSXCQ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXCQ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSXDB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXDB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSXDB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXDB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSXDQ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXDQ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSXDQ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXDQ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSXGL.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXGL.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSXGL.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXGL.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSXSB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXSB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSXSB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXSB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSXSQ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXSQ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSXSQ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXSQ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSXUB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXUB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSXUB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXUB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSXUQ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXUQ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSXUQ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXUQ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_SLACD.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACD.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_SLACD.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACD.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_SLACD_dw.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACD_dw.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_SLACD_dw.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACD_dw.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_SLACD_dw_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACD_dw_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_SLACD_dw_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACD_dw_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_SLACD_sh.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACD_sh.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_SLACD_sh.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACD_sh.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_SLACD_sh_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACD_sh_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_SLACD_sh_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACD_sh_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_SLACP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_SLACP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_SLACP_dwsh.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACP_dwsh.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_SLACP_dwsh.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACP_dwsh.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_WEASY.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_WEASY.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_WEASY.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_WEASY.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_WMASY.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_WMASY.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_WMASY.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_WMASY.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ZEUSHERAF2B.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ZEUSHERAF2B.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ZEUSHERAF2B.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ZEUSHERAF2B.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ZEUSHERAF2B_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ZEUSHERAF2B_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ZEUSHERAF2B_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ZEUSHERAF2B_SF.yaml diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_20.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_20.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_20.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_20.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_CORR_DECORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_CORR_DECORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_CORR_DECORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_CORR_DECORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_CORR_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_CORR_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_CORR_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_CORR_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_DECORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_DECORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_DECORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_DECORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_SF_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_SF_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_SF_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_SF_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASDY2D8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASDY2D8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASDY2D8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASDY2D8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASLOMASSDY11EXT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASLOMASSDY11EXT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASLOMASSDY11EXT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASLOMASSDY11EXT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASPHT12_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASPHT12_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASPHT12_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASPHT12_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASPHT12_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASPHT12_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASPHT12_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASPHT12_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASPHT15_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASPHT15_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASPHT15_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASPHT15_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASPHT15_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASPHT15_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASPHT15_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASPHT15_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_SF_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_SF_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_SF_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_SF_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_SF_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_SF_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_SF_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_SF_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR06JETS36PB_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR06JETS36PB_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR06JETS36PB_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR06JETS36PB_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTPTNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTPTNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTPTNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTPTNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTPTNORM_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTPTNORM_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTPTNORM_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTPTNORM_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTRAPNORM_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTRAPNORM_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTRAPNORM_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTRAPNORM_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTMNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTMNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTMNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTMNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTMNORM_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTMNORM_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTMNORM_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTMNORM_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTRAPNORM_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTRAPNORM_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTRAPNORM_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTRAPNORM_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTTBARTOT13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTTBARTOT13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTTBARTOT13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTTBARTOT13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTTBARTOT7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTTBARTOT7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTTBARTOT7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTTBARTOT7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTTBARTOT8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTTBARTOT8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTTBARTOT8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTTBARTOT8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTTBARTOT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTTBARTOT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTTBARTOT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTTBARTOT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWPT31PB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWPT31PB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWPT31PB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWPT31PB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWRAP11CC_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWRAP11CC_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWRAP11CC_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWRAP11CC_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWRAP36PB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWRAP36PB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWRAP36PB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWRAP36PB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP11CC_DEC.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP11CC_DEC.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP11CC_DEC.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP11CC_DEC.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP11CC_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP11CC_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP11CC_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP11CC_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP11CF_DEC.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP11CF_DEC.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP11CF_DEC.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP11CF_DEC.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP11CF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP11CF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP11CF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP11CF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP11_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP11_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP11_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP11_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP36PB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP36PB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP36PB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP36PB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZTOT13TEV81PB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZTOT13TEV81PB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZTOT13TEV81PB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZTOT13TEV81PB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZHIGHMASS49FB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZHIGHMASS49FB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZHIGHMASS49FB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZHIGHMASS49FB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT7TEV_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT7TEV_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT7TEV_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT7TEV_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT8TEVMDIST_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT8TEVMDIST_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT8TEVMDIST_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT8TEVMDIST_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT8TEVMDIST_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT8TEVMDIST_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT8TEVMDIST_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT8TEVMDIST_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT8TEVYDIST_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT8TEVYDIST_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT8TEVYDIST_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT8TEVYDIST_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT8TEVYDIST_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT8TEVYDIST_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT8TEVYDIST_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT8TEVYDIST_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZRAP11CC_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZRAP11CC_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZRAP11CC_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZRAP11CC_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZRAP36PB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZRAP36PB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZRAP36PB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZRAP36PB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R04_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R04_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R04_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R04_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEC_ATLAS.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEC_ATLAS.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEC_ATLAS.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEC_ATLAS.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEC_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEC_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEC_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEC_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_UNC_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_UNC_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_UNC_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_UNC_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_STRONG.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_STRONG.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_STRONG.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_STRONG.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_WEAK.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_WEAK.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_WEAK.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_WEAK.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_STRONG.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_STRONG.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_STRONG.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_STRONG.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_WEAK.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_WEAK.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_WEAK.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_WEAK.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_DY_2D_8TEV_LOWMASS_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_DY_2D_8TEV_LOWMASS_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_DY_2D_8TEV_LOWMASS_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_DY_2D_8TEV_LOWMASS_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTBARTOT_13TEV_FULLLUMI_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTBARTOT_13TEV_FULLLUMI_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTBARTOT_13TEV_FULLLUMI_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTBARTOT_13TEV_FULLLUMI_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_CORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_CORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_CORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_CORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_PSUNCORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_PSUNCORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_PSUNCORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_PSUNCORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_CORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_CORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_CORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_CORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_PSUNCORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_PSUNCORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_PSUNCORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_PSUNCORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_ATLAS.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_ATLAS.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_ATLAS.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_ATLAS.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_CORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_CORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_CORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_CORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_PSUNCORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_PSUNCORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_PSUNCORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_PSUNCORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_CORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_CORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_CORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_CORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_PSUNCORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_PSUNCORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_PSUNCORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_PSUNCORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_CORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_CORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_CORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_CORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_PSUNCORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_PSUNCORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_PSUNCORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_PSUNCORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_CORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_CORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_CORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_CORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_PSUNCORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_PSUNCORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_PSUNCORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_PSUNCORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_ATLAS.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_ATLAS.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_ATLAS.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_ATLAS.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_CORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_CORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_CORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_CORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_PSUNCORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_PSUNCORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_PSUNCORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_PSUNCORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_CORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_CORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_CORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_CORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_PSUNCORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_PSUNCORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_PSUNCORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_PSUNCORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WM_DIFF_7TEV_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WM_DIFF_7TEV_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WM_DIFF_7TEV_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WM_DIFF_7TEV_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WM_DIFF_7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WM_DIFF_7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WM_DIFF_7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WM_DIFF_7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WP_DIFF_7TEV_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WP_DIFF_7TEV_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WP_DIFF_7TEV_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WP_DIFF_7TEV_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WP_DIFF_7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WP_DIFF_7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WP_DIFF_7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WP_DIFF_7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WMU_8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WMU_8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WMU_8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WMU_8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PTJ_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PTJ_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PTJ_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PTJ_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PTJ_NP.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PTJ_NP.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PTJ_NP.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PTJ_NP.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_ATLAS.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_ATLAS.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_ATLAS.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_ATLAS.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_NP.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_NP.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_NP.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_NP.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PTJ_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PTJ_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PTJ_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PTJ_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PTJ_NP.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PTJ_NP.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PTJ_NP.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PTJ_NP.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_ATLAS.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_ATLAS.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_ATLAS.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_ATLAS.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_NP.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_NP.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_NP.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_NP.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WZ_TOT_13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WZ_TOT_13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WZ_TOT_13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WZ_TOT_13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_W_TOT_13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_W_TOT_13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_W_TOT_13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_W_TOT_13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_Z_TOT_13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_Z_TOT_13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_Z_TOT_13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_Z_TOT_13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSD_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSD_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSD_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSD_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSD_dw_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSD_dw_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSD_dw_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSD_dw_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSD_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSD_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSD_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSD_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSD_sh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSD_sh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSD_sh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSD_sh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSD_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSD_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSD_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSD_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSP_dwsh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSP_dwsh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSP_dwsh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSP_dwsh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFR2KT_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFR2KT_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFR2KT_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFR2KT_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFR2KT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFR2KT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFR2KT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFR2KT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFR2KT_SF_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFR2KT_SF_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFR2KT_SF_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFR2KT_SF_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFR2KT_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFR2KT_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFR2KT_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFR2KT_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFZRAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFZRAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFZRAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFZRAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFZRAP_NEW_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFZRAP_NEW_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFZRAP_NEW_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFZRAP_NEW_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNBPb_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNBPb_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNBPb_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNBPb_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNBPb_dw_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNBPb_dw_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNBPb_dw_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNBPb_dw_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNBPb_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNBPb_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNBPb_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNBPb_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNBPb_sh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNBPb_sh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNBPb_sh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNBPb_sh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNBPb_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNBPb_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNBPb_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNBPb_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNUPb_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNUPb_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNUPb_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNUPb_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNUPb_dw_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNUPb_dw_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNUPb_dw_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNUPb_dw_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNUPb_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNUPb_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNUPb_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNUPb_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNUPb_sh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNUPb_sh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNUPb_sh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNUPb_sh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNUPb_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNUPb_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNUPb_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNUPb_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNU_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNU_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNU_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNU_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_10_NNPDF31.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_10_NNPDF31.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_10_NNPDF31.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_10_NNPDF31.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_NNPDF31.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_NNPDF31.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_NNPDF31.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_NNPDF31.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_SF_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_SF_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_SF_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_SF_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSDY2D11_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSDY2D11_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSDY2D11_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSDY2D11_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSDY2D11_NNPDF31.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSDY2D11_NNPDF31.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSDY2D11_NNPDF31.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSDY2D11_NNPDF31.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSDY2D12_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSDY2D12_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSDY2D12_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSDY2D12_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_20.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_20.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_20.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_20.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_NEW_SCALE_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_NEW_SCALE_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_NEW_SCALE_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_NEW_SCALE_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_SF_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_SF_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_SF_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_SF_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTPTNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTPTNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTPTNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTPTNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTMNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTMNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTMNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTMNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTRAPNORM_NNPDF31.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTRAPNORM_NNPDF31.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTRAPNORM_NNPDF31.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTRAPNORM_NNPDF31.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT5TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT5TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT5TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT5TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWCHARMRAT_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWCHARMRAT_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWCHARMRAT_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWCHARMRAT_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWCHARMRAT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWCHARMRAT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWCHARMRAT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWCHARMRAT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWCHARMTOT_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWCHARMTOT_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWCHARMTOT_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWCHARMTOT_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWCHARMTOT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWCHARMTOT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWCHARMTOT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWCHARMTOT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWEASY840PB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWEASY840PB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWEASY840PB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWEASY840PB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWMASY47FB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWMASY47FB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWMASY47FB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWMASY47FB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWMU8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWMU8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWMU8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWMU8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWMU8TEV_NNPDF31.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWMU8TEV_NNPDF31.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWMU8TEV_NNPDF31.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWMU8TEV_NNPDF31.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSZDIFF12_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSZDIFF12_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSZDIFF12_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSZDIFF12_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSZDIFF12_10_NNPDF31.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSZDIFF12_10_NNPDF31.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSZDIFF12_10_NNPDF31.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSZDIFF12_10_NNPDF31.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSZDIFF12_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSZDIFF12_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSZDIFF12_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSZDIFF12_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSZDIFF12_NNPDF31.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSZDIFF12_NNPDF31.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSZDIFF12_NNPDF31.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSZDIFF12_NNPDF31.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_1JET_8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_1JET_8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_1JET_8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_1JET_8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_1JET_8TEV_NP.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_1JET_8TEV_NP.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_1JET_8TEV_NP.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_1JET_8TEV_NP.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_2JET_3D_8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_2JET_3D_8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_2JET_3D_8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_2JET_3D_8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_2JET_3D_8TEV_NP.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_2JET_3D_8TEV_NP.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_2JET_3D_8TEV_NP.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_2JET_3D_8TEV_NP.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_2JET_5TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_2JET_5TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_2JET_5TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_2JET_5TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_2JET_7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_2JET_7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_2JET_7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_2JET_7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_2JET_7TEV_NP.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_2JET_7TEV_NP.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_2JET_7TEV_NP.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_2JET_7TEV_NP.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_HMDY_13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_HMDY_13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_HMDY_13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_HMDY_13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_HMDY_DE_13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_HMDY_DE_13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_HMDY_DE_13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_HMDY_DE_13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_HMDY_DM_13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_HMDY_DM_13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_HMDY_DM_13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_HMDY_DM_13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_R_13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_R_13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_R_13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_R_13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_R_8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_R_8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_R_8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_R_8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_TOT_7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_TOT_7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_TOT_7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_TOT_7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TRAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TRAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TRAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TRAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_WCHARM_DIFF_UNNORM_13TEV_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_WCHARM_DIFF_UNNORM_13TEV_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_WCHARM_DIFF_UNNORM_13TEV_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_WCHARM_DIFF_UNNORM_13TEV_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_WCHARM_DIFF_UNNORM_13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_WCHARM_DIFF_UNNORM_13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_WCHARM_DIFF_UNNORM_13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_WCHARM_DIFF_UNNORM_13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_D0R2CON_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0R2CON_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_D0R2CON_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0R2CON_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_D0WEASY_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0WEASY_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_D0WEASY_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0WEASY_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_D0WMASY_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0WMASY_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_D0WMASY_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0WMASY_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_D0ZRAP_40_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0ZRAP_40_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_D0ZRAP_40_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0ZRAP_40_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_D0ZRAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0ZRAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_D0ZRAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0ZRAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_D0ZRAP_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0ZRAP_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_D0ZRAP_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0ZRAP_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_dw_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_dw_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_dw_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_dw_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_dw_UNCORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_dw_UNCORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_dw_UNCORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_dw_UNCORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_sh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_sh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_sh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_sh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886P_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886P_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886P_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886P_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886R_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886R_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886R_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886R_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886R_dw_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886R_dw_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886R_dw_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886R_dw_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886R_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886R_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886R_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886R_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886R_sh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886R_sh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886R_sh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886R_sh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886R_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886R_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886R_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886R_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886_D_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886_D_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886_D_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886_D_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN01_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN01_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN01_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN01_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN02_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN02_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN02_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN02_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN03_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN03_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN03_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN03_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN04_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN04_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN04_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN04_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN05_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN05_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN05_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN05_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN06_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN06_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN06_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN06_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN07_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN07_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN07_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN07_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN08_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN08_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN08_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN08_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN09_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN09_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN09_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN09_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN10_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN10_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN10_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN10_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906_D_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906_D_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906_D_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906_D_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_CC_EMP_140_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_CC_EMP_140_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_CC_EMP_140_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_CC_EMP_140_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_CC_EMP_140_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_CC_EMP_140_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_CC_EMP_140_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_CC_EMP_140_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_CC_EPP_140_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_CC_EPP_140_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_CC_EPP_140_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_CC_EPP_140_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_CC_EPP_140_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_CC_EPP_140_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_CC_EPP_140_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_CC_EPP_140_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_28_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_28_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_28_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_28_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_28_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_28_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_28_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_28_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_66_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_66_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_66_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_66_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_66_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_66_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_66_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_66_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_88_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_88_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_88_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_88_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_88_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_88_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_88_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_88_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_140_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_140_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_140_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_140_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_140_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_140_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_140_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_140_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_28_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_28_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_28_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_28_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_28_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_28_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_28_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_28_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_44_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_44_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_44_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_44_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_44_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_44_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_44_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_44_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_63_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_63_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_63_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_63_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_63_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_63_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_63_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_63_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_28_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_28_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_28_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_28_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_28_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_28_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_28_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_28_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_66_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_66_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_66_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_66_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_66_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_66_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_66_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_66_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_88_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_88_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_88_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_88_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_88_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_88_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_88_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_88_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_140_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_140_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_140_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_140_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_140_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_140_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_140_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_140_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_28_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_28_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_28_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_28_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_28_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_28_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_28_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_28_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_44_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_44_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_44_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_44_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_44_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_44_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_44_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_44_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_63_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_63_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_63_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_63_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_63_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_63_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_63_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_63_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2C_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2C_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2C_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2C_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2C_dw_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2C_dw_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2C_dw_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2C_dw_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2C_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2C_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2C_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2C_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2C_sh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2C_sh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2C_sh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2C_sh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2C_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2C_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2C_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2C_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2D_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2D_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2D_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2D_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2P_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2P_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2P_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2P_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2c1987_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2c1987_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2c1987_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2c1987_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_H1HERAF2B_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_H1HERAF2B_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_H1HERAF2B_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_H1HERAF2B_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBCCEM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBCCEM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBCCEM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBCCEM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBCCEP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBCCEP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBCCEP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBCCEP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBNCEM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBNCEM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBNCEM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBNCEM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBNCEP460_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBNCEP460_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBNCEP460_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBNCEP460_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBNCEP575_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBNCEP575_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBNCEP575_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBNCEP575_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBNCEP820_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBNCEP820_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBNCEP820_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBNCEP820_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBNCEP920_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBNCEP920_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBNCEP920_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBNCEP920_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMB_SIGMARED_B_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMB_SIGMARED_B_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMB_SIGMARED_B_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMB_SIGMARED_B_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMB_SIGMARED_C_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMB_SIGMARED_C_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMB_SIGMARED_C_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMB_SIGMARED_C_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_HERAF2CHARM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERAF2CHARM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_HERAF2CHARM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERAF2CHARM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXT3_543_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXT3_543_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXT3_543_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXT3_543_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXT3_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXT3_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXT3_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXT3_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXT8_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXT8_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXT8_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXT8_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV3_543_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV3_543_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV3_543_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV3_543_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV3_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV3_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV3_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV3_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV8_543_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV8_543_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV8_543_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV8_543_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV8_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV8_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV8_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV8_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV_543_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV_543_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV_543_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV_543_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBW36PB_40_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBW36PB_40_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBW36PB_40_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBW36PB_40_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBW36PB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBW36PB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBW36PB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBW36PB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBWMU7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBWMU7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBWMU7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBWMU7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBWMU8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBWMU8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBWMU8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBWMU8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBWZMU7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBWZMU7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBWZMU7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBWZMU7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBWZMU8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBWZMU8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBWZMU8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBWZMU8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBZ940PB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBZ940PB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBZ940PB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBZ940PB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBZEE2FB_40_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBZEE2FB_40_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBZEE2FB_40_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBZEE2FB_40_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBZEE2FB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBZEE2FB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBZEE2FB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBZEE2FB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBZMU7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBZMU7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBZMU7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBZMU7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBZMU8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBZMU8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBZMU8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBZMU8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCB_WENU_8TEV_A_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCB_WENU_8TEV_A_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCB_WENU_8TEV_A_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCB_WENU_8TEV_A_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCB_WENU_8TEV_R_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCB_WENU_8TEV_R_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCB_WENU_8TEV_R_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCB_WENU_8TEV_R_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCB_Z_13TEV_DIELECTRON_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCB_Z_13TEV_DIELECTRON_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCB_Z_13TEV_DIELECTRON_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCB_Z_13TEV_DIELECTRON_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCB_Z_13TEV_DIMUON_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCB_Z_13TEV_DIMUON_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCB_Z_13TEV_DIMUON_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCB_Z_13TEV_DIMUON_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_D_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_D_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_D_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_D_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_dw_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_dw_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_dw_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_dw_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_sh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_sh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_sh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_sh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NMC_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMC_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NMC_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMC_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMNFe_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMNFe_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMNFe_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMNFe_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMNFe_dw_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMNFe_dw_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMNFe_dw_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMNFe_dw_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMNFe_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMNFe_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMNFe_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMNFe_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMNFe_sh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMNFe_sh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMNFe_sh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMNFe_sh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMNFe_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMNFe_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMNFe_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMNFe_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMN_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMN_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMN_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMN_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMNFe_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMNFe_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMNFe_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMNFe_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMNFe_dw_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMNFe_dw_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMNFe_dw_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMNFe_dw_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMNFe_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMNFe_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMNFe_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMNFe_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMNFe_sh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMNFe_sh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMNFe_sh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMNFe_sh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMNFe_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMNFe_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMNFe_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMNFe_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMN_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMN_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMN_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMN_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCBDB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCBDB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCBDB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCBDB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCBD_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCBD_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCBD_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCBD_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCBSB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCBSB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCBSB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCBSB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCBS_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCBS_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCBS_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCBS_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCDB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCDB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCDB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCDB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCD_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCD_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCD_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCD_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCSB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCSB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCSB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCSB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCS_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCS_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCS_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCS_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYC_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYC_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYC_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYC_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYD_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYD_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYD_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYD_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYS_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYS_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYS_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYS_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUBDB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUBDB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUBDB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUBDB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUBD_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUBD_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUBD_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUBD_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUBSB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUBSB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUBSB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUBSB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUBS_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUBS_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUBS_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUBS_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUDB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUDB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUDB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUDB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUD_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUD_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUD_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUD_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUSB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUSB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUSB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUSB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUS_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUS_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUS_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUS_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYU_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYU_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYU_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYU_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_17PTS_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_17PTS_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_17PTS_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_17PTS_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_CCE_17PTS_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_CCE_17PTS_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_CCE_17PTS_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_CCE_17PTS_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_CCE_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_CCE_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_CCE_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_CCE_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_CCP_17PTS_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_CCP_17PTS_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_CCP_17PTS_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_CCP_17PTS_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_CCP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_CCP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_CCP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_CCP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2DW_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2DW_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2DW_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2DW_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2S_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2S_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2S_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2S_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2U_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2U_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2U_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2U_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSFLL_19PTS_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSFLL_19PTS_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSFLL_19PTS_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSFLL_19PTS_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSFLL_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSFLL_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSFLL_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSFLL_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXCQ_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXCQ_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXCQ_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXCQ_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXDB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXDB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXDB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXDB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXDQ_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXDQ_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXDQ_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXDQ_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXGL_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXGL_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXGL_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXGL_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXSB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXSB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXSB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXSB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXSQ_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXSQ_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXSQ_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXSQ_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXUB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXUB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXUB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXUB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXUQ_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXUQ_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXUQ_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXUQ_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACD_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACD_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACD_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACD_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACD_dw_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACD_dw_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACD_dw_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACD_dw_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACD_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACD_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACD_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACD_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACD_sh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACD_sh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACD_sh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACD_sh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACD_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACD_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACD_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACD_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACP_dwsh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACP_dwsh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACP_dwsh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACP_dwsh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ZEUSHERAF2B_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ZEUSHERAF2B_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ZEUSHERAF2B_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ZEUSHERAF2B_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ZEUSHERAF2B_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ZEUSHERAF2B_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ZEUSHERAF2B_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ZEUSHERAF2B_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/disp_theory.py b/validphys2/src/validphys/datafiles/disp_theory.py similarity index 100% rename from nnpdfcpp/data/disp_theory.py rename to validphys2/src/validphys/datafiles/disp_theory.py diff --git a/nnpdfcpp/data/theory.db b/validphys2/src/validphys/datafiles/theory.db similarity index 100% rename from nnpdfcpp/data/theory.db rename to validphys2/src/validphys/datafiles/theory.db diff --git a/validphys2/src/validphys/loader.py b/validphys2/src/validphys/loader.py index 5f330fc845..bc8ccd155e 100644 --- a/validphys2/src/validphys/loader.py +++ b/validphys2/src/validphys/loader.py @@ -1,9 +1,5 @@ # -*- coding: utf-8 -*- """ -Created on Wed Mar 9 15:40:38 2016 - -@author: Zahari Kassabov - Resolve paths to useful objects, and query the existence of different resources within the specified paths. """ @@ -14,6 +10,7 @@ import os import os.path as osp import pathlib +import pkgutil import re import shutil import sys @@ -42,11 +39,11 @@ TheoryIDSpec, peek_commondata_metadata, ) +from validphys.datafiles import path_vpdata from validphys.utils import tempfile_cleaner -DEFAULT_NNPDF_PROFILE_PATH = f"{sys.prefix}/share/NNPDF/nnprofile.yaml" - log = logging.getLogger(__name__) +NNPDF_DIR = "NNPDF" class LoaderError(Exception): @@ -115,32 +112,80 @@ class InconsistentMetaDataError(LoaderError): def _get_nnpdf_profile(profile_path=None): """Returns the NNPDF profile as a dictionary + If no ``profile_path`` is provided it will be autodiscovered in the following order: - Environment variable $NNPDF_PROFILE_PATH - {sys.prefix}/share/NNPDF/nnprofile.yaml - {sys.base_prefix}/share/NNPDF/nnprofile.yaml + 1. Environment variable $NNPDF_PROFILE_PATH + 2. ${XDG_CONFIG_HOME}/NNPDF/nnprofile.yaml (usually ~/.config/nnprofile) + + Any value not filled by 1 or 2 will then be filled by the default values + found within the validphys python package `nnporfile_default.yaml` + + If ``nnpdf_share`` is set to the special key ``RELATIVE_TO_PYTHON`` + the python prefix (``Path(sys.prefix)/"share"/"NNPDF"``) will be used - If no profile is found a LoaderError will be thrown """ - profile_path = os.environ.get("NNPDF_PROFILE_PATH", profile_path) + yaml_reader = yaml.YAML(typ='safe', pure=True) + + home_config = pathlib.Path().home() / ".config" + config_folder = pathlib.Path(os.environ.get("XDG_CONFIG_HOME", home_config)) / NNPDF_DIR + + # Set all default values + profile_content = pkgutil.get_data("validphys", "nnprofile_default.yaml") + profile_dict = yaml_reader.load(profile_content) + # including the data_path to the validphys package + profile_dict.setdefault("data_path", path_vpdata) + + # Look at profile path if profile_path is None: - # Check both sys paths - prefix_paths = [sys.prefix, sys.base_prefix] - for prefix in prefix_paths: - check = pathlib.Path(prefix) / "share/NNPDF/nnprofile.yaml" - if check.is_file(): - profile_path = check - break + profile_path = os.environ.get("NNPDF_PROFILE_PATH", profile_path) + + # If profile_path is still none and there is a .config/NNPDF/nnprofile.yaml, read that if profile_path is None: - raise LoaderError("Missing an NNPDF profile file") + if (config_nnprofile := config_folder / "nnprofile.yaml").exists(): + profile_path = config_nnprofile + elif (config_nnprofile := config_folder / "nnprofile.yml").exists(): + profile_path = config_nnprofile + + if profile_path is not None: + with open(profile_path, "r", encoding="utf-8") as f: + profile_entries = yaml_reader.load(f) + if profile_entries is not None: + profile_dict.update(profile_entries) + + nnpdf_share = profile_dict.get("nnpdf_share") + if nnpdf_share is None: + if profile_path is not None: + raise ValueError( + f"`nnpdf_share` is not set in {profile_path}, please set it, e.g.: nnpdf_share: `.local/share/NNPDF`" + ) + raise ValueError( + "`nnpdf_share` not found in validphys, something is very wrong with the installation" + ) - mpath = pathlib.Path(profile_path) + if nnpdf_share == "RELATIVE_TO_PYTHON": + nnpdf_share = pathlib.Path(sys.prefix) / "share" / NNPDF_DIR + + # At this point nnpdf_share needs to be a path to somewhere + nnpdf_share = pathlib.Path(nnpdf_share) + + # Make sure that we expand any ~ or ~ + nnpdf_share = nnpdf_share.expanduser() + + # Make sure we can either write to this directory or it exists try: - with mpath.open() as f: - profile_dict = yaml.safe_load(f) - except (OSError, yaml.YAMLError) as e: - raise LoaderError(f"Could not parse profile file {mpath}: {e}") from e + nnpdf_share.mkdir(exist_ok=True, parents=True) + except PermissionError as e: + raise FileNotFoundError( + f"{nnpdf_share} does not exist and you haven't got permissions to create it!" + ) from e + + # Now read all paths and define them as relative to nnpdf_share (unless given as absolute) + for var in ["results_path", "theories_path", "validphys_cache_path", "hyperscan_path"]: + # if there are any problems setting or getting these variable erroring out is more than justified + absolute_var = nnpdf_share / pathlib.Path(profile_dict[var]).expanduser() + profile_dict[var] = absolute_var.absolute().as_posix() + return profile_dict @@ -158,17 +203,19 @@ def __init__(self, profile=None): # Retrieve important paths from the profile if not given datapath = pathlib.Path(profile["data_path"]) + theories_path = pathlib.Path(profile["theories_path"]) resultspath = pathlib.Path(profile["results_path"]) - # Check whether they exist if not datapath.exists(): raise LoaderError(f"The data path {datapath} does not exist.") - if not resultspath.exists(): - raise LoaderError(f"The results path {resultspath} does not exist.") + # Create the theories and results paths if they don't exist already + theories_path.mkdir(exist_ok=True, parents=True) + resultspath.mkdir(exist_ok=True, parents=True) # And save them up self.datapath = datapath + self._theories_path = theories_path self.resultspath = resultspath self._old_commondata_fits = set() self.nnprofile = profile @@ -176,8 +223,7 @@ def __init__(self, profile=None): @property def hyperscan_resultpath(self): hyperscan_path = pathlib.Path(self.nnprofile["hyperscan_path"]) - if not hyperscan_path.exists(): - raise LoaderError(f"The hyperscan results path {hyperscan_path} does not exist") + hyperscan_path.mkdir(parents=True, exist_ok=True) return hyperscan_path def _vp_cache(self): @@ -274,7 +320,8 @@ def available_theories(self): """Return a string token for each of the available theories""" theory_token = 'theory_' return { - folder.name[len(theory_token) :] for folder in self.datapath.glob(theory_token + '*') + folder.name[len(theory_token) :] + for folder in self._theories_path.glob(theory_token + '*') } @property @@ -374,12 +421,12 @@ def check_commondata(self, setname, sysnum=None, use_fitcommondata=False, fit=No @functools.lru_cache() def check_theoryID(self, theoryID): theoryID = str(theoryID) - theopath = self.datapath / ('theory_%s' % theoryID) + theopath = self._theories_path / f"theory_{theoryID}" if not theopath.exists(): raise TheoryNotFound( "Could not find theory %s. Folder '%s' not found" % (theoryID, theopath) ) - return TheoryIDSpec(theoryID, theopath) + return TheoryIDSpec(theoryID, theopath, self.theorydb_file) @property def theorydb_file(self): @@ -1089,7 +1136,7 @@ def download_theoryID(self, thid): remote = self.remote_theories if thid not in remote: raise TheoryNotFound("Theory %s not available." % thid) - download_and_extract(remote[thid], self.datapath) + download_and_extract(remote[thid], self._theories_path) def download_vp_output_file(self, filename, **kwargs): try: diff --git a/validphys2/src/validphys/nnprofile_default.yaml b/validphys2/src/validphys/nnprofile_default.yaml new file mode 100644 index 0000000000..058273497b --- /dev/null +++ b/validphys2/src/validphys/nnprofile_default.yaml @@ -0,0 +1,68 @@ +# +# Default `nnprofile.yaml` for NNPDF. +# The location of a custom profile can be given with the `NNPDF_PROFILE_PATH` enviroment variable +# otherwise by default ${XDG_CONFIG_HOME}/.config/NNPDF/nnprofile.yaml will be read +# which in most systems defaults to `~/.config/NNPDF/nnprofile.yaml` +# +# +# The following defines where NNPDF resources will be stored +# The directories for results / theories / hyperscan / validphys are declared as +# relative to the nnpdf_share unless explicitly written as absolutes +# +# nnpdf_share accepts the special value ${PYTHON_PREFIX} +# which will default to `python -c "import sys ; print(sys.prefix + "/share/NNPDF/")"` +# and that usually is: +# ${CONDA_PREFIX}/share/NNPDF in conda installations +# ${VIRTUAL_ENV}/share/NNPDF in virtual-env installations +# /usr in most Linux installations +# +# As a bug-prevention measure, if `nnpdf_share` is set to an empty variable +# or (if set to PYTHON_PREFIX) to a non-writtable directory, the code will refuse to run + +# Default to ${PYTHON_PREFIX}, i.e., the prefix or wherever NNPDF was installed +# it (usually) corresponds to ${CONDA_PREFIX} in conda environments and ${VIRTUAL_ENV} in virtual environments +# for instance, if you want all your NNPDF installations to share theories you can do +# nnpdf_share: ~/.local/share/NNPDF/ +nnpdf_share: RELATIVE_TO_PYTHON + +results_path: results +theories_path: theories +hyperscan_path: hyperscan +validphys_cache_path: vp-cache + +# Starting from nnpdf > 4.0.7 the data is bundled together with the vp installation +# data_path: + +# Remote resource locations +fit_urls: + - 'https://data.nnpdf.science/fits/' + - 'https://nnpdf.web.cern.ch/nnpdf/fits/' + +fit_index: 'fitdata.json' + +hyperscan_urls: + - 'https://data.nnpdf.science/hyperscans/' + +hyperscan_index: 'hyperscandata.json' + +theory_urls: + - 'https://nnpdf.web.cern.ch/nnpdf/tables/' + +theory_index: 'theorydata.json' + +lhapdf_urls: + - 'http://lhapdfsets.web.cern.ch/lhapdfsets/current/' +nnpdf_pdfs_urls: + - 'https://data.nnpdf.science/pdfs/' +nnpdf_pdfs_index: 'pdfdata.json' + +#Server side uploading locations +upload_host: 'nnpdf@vp.nnpdf.science' +reports_target_dir: "validphys-reports/" +reports_root_url: 'https://vp.nnpdf.science/' +fits_target_dir: "WEB/fits/" +fits_root_url: 'https://data.nnpdf.science/fits/' +pdfs_target_dir: "WEB/pdfs/" +pdfs_root_url: 'https://data.nnpdf.science/pdfs/' +hyperscan_target_dir: "WEB/hyperscans/" +hyperscan_root_url: 'https://data.nnpdf.science/hyperscans/' diff --git a/validphys2/src/validphys/photon/compute.py b/validphys2/src/validphys/photon/compute.py index 453f45c8ba..8c2bf480b5 100644 --- a/validphys2/src/validphys/photon/compute.py +++ b/validphys2/src/validphys/photon/compute.py @@ -2,7 +2,6 @@ import logging import tempfile -import fiatlux import numpy as np from scipy.integrate import trapezoid from scipy.interpolate import interp1d @@ -93,6 +92,14 @@ def __init__(self, theoryid, lux_params, replicas): self.interpolator = [] self.integral = [] + try: + import fiatlux + except ModuleNotFoundError as e: + log.error("fiatlux not found, please install fiatlux") + raise ModuleNotFoundError( + "Please install fiatlux: `pip install nnpdf[qed]` or `pip install fiatlux`" + ) from e + for replica in replicas: f2 = sf.InterpStructureFunction(path_to_F2, self.luxpdfset.members[replica]) fl = sf.InterpStructureFunction(path_to_FL, self.luxpdfset.members[replica]) diff --git a/validphys2/src/validphys/tests/test_loader.py b/validphys2/src/validphys/tests/test_loader.py index 0c4d68bd51..c2c9c34577 100644 --- a/validphys2/src/validphys/tests/test_loader.py +++ b/validphys2/src/validphys/tests/test_loader.py @@ -3,23 +3,30 @@ Test loading utilities. """ +import os +from pathlib import Path +import subprocess as sp +import sys + +from hypothesis import given, settings +from hypothesis.strategies import composite, sampled_from, sets import numpy as np import pytest -from hypothesis.strategies import sampled_from, sets, composite -from hypothesis import given, settings -from validphys.core import Cuts, CommonDataSpec -from validphys.loader import FallbackLoader, rebuild_commondata_without_cuts, FitNotFound -from validphys.plotoptions import kitable, get_info -from validphys.tests.conftest import FIT +from validphys.core import CommonDataSpec, Cuts +from validphys.loader import FallbackLoader, FitNotFound, rebuild_commondata_without_cuts, NNPDF_DIR +from validphys.plotoptions import get_info, kitable +from validphys.tests.conftest import FIT, FIT_3REPLICAS, THEORYID_NEW l = FallbackLoader() -#The sorted is to appease hypothesis +# The sorted is to appease hypothesis dss = sorted(l.available_datasets - {"PDFEVOLTEST"}) -class MockCuts(): + +class MockCuts: def __init__(self, arr): self.arr = arr + def load(self): return self.arr @@ -66,6 +73,7 @@ def test_rebuild_commondata_without_cuts(tmp_path_factory, arg): nocuts[cuts] = False assert (lncd.get_cv()[nocuts] == 0).all() + @given(inp=commondata_and_cuts()) @settings(deadline=None) def test_kitable_with_cuts(inp): @@ -74,7 +82,92 @@ def test_kitable_with_cuts(inp): tb = kitable(cd, info, cuts=MockCuts(cuts)) assert len(tb) == len(cuts) + def test_load_fit(): assert l.check_fit(FIT) with pytest.raises(FitNotFound): l.check_fit(f"{FIT}/") + + +### nnprofile testing +def _check_download_resource(results_dir, profile=None, res_type="fit", resource=FIT_3REPLICAS): + """Downloads a resource (by default the fit FIT_3REPLICAS and + checks whether it can indeed be found in the given ``results_dir`` + Accepts a ``profile`` pointing to a custom nnprofile which will be set with NNPDF_PROFILE_PATH + """ + custom_environ = dict(os.environ) + if profile is not None: + custom_environ["NNPDF_PROFILE_PATH"] = Path(profile).as_posix() + + sp.run(["vp-get", res_type, resource], env=custom_environ) + + if res_type == "theoryID": + res_location = results_dir / f"theory_{resource}" + else: + res_location = results_dir / resource + + assert res_location.exists() + assert res_location.is_dir() + + +def test_custom_profile_nnpdf_share(tmp_path): + """Creates a custom profile with a key ``nnpdf_share` and checks whether it is used""" + profile_path = tmp_path / "nnprofile.yaml" + profile_path.write_text(f"nnpdf_share: {tmp_path}") + + # Check a fit + _check_download_resource(tmp_path / "results", profile=profile_path) + # Check a theory + _check_download_resource( + tmp_path / "theories", profile=profile_path, res_type="theoryID", resource=str(THEORYID_NEW) + ) + + +def test_custom_profile_explicit(tmp_path): + """Creates a custom profile with explicit paths that should take precedence""" + profile_path = tmp_path / "nnprofile.yaml" + theory_path = tmp_path / "test_theory" + results_path = tmp_path / "test_fit" + + profile_path.write_text( + f""" +theories_path: {theory_path.as_posix()} +results_path: {results_path.as_posix()}""" + ) + + # Check a fit + _check_download_resource(results_path, profile=profile_path) + # Check a theory + _check_download_resource( + theory_path, profile=profile_path, res_type="theoryID", resource=str(THEORYID_NEW) + ) + + +def test_home_profile(tmp_path): + """Check that {XDG_CONFIG_HOME} profile takes precedence""" + original_xdg = os.environ.get("XDG_CONFIG_HOME") + + nnpdf_path = tmp_path / NNPDF_DIR + nnpdf_path.mkdir(exist_ok=True, parents=True) + + profile_path = nnpdf_path / "nnprofile.yaml" + profile_path.write_text(f"nnpdf_share: {tmp_path}") + + os.environ["XDG_CONFIG_HOME"] = tmp_path.as_posix() + + try: + _check_download_resource(tmp_path / "results") + finally: + if original_xdg is None or not original_xdg: + os.environ.pop("XDG_CONFIG_HOME") + else: + os.environ["XDG_CONFIG_HOME"] = original_xdg + + +def test_profile_relative_to_python(tmp_path): + """Check that when the key RELATIVE_TO_PYTHON is used, the sys.prefix is used""" + profile_path = tmp_path / "nnprofile.yaml" + profile_path.write_text("nnpdf_share: RELATIVE_TO_PYTHON") + + results_sys_prefix = Path(sys.prefix) / "share" / NNPDF_DIR / "results" + _check_download_resource(results_sys_prefix, profile=profile_path) diff --git a/validphys2/src/validphys/tests/test_plots.py b/validphys2/src/validphys/tests/test_plots.py index da85cc5cd5..1e03f5b06a 100644 --- a/validphys2/src/validphys/tests/test_plots.py +++ b/validphys2/src/validphys/tests/test_plots.py @@ -1,5 +1,6 @@ import matplotlib -#This is to fix a weird bug in LHAPDF + +# This is to fix a weird bug in LHAPDF matplotlib.use('agg') import pytest @@ -7,52 +8,60 @@ from validphys.api import API from validphys.tests.conftest import PDF, THEORYID, DATA +TOLERANCE_VALUE = 12 + + @pytest.mark.linux -@pytest.mark.mpl_image_compare +@pytest.mark.mpl_image_compare(tolerance=TOLERANCE_VALUE) def test_plotpdfs(): pdfs = [PDF] Q = 10 flavours = ['g'] - #plot_pdfs returns a generator with (figure, name_hint) + # plot_pdfs returns a generator with (figure, name_hint) return next(API.plot_pdfs(pdfs=pdfs, Q=Q, flavours=flavours))[0] + @pytest.mark.linux -@pytest.mark.mpl_image_compare +@pytest.mark.mpl_image_compare(tolerance=TOLERANCE_VALUE) def test_dataspecschi2(): dsinpts = [ {'dataset': 'NMC'}, - {'dataset': 'ATLASTTBARTOT', 'cfac':['QCD']}, - {'dataset': 'CMSZDIFF12', 'cfac':('QCD', 'NRM'), 'sys':10} + {'dataset': 'ATLASTTBARTOT', 'cfac': ['QCD']}, + {'dataset': 'CMSZDIFF12', 'cfac': ('QCD', 'NRM'), 'sys': 10}, ] dataspecs = [ {'pdf': PDF, 'theoryid': THEORYID, 'speclabel': 'no t0'}, - {'pdf': PDF, 'theoryid': THEORYID, 'use_t0': False, 'speclabel': 'with t0'} + {'pdf': PDF, 'theoryid': THEORYID, 'use_t0': False, 'speclabel': 'with t0'}, ] return API.plot_dataspecs_datasets_chi2( dataset_inputs=dsinpts, dataspecs=dataspecs, use_cuts='internal', - metadata_group='experiment' + metadata_group='experiment', ) + @pytest.mark.linux -@pytest.mark.mpl_image_compare +@pytest.mark.mpl_image_compare(tolerance=TOLERANCE_VALUE) def test_plot_smpdf(single_data_internal_cuts_config): return next(API.plot_smpdf(**single_data_internal_cuts_config)) + @pytest.mark.linux -@pytest.mark.mpl_image_compare +@pytest.mark.mpl_image_compare(tolerance=TOLERANCE_VALUE) def test_plot_smpdf_categorical(single_data_categorical_internal_cuts_config): return next(API.plot_smpdf(**single_data_categorical_internal_cuts_config)) + @pytest.mark.linux -@pytest.mark.mpl_image_compare +@pytest.mark.mpl_image_compare(tolerance=TOLERANCE_VALUE) def test_plot_obscorrs(single_data_internal_cuts_config): corrpair = [{"corrpair": (i["dataset"],)} for i in DATA[:2]] return API.plot_obscorrs(**single_data_internal_cuts_config, corrpair=corrpair) + @pytest.mark.linux -@pytest.mark.mpl_image_compare +@pytest.mark.mpl_image_compare(tolerance=TOLERANCE_VALUE) def test_plot_xq2(): theoryid = THEORYID use_cuts = "nocuts" @@ -74,8 +83,9 @@ def test_plot_xq2(): metadata_group=metadata_group, ) + @pytest.mark.linux -@pytest.mark.mpl_image_compare +@pytest.mark.mpl_image_compare(tolerance=TOLERANCE_VALUE) def test_plot_xq2_custom(): theoryid = THEORYID use_cuts = "nocuts" diff --git a/validphys2/src/validphys/theorydbutils.py b/validphys2/src/validphys/theorydbutils.py index 4a0c7e6954..3405124780 100644 --- a/validphys2/src/validphys/theorydbutils.py +++ b/validphys2/src/validphys/theorydbutils.py @@ -38,7 +38,7 @@ def make_query(query: str, dbpath: Path): >>> from pathlib import Path as p >>> from validphys.theorydbutils import make_query >>> query = "SELECT * FROM TheoryIndex WHERE ID=53;" - >>> dbpath = p("./nnpdfcpp/data/theory.db") + >>> dbpath = p("./validphys2/src/validphys/datafiles/theory.db") >>> res = make_query(query, dbpath) >>> val = res.fetchone() >>> theory_info_dict = {k[0]: v for k, v in zip(res.description, val)} diff --git a/validphys2/src/validphys/version.py b/validphys2/src/validphys/version.py deleted file mode 100644 index 845e4b697a..0000000000 --- a/validphys2/src/validphys/version.py +++ /dev/null @@ -1,39 +0,0 @@ -# This file gets overwritten on deployemt, don't modify -def __give_git(): - # Get the path to this file - from pathlib import Path - - file_dir = Path(__file__).parent - from subprocess import CalledProcessError, run - - try: - result = run( - ["git", "describe", "--tags", "--long", "--dirty=-dev"], - capture_output=True, - text=True, - check=True, - cwd=file_dir, - ).stdout.strip() - tag = run( - ["git", "describe", "--abbrev=0", "--tags"], - capture_output=True, - text=True, - check=True, - cwd=file_dir, - ).stdout.strip() - githash = run( - ["git", "rev-parse", "--short", "HEAD"], - capture_output=True, - text=True, - check=True, - cwd=file_dir, - ).stdout.strip() - version = result.replace(f"-g{githash}", f"+g{githash}").replace(f"{tag}-", f"{tag}.") - except CalledProcessError: - # In principle this function should not exist on an installed version - # but who knows. Also maybe git doesn't work on the machine or whatever - version = "unknown" - return version - - -build_version = __give_git() diff --git a/version.cmake b/version.cmake deleted file mode 100644 index 044ba44163..0000000000 --- a/version.cmake +++ /dev/null @@ -1,3 +0,0 @@ -execute_process(COMMAND python -c "import ${LIBRARY}.version ; print(${LIBRARY}.version.__file__)" OUTPUT_VARIABLE VERSION_PATH) -STRING(STRIP ${VERSION_PATH} VERSION_PATH) -file(WRITE ${VERSION_PATH} ${GIT_VERSION})