improve cmake.list

CMakeLists.txt

@@ -89,6 +89,25 @@ find_package(LHAPDF REQUIRED)
 # directories containing headers 
 include_directories(${QT_INCLUDE_DIRS} ${ElementaryUtils_INCLUDE_DIR} ${NumA++_INCLUDE_DIR} ${PARTONS_INCLUDE_DIR} ${SFML_INCLUDE_DIR} ${CLN_INCLUDE_DIR} $(GSL_INCLUDE_DIRS) ${Apfel++_INCLUDE_DIR} ${LHAPDF_INCLUDE_DIR})
 
+# ENVIRONMENT VARIABLES ========================================================================
+
+execute_process(COMMAND bash -c "cd ../../elementary-utils/; git branch | grep '\*' | cut -d ' ' -f2" OUTPUT_VARIABLE ELEMUTILS_BRANCH)
+execute_process(COMMAND bash -c "cd ../../elementary-utils/; git rev-parse HEAD;"             OUTPUT_VARIABLE ELEMUTILS_REVISION)
+string(REGEX REPLACE "\n$" "" ELEMUTILS_BRANCH "${ELEMUTILS_BRANCH}")
+string(REGEX REPLACE "\n$" "" ELEMUTILS_REVISION "${ELEMUTILS_REVISION}")
+
+execute_process(COMMAND bash -c "cd ../../numa/; git branch | grep '\*' | cut -d ' ' -f2" OUTPUT_VARIABLE NUMA_BRANCH)
+execute_process(COMMAND bash -c "cd ../../numa/; git rev-parse HEAD;"             OUTPUT_VARIABLE NUMA_REVISION)
+string(REGEX REPLACE "\n$" "" NUMA_BRANCH "${NUMA_BRANCH}")
+string(REGEX REPLACE "\n$" "" NUMA_REVISION "${NUMA_REVISION}")
+
+execute_process(COMMAND bash -c "git branch | grep '\*' | cut -d ' ' -f2" OUTPUT_VARIABLE PARTONS_BRANCH)
+execute_process(COMMAND bash -c "git rev-parse HEAD"             OUTPUT_VARIABLE PARTONS_REVISION)
+string(REGEX REPLACE "\n$" "" PARTONS_BRANCH "${PARTONS_BRANCH}")
+string(REGEX REPLACE "\n$" "" PARTONS_REVISION "${PARTONS_REVISION}")
+
+configure_file("${CMAKE_SOURCE_DIR}/bin/environment_configuration.dat.in" "${CMAKE_SOURCE_DIR}/bin/environment_configuration.dat")
+
 # FINALIZE ==================================================================================
 
 # generate list of source files

bin/.gitignore

 /PARTONS_release
 /PARTONS_example
+/environment_configuration.dat

bin/environment_configuration.dat → bin/environment_configuration.dat.in

@@ -2,19 +2,14 @@
 # The content of this file is stored in the database during the insertion of data,
 # so latter one can easily reproduce the used computational environment.
 
-# You can fill the field system with the content of the command "uname -a",
-# and fill the other fields with the software versions.
-# E.g. g++: 4.9.2
-
-# TODO: Fill this.
-
-system: 
-g++:
-qt:
-smfl:
-eigen3:
-cln:
-gsl:
-elementary-utils: 
-numa: 
-partons: 
+system: @CMAKE_SYSTEM_NAME@ @CMAKE_SYSTEM_VERSION@
+g++: @CMAKE_CXX_COMPILER_ID@ @CMAKE_CXX_COMPILER_VERSION@
+qt: @QT_VERSION@
+smfl: @SFML_VERSION@
+cln: @CLN_VERSION@
+gsl: @GSL_VERSION@
+apfel++: @Apfel++_VERSION@
+lhapdf: @LHAPDF_VERSION@
+elementary-utils: @ELEMUTILS_BRANCH@/@ELEMUTILS_REVISION@
+numa: @NUMA_BRANCH@/@NUMA_REVISION@
+partons: @PARTONS_BRANCH@/@PARTONS_REVISION@

bin/partons.properties

@@ -39,5 +39,6 @@ computation.nb.processor = 1
 
 # Maximum size of batch for a given type (in one task several batches may be run in separate threads)
 gpd.service.batch.size = 10000
+collinear_distribution.service.batch.size = 10000
 ccf.service.batch.size = 1000
-observable.service.batch.size = 1000
\ No newline at end of file
+observable.service.batch.size = 1000