.ci/online/Dockerfile

-ARG TAG=12-fair202211.1-rocm5.4
+ARG TAG=12-fair202211.4-rocm5.4
 ARG REGISTRY=hub.cbm.gsi.de/computing/images/online
 
 FROM ${REGISTRY}/dev:${TAG} as build

.gitignore

@@ -20,3 +20,14 @@ Dart*.cfg
 
 # IDEs
 .vscode
+.cache
+
+# Housekeeping
+*~
+.*
+!.gitignore
+!.gitlab-ci.yml
+!.dockerignore                          
+!.clang-format             
+!.clang-tidy                
+!.ci/

.gitlab-ci.yml

@@ -181,6 +181,24 @@ FileEndCheck:
     - git fetch upstream
     - scripts/check-file-ending.sh upstream
 
+CheckForNonASCII:
+  stage: checkFormat
+  image: alpine
+  tags:
+    - docker
+  only:
+    refs:
+      - merge_requests
+    variables:
+      - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
+      - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^DC_.*$/
+  script:
+    # Get the upstream repository manually. I did not find any other way to have it for
+    # comparison
+    - apk update && apk add git bash file pcre-tools
+    - scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
+    - git fetch upstream
+    - scripts/check-non-ascii-characters.sh upstream
 
 FileLicenceCheck:
   stage: checkFormat
@@ -206,6 +224,7 @@ FileLicenceCheck:
 # job template
 #
 .build_and_test: &build_and_test
+  timeout: 1h # Possible since Gitlab 15.7, job-level timeout can exceed project timeout but not Runner timeout
   before_script:
     - if [ "$CI_MERGE_REQUEST_PROJECT_PATH" != "computing/cbmroot" ]; then
     -   if [ "$CI_PROJECT_PATH" != "computing/cbmroot" ]; then
@@ -232,6 +251,10 @@ FileLicenceCheck:
     - if [[ -n $INSTALL_PROJECT ]]; then
     -   echo "export INSTALL_PROJECT=TRUE" >> Dart.cfg
     - fi
+    - ./scripts/find_cijob_ctest_stop_time.sh Dart.cfg
+    - if [[ -n $CI_TEST_STAGE_TOTAL_TIME_LIMIT ]]; then
+    -   echo "export CI_TEST_STAGE_TOTAL_TIME_LIMIT=$CI_TEST_STAGE_TOTAL_TIME_LIMIT"  >> Dart.cfg
+    - fi
     - if [[ -n $CONFIGFILE ]]; then
     -   source $CONFIGFILE $FAIRSOFT_VERSION
     - fi
@@ -251,41 +274,24 @@ FileLicenceCheck:
     OS: "Debian12"
     NCPU: 16
     RAW_DATA_PATH: "/opt/cbmsoft/beamtime-test-data/reduced/"
-    FAIRSOFT_VERSION: "apr21p2"
-    FAIRROOT_VERSION: "v18.6.7"
+    FAIRSOFT_VERSION: "nov22p1"
+    FAIRROOT_VERSION: "v18.8.0"
     BASE_PATH: "/opt/"
     SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
     FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
     CHECK_GEO_HASH_CHANGE: "1"
+    CI_TEST_STAGE_TOTAL_TIME_LIMIT: 1500 # in seconds = 25 minutes
 
 .apptainer_tag: &apptainer_tag
   stage: build
   tags:
     - CbmRoot_apptainer
 
-.apptainer_centos7_variables_apr21: &apptainer_centos7_variables_apr21
-    OS: centos7
-    FAIRSOFT_VERSION: apr21p2
-    FAIRROOT_VERSION: v18.6.7
-    BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS/gcc8"
-    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
-    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
-    CONFIGFILE: "/cvmfs/cbm.gsi.de/$OS/bin/setup_development_environment_test.sh"
-
-.apptainer_centos7_variables_nov22p1: &apptainer_centos7_variables_nov22p1
-    OS: centos7
-    FAIRSOFT_VERSION: nov22p1
-    FAIRROOT_VERSION: v18.8.0
-    BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS/gcc8"
-    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
-    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
-    CONFIGFILE: "/cvmfs/fairsoft.gsi.de/$OS/bin/setup_development_environment.sh"
-
-.apptainer_vae23_variables_apr21: &apptainer_vae23_variables_apr21
+.apptainer_vae23_variables_nov22p1: &apptainer_vae23_variables_nov22p1
     CONTAINER: "/cvmfs/vae.gsi.de/vae23/containers/user_container-production.sif"
     OS: vae23
-    FAIRSOFT_VERSION: apr21p2
-    FAIRROOT_VERSION: v18.6.7
+    FAIRSOFT_VERSION: nov22p1
+    FAIRROOT_VERSION: v18.8.0
     BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian10/"
     SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
     FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
@@ -293,29 +299,54 @@ FileLicenceCheck:
     INSTALL_PROJECT: "TRUE"
     EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
 
-.apptainer_vae23_variables_nov22p1: &apptainer_vae23_variables_nov22p1
-    CONTAINER: "/cvmfs/vae.gsi.de/vae23/containers/user_container-production.sif"
-    OS: vae23
-    FAIRSOFT_VERSION: nov22p1
+.apptainer_vae24_variables_nov22p3: &apptainer_vae24_variables_nov22p3
+    CONTAINER: "/cvmfs/vae.gsi.de/vae24/containers/user_container-production.sif"
+    OS: vae24
+    FAIRSOFT_VERSION: nov22p3
     FAIRROOT_VERSION: v18.8.0
-    BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian10/"
+    BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian11/"
     SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
-    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
-    CONFIGFILE: "/cvmfs/cbm.gsi.de/debian10/bin/setup_development_environment.sh"
+    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
+    CONFIGFILE: "/cvmfs/cbm.gsi.de/debian11/bin/setup_development_environment.sh"
     INSTALL_PROJECT: "TRUE"
     EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
 
-.apptainer_debian11_variables_apr21: &apptainer_debian11_variables_apr21
-    CONTAINER: "/cvmfs/cbm.gsi.de/containers/debian11_v18.6.7_apr21p2_1.sif"
-    OS: debian11
-    FAIRSOFT_VERSION: apr21p2
-    FAIRROOT_VERSION: v18.6.7
-    BASE_PATH: "/opt/"
-    SIMPATH: "$BASE_PATH/fairsoft/${FAIRSOFT_VERSION}"
+.apptainer_vae24_variables_jan24p1: &apptainer_vae24_variables_jan24p1
+    CONTAINER: "/cvmfs/vae.gsi.de/vae24/containers/user_container-production.sif"
+    OS: vae24
+    FAIRSOFT_VERSION: jan24p1
+    FAIRROOT_VERSION: v18.8.2
+    BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian11/"
+    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
     FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
+    CONFIGFILE: "/cvmfs/cbm.gsi.de/debian11/bin/setup_development_environment.sh"
     INSTALL_PROJECT: "TRUE"
     EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
 
+.apptainer_vae25_variables_nov22p1: &apptainer_vae25_variables_nov22p1
+    CONTAINER: "/cvmfs/vae.gsi.de/vae25/containers/user_container-production.sif"
+    OS: vae25
+    FAIRSOFT_VERSION: nov22p1
+    FAIRROOT_VERSION: v18.8.0
+    BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian12/"
+    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
+    # Two next variables trigger their effect if present, even if set to FALSE
+    # INSTALL_PROJECT: "TRUE"
+    # EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
+
+.apptainer_vae25_variables_jan24p1: &apptainer_vae25_variables_jan24p1
+    CONTAINER: "/cvmfs/vae.gsi.de/vae25/containers/user_container-production.sif"
+    OS: vae25
+    FAIRSOFT_VERSION: jan24p1
+    FAIRROOT_VERSION: v18.8.2
+    BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian12/"
+    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
+    # Two next variables trigger their effect if present, even if set to FALSE
+    # INSTALL_PROJECT: "TRUE"
+    # EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
+
 .apptainer_debian12_variables_nov22p1: &apptainer_debian12_variables_nov22p1
     CONTAINER: "/cvmfs/cbm.gsi.de/containers/debian12_v18.8.0_nov22p1_2.sif"
     OS: debian12
@@ -331,16 +362,19 @@ FileLicenceCheck:
   stage: build
   tags:
     - CbmRoot
+  # Possible since Gitlab 15.7, job-level timeout can exceed project timeout but not Runner timeout
+  timeout: 1h 30m # Continuous tests after merge need more time than the pre-merge CI
 
 .linux_variables: &linux_variables
     OS: "Debian12"
-    NCPU: 5
+    NCPU: 16
     FAIRSOFT_VERSION: "nov22p1"
     FAIRROOT_VERSION: "v18.8.0"
-    BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian12"
+    BASE_PATH: "/opt/"
     SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
-    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
+    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
     EXTRA_PATH: "${SIMPATH}/bin"
+    CI_TEST_STAGE_TOTAL_TIME_LIMIT: 1800 # in seconds = 30 m, Continuous tests after merge need longer than pre-merge CI
 
 .macosx_tag: &macosx_tag
   stage: build
@@ -377,36 +411,6 @@ FileLicenceCheck:
     IMAGE_NAME: "${OS}_${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
     EXTRA_PATH: /usr/local/bin
 
-.macosx_1015_variables: &macosx_1015_variables
-    OS: "macOS1015"
-    FAIRSOFT_VERSION: "apr21p2"
-    FAIRROOT_VERSION: "v18.6.7"
-    BASE_PATH: "/opt"
-    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
-    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
-    IMAGE_NAME: "${OS}_${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
-    EXTRA_PATH: /usr/local/bin
-
-.macosx_12_variables: &macosx_12_variables
-    OS: "macOS12"
-    FAIRSOFT_VERSION: "apr21p2"
-    FAIRROOT_VERSION: "v18.6.7"
-    BASE_PATH: "/opt"
-    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
-    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
-    IMAGE_NAME: "${OS}_${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
-    EXTRA_PATH: /usr/local/bin
-
-.macosx_11_variables: &macosx_11_variables
-    OS: "macOS11"
-    FAIRSOFT_VERSION: "apr21p2"
-    FAIRROOT_VERSION: "v18.6.7"
-    BASE_PATH: "/opt"
-    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
-    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
-    IMAGE_NAME: "${OS}_${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
-    EXTRA_PATH: /usr/local/bin
-
 .mergeVariables: &mergeVariables
     BUILD_TYPE: "Continuous"
 
@@ -441,30 +445,30 @@ CbmRoot_Merge_Apptainer_debian12_nov22p1:
   variables:
     <<: [*mergeRequestVariables, *apptainer_debian12_variables_nov22p1]
 
-CbmRoot_Merge_Apptainer_debian11_apr21:
+CbmRoot_Merge_Apptainer_vae23_nov22p1:
   <<: [*apptainer_tag, *check_merge_request, *build_and_test]
   variables:
-    <<: [*mergeRequestVariables, *apptainer_debian11_variables_apr21]
+    <<: [*mergeRequestVariables, *apptainer_vae23_variables_nov22p1]
 
-CbmRoot_Merge_Apptainer_centos7_apr21:
+CbmRoot_Merge_Apptainer_vae24_nov22p3:
   <<: [*apptainer_tag, *check_merge_request, *build_and_test]
   variables:
-    <<: [*mergeRequestVariables, *apptainer_centos7_variables_apr21]
+    <<: [*mergeRequestVariables, *apptainer_vae24_variables_nov22p3]
 
-CbmRoot_Merge_Apptainer_centos7_nov22p1:
+CbmRoot_Merge_Apptainer_vae24_jan24p1:
   <<: [*apptainer_tag, *check_merge_request, *build_and_test]
   variables:
-    <<: [*mergeRequestVariables, *apptainer_centos7_variables_nov22p1]
+    <<: [*mergeRequestVariables, *apptainer_vae24_variables_jan24p1]
 
-CbmRoot_Merge_Apptainer_vae23_apr21:
+CbmRoot_Merge_Apptainer_vae25_nov22p1:
   <<: [*apptainer_tag, *check_merge_request, *build_and_test]
   variables:
-    <<: [*mergeRequestVariables, *apptainer_vae23_variables_apr21]
+    <<: [*mergeRequestVariables, *apptainer_vae25_variables_nov22p1]
 
-CbmRoot_Merge_Apptainer_vae23_nov22p1:
+CbmRoot_Merge_Apptainer_vae25_jan24p1:
   <<: [*apptainer_tag, *check_merge_request, *build_and_test]
   variables:
-    <<: [*mergeRequestVariables, *apptainer_vae23_variables_nov22p1]
+    <<: [*mergeRequestVariables, *apptainer_vae25_variables_jan24p1]
 
 CbmRoot_Merge_macosx_13_nov22p1:
   <<: [*macosx_tag, *check_merge_request, *build_and_test]
@@ -481,21 +485,6 @@ CbmRoot_Merge_macosx_11_nov22p1:
   variables:
     <<: [*mergeRequestVariables, *macosx_11_variables_nov22p1]
 
-CbmRoot_Merge_macosx_1015:
-  <<: [*macosx_tag, *check_merge_request, *build_and_test]
-  variables:
-    <<: [*mergeRequestVariables, *macosx_1015_variables]
-
-CbmRoot_Merge_macosx_11:
-  <<: [*macosx_tag, *check_merge_request, *build_and_test]
-  variables:
-    <<: [*mergeRequestVariables, *macosx_11_variables]
-
-CbmRoot_Merge_macosx_12:
-  <<: [*macosx_tag, *check_merge_request, *build_and_test]
-  variables:
-    <<: [*mergeRequestVariables, *macosx_12_variables]
-
 CbmRoot_Continuous:
   <<: [*linux_tag, *check_merge, *build_and_test]
   variables:

CMakeLists.txt

@@ -142,7 +142,9 @@ endif()
 
 
 #Searching for Boost Package
-find_package(Boost COMPONENTS serialization regex filesystem log log_setup container program_options thread iostreams system)
+find_package(Boost CONFIG
+             COMPONENTS serialization regex filesystem log log_setup container program_options thread iostreams system
+            )
 if(Boost_FOUND)
   list(APPEND packages Boost)
 endif()
@@ -203,6 +205,9 @@ if(FairMQ_FOUND)
   set_property(TARGET FairMQ::FairMQ APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${_inDirMQ}/fairmq/options")
 endif()
 
+#Searching for GTest in the build directory
+find_package(GTest HINTS ${CMAKE_BINARY_DIR})
+
 # Check if the compiler supports the needed C++ standard
 # Check for the minimum required versions of FairSoft and FairRoot
 check_external_stack()
@@ -246,7 +251,7 @@ If(DEFINED ENV{OMP_NUM_THREADS} )
 endif()
 
 set(CBMLIBDIR ${CMAKE_BINARY_DIR}/lib)
-set(LD_LIBRARY_PATH  ${CBMLIBDIR} ${Boost_LIBRARY_DIRS} ${LD_LIBRARY_PATH} ${FAIRROOT_LIBRARY_DIR})
+set(LD_LIBRARY_PATH  ${CBMLIBDIR} ${SIMPATH}/lib ${LD_LIBRARY_PATH} ${FAIRROOT_LIBRARY_DIR})
 set(ROOT_INCLUDE_PATH ${FAIRROOT_INCLUDE_DIR})
 
 # Recurse into the given subdirectories.  This does not actually
@@ -254,11 +259,6 @@ set(ROOT_INCLUDE_PATH ${FAIRROOT_INCLUDE_DIR})
 # the project's entire directory structure.
 
 Option(BUILD_UNITTESTS "Build all unit tests and add them as new tests" ON)
-If(BUILD_UNITTESTS)
-  Message("Build the unit tests.")
-  Message(STATUS "Build internal GTest")
-  Include(external/InstallGtest.cmake)
-endif()
 
 
 ### Subdirectories to be compiled #####
@@ -268,6 +268,7 @@ endif()
 # following targets
 add_subdirectory (external)
 
+
 option(BUILD_FOR_TIDY "Create compile commands database needed by clang-tidy" OFF)
 # Add the default compiler include paths needed for our static standalone clang-tidy
 # binary. The paths are only added to the compilation units in the generated file

CbmRoot_test.cmake

@@ -33,6 +33,9 @@ Set(CTEST_BUILD_COMMAND "${BUILD_COMMAND} -i -k -j$ENV{number_of_processors}")
 #Include(CbmMacros)
 #FairRootVersion()
 
+message("Compiling with $ENV{number_of_processors} jobs in parallel.")
+message("Testing with $ENV{number_of_processors_for_test} jobs in parallel.")
+
 Set(CTEST_USE_LAUNCHERS 1)
 
 If(${CBM_TEST_MODEL} MATCHES MergeRequest OR ${CBM_TEST_MODEL} MATCHES Continuous)
@@ -55,7 +58,7 @@ Else()
 EndIf()
 
 #If(${CBM_TEST_MODEL} MATCHES Nightly OR ${CBM_TEST_MODEL} MATCHES Weekly OR ${CBM_TEST_MODEL} MATCHES Profile)
-If(NOT ${_BuildType} MATCHES Experimental)
+If(NOT ${_BuildType} MATCHES EXPERIMENTAL)
 
   Find_Program(GCOV_COMMAND gcov)
   If(GCOV_COMMAND)
@@ -86,7 +89,7 @@ If(DEFINED ENV{CTEST_END_TIME_LIMIT})
   message(STATUS " End time for the ctest test runs set to ${stop_time}")
 EndIf()
 
-If(NOT ${_BuildType} MATCHES Experimental)
+If(NOT ${_BuildType} MATCHES EXPERIMENTAL)
   Ctest_Update(SOURCE "${CTEST_SOURCE_DIRECTORY}")
 EndIf()
 
@@ -119,8 +122,27 @@ If(NOT _RETVAL)
     endif()
   EndIf()
 
+  If(DEFINED ENV{CI_TEST_STAGE_TOTAL_TIME_LIMIT})
+    # Compute test stage timeout based on current time + limit from environment variable
+    If(DEFINED ENV{CTEST_END_TIME_LIMIT})
+      # If also full DASH run timeout defined, also compare the two and keep the earliest one
+      execute_process (
+        COMMAND scripts/find_citests_ctest_stop_time.sh $ENV{CTEST_END_TIME_LIMIT}
+        OUTPUT_VARIABLE CI_TESTS_TOTAL_END_TIME_DATE
+      )
+    Else()
+      # Else just get the CI jpb timeout
+      execute_process (
+        COMMAND scripts/find_citests_ctest_stop_time.sh
+        OUTPUT_VARIABLE CI_TESTS_TOTAL_END_TIME_DATE
+      )
+    EndIf()
+    set(stop_time STOP_TIME "${CI_TESTS_TOTAL_END_TIME_DATE}")
+    message(STATUS "Due to CI mode, Set end time for the ctest test runs to ${stop_time}")
+  EndIf()
+
   Ctest_Test(BUILD "${CTEST_BINARY_DIRECTORY}"
-             PARALLEL_LEVEL $ENV{number_of_processors}
+             PARALLEL_LEVEL $ENV{number_of_processors_for_test}
              ${repeat}
              ${stop_time}
              RETURN_VALUE _ctest_test_ret_val
@@ -153,10 +175,14 @@ If(NOT _RETVAL)
                     RESULTS_VARIABLE _install_ret_value
                    )
     if (NOT _install_ret_value)
-      execute_process(COMMAND ${CMAKE_EXECUTABLE_NAME} -E rm -R build MQ algo analysis core external fles mvd reco sim
+      message("executing test suite in ${CTEST_BINARY_DIRECTORY}/install with source folder available")
+      execute_process(COMMAND ${CTEST_SOURCE_DIRECTORY}/cmake/scripts/execute_installation_test.sh ${CTEST_SOURCE_DIRECTORY}/install
+                      RESULTS_VARIABLE _install_ret_value
+                     )
+      execute_process(COMMAND ${CMAKE_EXECUTABLE_NAME} -E rm -R build MQ algo analysis core external fles reco sim
                       WORKING_DIRECTORY ${CTEST_SOURCE_DIRECTORY}
                      )
-      message("executing test suite in ${CTEST_BINARY_DIRECTORY}/install")
+      message("executing test suite in ${CTEST_BINARY_DIRECTORY}/install wihout source folder available")
       execute_process(COMMAND ${CTEST_SOURCE_DIRECTORY}/cmake/scripts/execute_installation_test.sh ${CTEST_SOURCE_DIRECTORY}/install
                       RESULTS_VARIABLE _install_ret_value
                      )

Dart.sh

@@ -119,15 +119,22 @@ then
   fi
 fi
 
+if [ -z $NCPU4TEST ]; then
+  export number_of_processors_for_test=$number_of_processors
+else
+  export number_of_processors_for_test=$NCPU4TEST
+fi
+
 echo "************************"
 date
 echo "LABEL: " $LABEL
 echo "SITE: " $SITE
 echo "Model: " ${ctest_model}
-echo "Nr. of processes: " $number_of_processors
+echo "Nr. of processes for build: " $number_of_processors
+echo "Nr. of processes for test: " $number_of_processors_for_test
 echo "************************"
 
 cd $SOURCEDIR
 
-ctest -S $SOURCEDIR/CbmRoot_test.cmake -V --VV -DCBM_TEST_MODEL=${ctest_model}
+ctest -S $SOURCEDIR/CbmRoot_test.cmake -V -DCBM_TEST_MODEL=${ctest_model}
 #ctest -S $SOURCEDIR/CbmRoot_test.cmake -V --VV

MQ/mcbm/CbmDeviceBmonMonitor.cxx

@@ -568,7 +568,7 @@ Bool_t CbmDeviceBmonMonitor::DoUnpack(const fles::Timeslice& ts, size_t /*compon
   LOG(debug) << "Unpack: TS index " << ts.index() << " components " << nComponents;
 
   for (uint64_t component = 0; component < nComponents; component++) {
-    auto systemId = static_cast<std::uint16_t>(ts.descriptor(component, 0).sys_id);
+    auto systemId = static_cast<uint16_t>(ts.descriptor(component, 0).sys_id);
 
     switch (systemId) {
       case fkFlesBmon: {

MQ/mcbm/CbmDeviceBmonMonitor.h

@@ -51,7 +51,6 @@ private:
   /// Constants
  static constexpr std::uint16_t fkFlesBmon = static_cast<std::uint16_t>(fles::Subsystem::BMON);
 
-
  /// Control flags
  Bool_t fbIgnoreOverlapMs       = false;  //! Ignore Overlap Ms: all fuOverlapMsNb MS at the end of timeslice
  Bool_t fbComponentsAddedToList = kFALSE;
@@ -88,11 +87,11 @@ private:
  uint64_t fulTsCounter                                  = 0;
  std::chrono::system_clock::time_point fLastPublishTime = std::chrono::system_clock::now();
  /** @brief Map to store a name for the unpackers and the processed amount of digis, key = fkFlesId*/
-  std::map<std::uint16_t, std::pair<std::string, size_t>> fNameMap = {};  //!
+ std::map<uint16_t, std::pair<std::string, size_t>> fNameMap = {};  //!
  /** @brief Map to store the cpu and wall time, key = fkFlesId*/
-  std::map<std::uint16_t, std::pair<double, double>> fTimeMap = {};  //!
+ std::map<uint16_t, std::pair<double, double>> fTimeMap = {};  //!
  /** @brief Map to store the in and out data amount, key = fkFlesId*/
-  std::map<std::uint16_t, std::pair<double, double>> fDataSizeMap = {};  //!
+ std::map<uint16_t, std::pair<double, double>> fDataSizeMap = {};  //!
 
  /// Configuration of the unpackers. Provides the configured algorithm
  std::shared_ptr<CbmBmonUnpackConfig> fBmonConfig = nullptr;
@@ -175,7 +174,7 @@ private:
    * @return std::pair<ndigis, std::pair<cputime, walltime>>
   */
   template<class TConfig, class TOptOutA = std::nullptr_t, class TOptOutB = std::nullptr_t>
-  size_t unpack(const std::uint16_t subsysid, const fles::Timeslice* ts, std::uint16_t icomp, TConfig config,
+  size_t unpack(const uint16_t subsysid, const fles::Timeslice* ts, uint16_t icomp, TConfig config,
                 std::vector<TOptOutA>* optouttargetvecA = nullptr, std::vector<TOptOutB>* optouttargetvecB = nullptr)
   {
 
@@ -223,10 +222,10 @@ private:
     std::clock_t cpuendtime = std::clock();
     auto wallendtime        = std::chrono::high_resolution_clock::now();
 
-    // Cpu time in [µs]
+    // Cpu time in [mus]
     auto cputime = 1e6 * (cpuendtime - cpustarttime) / CLOCKS_PER_SEC;
     algo->AddCpuTime(cputime);
-    // Real time in [µs]
+    // Real time in [mus]
     auto walltime = std::chrono::duration<double, std::micro>(wallendtime - wallstarttime).count();
     algo->AddWallTime(walltime);
 
@@ -234,7 +233,7 @@ private:
     // Check some numbers from this timeslice
     size_t nDigis = digivec.size();
     LOG(debug) << "Component " << icomp << " connected to config " << config->GetName() << "   n-Digis " << nDigis
-               << " processed in walltime(cputime) = " << walltime << "(" << cputime << cputime << ") µs"
+               << " processed in walltime(cputime) = " << walltime << "(" << cputime << cputime << ") micro s"
                << "this timeslice.";
 
     if (fDoPerfProf) {

MQ/mcbm/CbmDeviceUnpack.cxx

@@ -1072,7 +1072,7 @@ Bool_t CbmDeviceUnpack::DoUnpack(const fles::Timeslice& ts, size_t /*component*/
   LOG(debug) << "Unpack: TS index " << ts.index() << " components " << nComponents;
 
   for (uint64_t component = 0; component < nComponents; component++) {
-    auto systemId = static_cast<std::uint16_t>(ts.descriptor(component, 0).sys_id);
+    auto systemId = static_cast<uint16_t>(ts.descriptor(component, 0).sys_id);
 
     switch (systemId) {
       case fkFlesBmon: {

MQ/mcbm/CbmDeviceUnpack.h

@@ -130,11 +130,11 @@ private:
  uint64_t fulTsCounter                                  = 0;
  std::chrono::system_clock::time_point fLastPublishTime = std::chrono::system_clock::now();
  /** @brief Map to store a name for the unpackers and the processed amount of digis, key = fkFlesId*/
-  std::map<std::uint16_t, std::pair<std::string, size_t>> fNameMap = {};  //!
+ std::map<uint16_t, std::pair<std::string, size_t>> fNameMap = {};  //!
  /** @brief Map to store the cpu and wall time, key = fkFlesId*/
-  std::map<std::uint16_t, std::pair<double, double>> fTimeMap = {};  //!
+ std::map<uint16_t, std::pair<double, double>> fTimeMap = {};  //!
  /** @brief Map to store the in and out data amount, key = fkFlesId*/
-  std::map<std::uint16_t, std::pair<double, double>> fDataSizeMap = {};  //!
+ std::map<uint16_t, std::pair<double, double>> fDataSizeMap = {};  //!
 
  /// Configuration of the unpackers. Provides the configured algorithm
  std::shared_ptr<CbmBmonUnpackConfig> fBmonConfig     = nullptr;
@@ -190,7 +190,6 @@ private:
    LOG(debug) << "CbmDeviceUnpack::timesort() got an object that has no member function GetTime(). Hence, we can and "
                  "will not timesort it!";
  }
-
   template<typename TVecobj>
   typename std::enable_if<!std::is_member_function_pointer<decltype(&TVecobj::GetTime)>::value, void>::type
   timesort(std::vector<TVecobj>* /*vec = nullptr*/)
@@ -223,7 +222,7 @@ private:
    * @return std::pair<ndigis, std::pair<cputime, walltime>>
   */
   template<class TConfig, class TOptOutA = std::nullptr_t, class TOptOutB = std::nullptr_t>
-  size_t unpack(const std::uint16_t subsysid, const fles::Timeslice* ts, std::uint16_t icomp, TConfig config,
+  size_t unpack(const uint16_t subsysid, const fles::Timeslice* ts, uint16_t icomp, TConfig config,
                 std::vector<TOptOutA>* optouttargetvecA = nullptr, std::vector<TOptOutB>* optouttargetvecB = nullptr)
   {
 
@@ -271,10 +270,10 @@ private:
     std::clock_t cpuendtime = std::clock();
     auto wallendtime        = std::chrono::high_resolution_clock::now();
 
-    // Cpu time in [µs]
+    // Cpu time in [mus]
     auto cputime = 1e6 * (cpuendtime - cpustarttime) / CLOCKS_PER_SEC;
     algo->AddCpuTime(cputime);
-    // Real time in [µs]
+    // Real time in [mus]
     auto walltime = std::chrono::duration<double, std::micro>(wallendtime - wallstarttime).count();
     algo->AddWallTime(walltime);
 
@@ -282,7 +281,7 @@ private:
     // Check some numbers from this timeslice
     size_t nDigis = digivec.size();
     LOG(debug) << "Component " << icomp << " connected to config " << config->GetName() << "   n-Digis " << nDigis
-               << " processed in walltime(cputime) = " << walltime << "(" << cputime << cputime << ") µs"
+               << " processed in walltime(cputime) = " << walltime << "(" << cputime << cputime << ") micro s"
                << "this timeslice.";
 
     if (fDoPerfProf) {

MQ/source/CbmMCPointSource.cxx

@@ -18,7 +18,6 @@
 #include "CbmStsPoint.h"
 #include "CbmTofPoint.h"
 #include "CbmTrdPoint.h"
-//#include "CbmEcalPoint.h"
 #include "CbmPsdPoint.h"
 
 #include "FairFileSource.h"
@@ -101,7 +100,6 @@ try {
         ConnectChannelIfNeeded(i, channel_name.at(0), "MuchPoint", rootman);
         ConnectChannelIfNeeded(i, channel_name.at(0), "TrdPoint", rootman);
         ConnectChannelIfNeeded(i, channel_name.at(0), "TofPoint", rootman);
-        //        ConnectChannelIfNeeded(i, channel_name.at(0), "EcalPoint", rootman);
         ConnectChannelIfNeeded(i, channel_name.at(0), "PsdPoint", rootman);
       }
       else {
@@ -193,11 +191,6 @@ bool CbmMCPointSource::ConditionalRun()
       if (0 == fChannelsToSend.at(i).at(0).compare("TofPoint")) {
         result = ConvertAndSend<CbmTofPoint>(fArrays.at(i), i);
       }
-      /*
-      if (0 == fChannelsToSend.at(i).at(0).compare("EcalPoint")) {
-	result = ConvertAndSend<CbmEcalPoint>(fArrays.at(i),i );
-      }
-*/
       if (0 == fChannelsToSend.at(i).at(0).compare("PsdPoint")) {
         result = ConvertAndSend<CbmPsdPoint>(fArrays.at(i), i);
       }

MQ/source/CbmMCPointSource.h

@@ -139,12 +139,6 @@ private:
   std::vector<std::string> fAllowedChannels = {"MvdPoint", "StsPoint", "RichPoint", "MuchPoint",
                                                "Trdpoint", "TofPoint", "PsdPoint"};
 
-  /*
-    std::vector<std::string> fAllowedChannels 
-      = {"MvdPoint", "StsPoint", "RichPoint", "MuchPoint", 
-	 "Trdpoint", "TofPoint", "EcalPoint", "PsdPoint"};
-*/
-
   CbmMQChannels fChan {fAllowedChannels};
 
   std::vector<int> fComponentsToSend {};

MQ/source/CbmMQTsSamplerRepReq.cxx

@@ -31,16 +31,14 @@
 
 //namespace filesys = boost::filesystem;
 
-#include <thread>  // this_thread::sleep_for
-
 #include <algorithm>
 #include <chrono>
+#include <cstdio>
 #include <ctime>
 #include <iomanip>
 #include <sstream>
 #include <string>
-
-#include <stdio.h>
+#include <thread>  // this_thread::sleep_for
 
 using namespace std;
 

MQ/source/CbmMQTsaInfo.cxx

@@ -13,21 +13,17 @@
 #include "CbmMQTsaInfo.h"
 
 #include "CbmMQDefs.h"
-
-#include "TimesliceInputArchive.hpp"
-#include "TimesliceSubscriber.hpp"
-
 #include "FairMQLogger.h"
 #include "FairMQProgOptions.h"  // device->fConfig
-
-#include <thread>  // this_thread::sleep_for
+#include "TimesliceInputArchive.hpp"
+#include "TimesliceSubscriber.hpp"
 
 #include <boost/archive/binary_oarchive.hpp>
 
 #include <chrono>
+#include <cstdio>
 #include <ctime>
-
-#include <stdio.h>
+#include <thread>  // this_thread::sleep_for
 
 using namespace std;
 

MQ/source/CbmMQTsaMultiSampler.cxx

@@ -39,16 +39,14 @@
 
 namespace filesys = boost::filesystem;
 
-#include <thread>  // this_thread::sleep_for
-
 #include <algorithm>
 #include <chrono>
+#include <cstdio>
 #include <ctime>
 #include <iomanip>
 #include <sstream>
 #include <string>
-
-#include <stdio.h>
+#include <thread>  // this_thread::sleep_for
 
 using namespace std;
 

MQ/source/CbmMQTsaMultiSamplerTof.cxx

@@ -30,14 +30,12 @@
 
 namespace filesys = boost::filesystem;
 
-#include <thread>  // this_thread::sleep_for
-
 #include <algorithm>
 #include <chrono>
+#include <cstdio>
 #include <ctime>
 #include <string>
-
-#include <stdio.h>
+#include <thread>  // this_thread::sleep_for
 
 using namespace std;
 

MQ/source/CbmMQTsaSampler.cxx

@@ -27,14 +27,12 @@
 
 namespace filesys = boost::filesystem;
 
-#include <thread>  // this_thread::sleep_for
-
 #include <algorithm>
 #include <chrono>
+#include <cstdio>
 #include <ctime>
 #include <string>
-
-#include <stdio.h>
+#include <thread>  // this_thread::sleep_for
 
 using namespace std;
 
@@ -119,7 +117,7 @@ try {
         // filename or directory name and convert it to a string to be
         // used in the regex:match
         boost::smatch what;
-        if (!boost::regex_match(x.path().leaf().string(), what, my_filter)) continue;
+        if (!boost::regex_match(x.path().string(), what, my_filter)) continue;
 
         v.push_back(x.path());
       }

MQ/source/CbmMQTsaSamplerTof.cxx

@@ -27,14 +27,12 @@
 
 namespace filesys = boost::filesystem;
 
-#include <thread>  // this_thread::sleep_for
-
 #include <algorithm>
 #include <chrono>
+#include <cstdio>
 #include <ctime>
 #include <string>
-
-#include <stdio.h>
+#include <thread>  // this_thread::sleep_for
 
 using namespace std;
 
@@ -120,7 +118,7 @@ try {
         // filename or directory name and convert it to a string to be
         // used in the regex:match
         boost::smatch what;
-        if (!boost::regex_match(x.path().leaf().string(), what, my_filter)) continue;
+        if (!boost::regex_match(x.path().string(), what, my_filter)) continue;
 
         v.push_back(x.path());
       }

MQ/source/CbmStsDigiSource.cxx

@@ -15,22 +15,19 @@
 #include "CbmDigiManager.h"
 #include "CbmMQDefs.h"
 #include "CbmStsDigi.h"
-
 #include "FairFileSource.h"
 #include "FairMQLogger.h"
 #include "FairMQProgOptions.h"  // device->fConfig
 #include "FairRootManager.h"
 #include "FairRunAna.h"
 
-#include <thread>  // this_thread::sleep_for
-
 #include <boost/archive/binary_oarchive.hpp>
 
 #include <chrono>
+#include <cstdio>
 #include <ctime>
 #include <stdexcept>
-
-#include <stdio.h>
+#include <thread>  // this_thread::sleep_for
 
 using namespace std;
 

MQ/unpacker/CbmTbDaqBuffer.cxx

@@ -13,11 +13,10 @@
 
 #include <boost/any.hpp>
 
+#include <cstddef>  // for NULL
 #include <iomanip>  // for setprecision, __iom_t5
 #include <sstream>  // for basic_stringstream<>::string_type
 
-#include <stddef.h>  // for NULL
-
 // -----   Initialisation of static variables   ------------------------------
 CbmTbDaqBuffer* CbmTbDaqBuffer::fgInstance = nullptr;
 // ---------------------------------------------------------------------------