Commit a4ac2a83 authored by Pawel Sznajder's avatar Pawel Sznajder
Browse files

Merge remote-tracking branch 'origin/master' into new_channels_this_it_it_mesons

parents d4454f33 1dc91941
/.settings/
/.externalToolBuilders/
\ No newline at end of file
/.externalToolBuilders/
CMakeCache.txt
CMakeFiles/
Makefile
PARTONS_example_autogen/
cmake_install.cmake
......@@ -7,7 +7,12 @@ cmake_minimum_required(VERSION 2.6)
project(PARTONS_release CXX)
# define c++ standard and issue all the warning demanded by this standard
add_definitions(-std=c++98 -pedantic)
add_definitions(-std=c++11 -pedantic -Wno-vla-extension)
set(CMAKE_CXX_STANDARD 11)
if (NOT DEFINED CMAKE_MACOSX_RPATH)
set(CMAKE_MACOSX_RPATH 0)
endif()
# AUTOMOC ==================================================================================
......@@ -22,11 +27,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
# find libraries: gsl
find_package(GSL)
# find libraries: Qt4
find_package(Qt4 REQUIRED QtCore QtSql)
# find libraries: Qt
find_package(Qt5 COMPONENTS Core Sql REQUIRED)
# add some useful macros and variables
include(${QT_USE_FILE})
add_definitions(${QT_DEFINITIONS})
# find libraries: additional modules
......@@ -45,7 +49,7 @@ find_package(NumA++ REQUIRED)
find_package(PARTONS REQUIRED)
# directories containing headers
include_directories($(GSL_INCLUDE_DIRS) ${QT_INCLUDE_DIRS} ${SFML_INCLUDE_DIR} ${ELEMENTARY_UTILS_INCLUDE_DIR} ${NUMA_INCLUDE_DIR} ${PARTONS_INCLUDE_DIR})
include_directories($(GSL_INCLUDE_DIRS) ${QT_INCLUDE_DIRS} ${SFML_INCLUDE_DIR} ${ElementaryUtils_INCLUDE_DIR} ${NumA++_INCLUDE_DIR} ${PARTONS_INCLUDE_DIR})
# FINALIZE ==================================================================================
......@@ -78,11 +82,15 @@ target_link_libraries(
${QT_LIBRARIES}
${SFML_LIBRARIES}
${SFML_LIBRARIES}
${ELEMENTARY_UTILS_LIBRARIES}
${ElementaryUtils_LIBRARIES}
${NUMA_LIBRARIES}
${NumA++_LIBRARIES}
${PARTONS_LIBRARIES}
Qt5::Core
Qt5::Sql
)
......@@ -2,18 +2,18 @@
#
# Once done this will define
#
# ELEMENTARY_UTILS_FOUND - system has Elementary_Utils lib
# ELEMENTARY_UTILS_LIBRARIES - the path of the library
# ELEMENTARY_UTILS_INCLUDE_DIR - the include directory
# ElementaryUtils_FOUND - system has Elementary_Utils lib
# ElementaryUtils_LIBRARIES - the path of the library
# ElementaryUtils_INCLUDE_DIR - the include directory
if (ELEMENTARY_UTILS_INCLUDE_DIR AND ELEMENTARY_UTILS_LIBRARIES)
if (ElementaryUtils_INCLUDE_DIR AND ElementaryUtils_LIBRARIES)
# in cache already
set(ELEMENTARY_UTILS_FOUND TRUE)
set(ElementaryUtils_FOUND TRUE)
else (ELEMENTARY_UTILS_INCLUDE_DIR AND ELEMENTARY_UTILS_LIBRARIES)
else (ElementaryUtils_INCLUDE_DIR AND ElementaryUtils_LIBRARIES)
find_path(ELEMENTARY_UTILS_INCLUDE_DIR ElementaryUtils/PropertiesManager.h
find_path(ElementaryUtils_INCLUDE_DIR ElementaryUtils/PropertiesManager.h
PATHS
${CMAKE_INSTALL_PREFIX}
${CMAKE_SOURCE_DIR}/../ElementaryUtils
......@@ -24,7 +24,7 @@ else (ELEMENTARY_UTILS_INCLUDE_DIR AND ELEMENTARY_UTILS_LIBRARIES)
PATH_SUFFIXES include/PARTONS include
)
find_library(ELEMENTARY_UTILS_LIBRARIES
find_library(ElementaryUtils_LIBRARIES
NAMES ElementaryUtils
PATHS
${CMAKE_INSTALL_PREFIX}
......@@ -36,7 +36,7 @@ else (ELEMENTARY_UTILS_INCLUDE_DIR AND ELEMENTARY_UTILS_LIBRARIES)
PATH_SUFFIXES lib/PARTONS lib64/PARTONS bin/PARTONS lib lib64 bin)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(ELEMENTARY_UTILS DEFAULT_MSG ELEMENTARY_UTILS_INCLUDE_DIR ELEMENTARY_UTILS_LIBRARIES)
find_package_handle_standard_args(ElementaryUtils DEFAULT_MSG ElementaryUtils_INCLUDE_DIR ElementaryUtils_LIBRARIES)
endif(ELEMENTARY_UTILS_INCLUDE_DIR AND ELEMENTARY_UTILS_LIBRARIES)
endif(ElementaryUtils_INCLUDE_DIR AND ElementaryUtils_LIBRARIES)
......@@ -2,18 +2,18 @@
#
# Once done this will define
#
# NUMA_FOUND - system has NumA++ lib
# NUMA_LIBRARIES - the path of the library
# NUMA_INCLUDE_DIR - the include directory
# NumA++_FOUND - system has NumA++ lib
# NumA++_LIBRARIES - the path of the library
# NumA++_INCLUDE_DIR - the include directory
if (NUMA_INCLUDE_DIR AND NUMA_LIBRARIES)
if (NumA++_INCLUDE_DIR AND NumA++_LIBRARIES)
# in cache already
set(NUMA_FOUND TRUE)
set(NumA++_FOUND TRUE)
else (NUMA_INCLUDE_DIR AND NUMA_LIBRARIES)
else (NumA++_INCLUDE_DIR AND NumA++_LIBRARIES)
find_path(NUMA_INCLUDE_DIR NAMES NumA/integration/Integrator.h NumA++/integration/Integrator.h
find_path(NumA++_INCLUDE_DIR NAMES NumA/integration/Integrator.h NumA++/integration/Integrator.h
PATHS
${CMAKE_INSTALL_PREFIX}
${CMAKE_SOURCE_DIR}/../numa
......@@ -26,7 +26,7 @@ else (NUMA_INCLUDE_DIR AND NUMA_LIBRARIES)
PATH_SUFFIXES include/PARTONS include
)
find_library(NUMA_LIBRARIES
find_library(NumA++_LIBRARIES
NAMES NumA NumA++
PATHS
${CMAKE_INSTALL_PREFIX}
......@@ -40,7 +40,7 @@ else (NUMA_INCLUDE_DIR AND NUMA_LIBRARIES)
PATH_SUFFIXES lib/PARTONS lib64/PARTONS bin/PARTONS lib lib64 bin)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(NUMA DEFAULT_MSG NUMA_INCLUDE_DIR NUMA_LIBRARIES)
find_package_handle_standard_args(NumA++ DEFAULT_MSG NumA++_INCLUDE_DIR NumA++_LIBRARIES)
endif(NUMA_INCLUDE_DIR AND NUMA_LIBRARIES)
endif(NumA++_INCLUDE_DIR AND NumA++_LIBRARIES)
......@@ -34,7 +34,7 @@ This scenario demonstrates a simple task as the evaluation of GPD model in a sin
<param name="qcd_order_type" value="LO" />
<!-- Number of steps in integration over factorization scale -->
<param name="numberOfNodes" value="1" />
<param name="numberOfNodes" value="2" />
<!-- Select alpha_s model -->
<module type="RunningAlphaStrongModule" name="RunningAlphaStrongVinnikov">
......
......@@ -461,7 +461,7 @@ void makeUseOfGPDEvolution() {
// Number of steps in the factorization scale (i.e. set the number of steps in the integration over factorization scale)
// One step is a typical value for Vinnikov code
parameters.add(NumA::QuadratureIntegrator1D::PARAM_NAME_N, 1);
parameters.add(NumA::QuadratureIntegrator1D::PARAM_NAME_N, 2);
// PerturbativeQCD = LO
parameters.add(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment