Merge remote-tracking branch 'refs/remotes/origin/master'

MapCollaboration · Apr 4, 2024 · 340fd2f · 340fd2f
2 parents bf100cc + bfefd25
commit 340fd2f
Show file tree

Hide file tree

Showing 851 changed files with 23,343 additions and 1,202,920 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,12 +18,14 @@ tests/EvolutionMatching
 tests/qTintegration
 tests/IntegrationTest
 tests/DrellYanCrossSection
+tests/TestSIDISNormalisationFactors
 tests/TestChi2
 tests/TestMinimisation
 tests/SIDISMultiplicities
 tests/GridProduction
 tests/FUUTGridProduction
 tests/TestConvolution
+tests/TestSIDISNormalisationFactors
 tests/Makefile
 tools/CTestTestfile.cmake
 tools/Makefile

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,7 @@ project(NangaParbat)
 
 # activating some global properties for the project
 set(NangaParbat_VERSION 1.5.0)
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -fPIC")
@@ -54,68 +54,43 @@ include_directories(${PROJECT_SOURCE_DIR}/inc)
 # LHAPDF
 find_program(LHAPDF_CONFIG lhapdf-config REQUIRED)
 if (LHAPDF_CONFIG)
-  exec_program(${LHAPDF_CONFIG}
-    ARGS --cflags
-    OUTPUT_VARIABLE LHAPDF_CXX_FLAGS
-  )
-  set(LHAPDF_CXX_FLAGS ${LHAPDF_CXX_FLAGS} CACHE STRING INTERNAL)
-  exec_program(${LHAPDF_CONFIG}
-    ARGS --libs
-    OUTPUT_VARIABLE LHAPDF_LIBRARIES
-  )
-  set(LHAPDF_LIBRARIES ${LHAPDF_LIBRARIES} CACHE STRING INTERNAL)
+   execute_process(COMMAND ${LHAPDF_CONFIG} --cflags OUTPUT_VARIABLE LHAPDF_CXX_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+   execute_process(COMMAND ${LHAPDF_CONFIG} --libs OUTPUT_VARIABLE LHAPDF_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE)
+   set(LHAPDF_CXX_FLAGS ${LHAPDF_CXX_FLAGS} CACHE STRING INTERNAL)
+   set(LHAPDF_LIBRARIES ${LHAPDF_LIBRARIES} CACHE STRING INTERNAL)
 else(LHAPDF_CONFIG)
   message(FATAL_ERROR "LHAPDF not found!")
 endif(LHAPDF_CONFIG)
 
 # APFEL++
 find_program(APFELXX_CONFIG apfelxx-config REQUIRED)
 if (APFELXX_CONFIG)
-  exec_program(${APFELXX_CONFIG}
-    ARGS --cppflags
-    OUTPUT_VARIABLE APFELXX_CXX_FLAGS
-  )
-  set(APFELXX_CXX_FLAGS ${APFELXX_CXX_FLAGS} CACHE STRING INTERNAL)
-  exec_program(${APFELXX_CONFIG}
-    ARGS --ldflags
-    OUTPUT_VARIABLE APFELXX_LIBRARIES
-  )
-  set(APFELXX_LIBRARIES ${APFELXX_LIBRARIES} CACHE STRING INTERNAL)
+   execute_process(COMMAND ${APFELXX_CONFIG} --cppflags OUTPUT_VARIABLE APFELXX_CXX_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+   execute_process(COMMAND ${APFELXX_CONFIG} --ldflags OUTPUT_VARIABLE APFELXX_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE)
+   set(APFELXX_CXX_FLAGS ${APFELXX_CXX_FLAGS} CACHE STRING INTERNAL)
+   set(APFELXX_LIBRARIES ${APFELXX_LIBRARIES} CACHE STRING INTERNAL)
 else(APFELXX_CONFIG)
   message(FATAL_ERROR "APFEL++ not found!")
 endif(APFELXX_CONFIG)
 
 # GSL
 find_program(GSL_CONFIG gsl-config)
 if (GSL_CONFIG)
-  exec_program(${GSL_CONFIG}
-    ARGS --cflags
-    OUTPUT_VARIABLE GSL_CXX_FLAGS
-  )
-  set(GSL_CXX_FLAGS ${GSL_CXX_FLAGS} CACHE STRING INTERNAL)
-  exec_program(${GSL_CONFIG}
-    ARGS --libs
-    OUTPUT_VARIABLE GSL_LIBRARIES
-  )
-  set(GSL_LIBRARIES ${GSL_LIBRARIES} CACHE STRING INTERNAL)
+   execute_process(COMMAND ${GSL_CONFIG} --cflags OUTPUT_VARIABLE GSL_CXX_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+   execute_process(COMMAND ${GSL_CONFIG} --libs OUTPUT_VARIABLE GSL_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE)
+   set(GSL_CXX_FLAGS ${GSL_CXX_FLAGS} CACHE STRING INTERNAL)
+   set(GSL_LIBRARIES ${GSL_LIBRARIES} CACHE STRING INTERNAL)
 else(GSL_CONFIG)
   message ("GSL not found. Some parts of the code will not be compiled.")
 endif(GSL_CONFIG)
 
 # ROOT
 find_program(ROOT_CONFIG root-config)
 if (ROOT_CONFIG)
-  exec_program(${ROOT_CONFIG}
-    ARGS --cflags
-    OUTPUT_VARIABLE ROOT_CXX_FLAGS
-  )
+   execute_process(COMMAND ${ROOT_CONFIG} --cflags OUTPUT_VARIABLE ROOT_CXX_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+   execute_process(COMMAND ${ROOT_CONFIG} --libs OUTPUT_VARIABLE ROOT_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE)
   set(ROOT_CXX_FLAGS ${ROOT_CXX_FLAGS} CACHE STRING INTERNAL)
-  exec_program(${ROOT_CONFIG}
-    ARGS --libs
-    OUTPUT_VARIABLE ROOT_LIBRARIES
-  )
   set(ROOT_LIBRARIES ${ROOT_LIBRARIES} CACHE STRING INTERNAL)
-
   # Include Minuit2 to the libraries of ROOT (not included by default)
   set(ROOT_LIBRARIES ${ROOT_LIBRARIES} -lMinuit2)
 else(ROOT_CONFIG)
@@ -127,7 +102,6 @@ if (MINUIT2)
   add_definitions(-DMINUIT2_NOT_BUNDLED_WITH_ROOT=true)
 endif(MINUIT2)
 
-
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LHAPDF_CXX_FLAGS} ${APFELXX_CXX_FLAGS} ${GSL_CXX_FLAGS} ${YAML_CFLAGS} ${ROOT_CXX_FLAGS} ${EIGEN3_CFLAGS} ${Ceres_CFLAGS} ${GLOG_CFLAGS} ${GFLAGS_CFLAGS} -Wall -fPIC -Wunused")
 

diff --git a/FitResults/MAP22Pion/tables/config.yaml b/FitResults/MAP22Pion/tables/config.yaml
@@ -1,4 +1,4 @@
-pdfbeamset:
+pdfsetbeam:
   name: "xFitterPI_NLO_EIG"   #pion
   member: 0
 # Collinear PDF set and member to be used for the generation of the